detect diagonal slash

This commit is contained in:
tykayn 2016-06-16 12:13:46 +02:00
parent 66bf3a8cc4
commit 51e9126acf
7 changed files with 236 additions and 132 deletions

View File

@ -2,15 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e0ed8919-71cf-4a0f-9de7-89982f172017" name="Default" comment="">
<change type="MOVED" beforePath="$PROJECT_DIR$/src/html/tpl/main.html" afterPath="$PROJECT_DIR$/src/html/tpl/bingo.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/GulpFile.js" afterPath="$PROJECT_DIR$/GulpFile.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bower.json" afterPath="$PROJECT_DIR$/bower.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/coffee/main.coffee" afterPath="$PROJECT_DIR$/src/coffee/main.coffee" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/html/index.html" afterPath="$PROJECT_DIR$/src/html/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/json/squares.json" afterPath="$PROJECT_DIR$/src/json/squares.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/sass/_extendables.scss" afterPath="$PROJECT_DIR$/src/sass/_extendables.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/sass/_global.scss" afterPath="$PROJECT_DIR$/src/sass/_global.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/html/tpl/bingo.html" afterPath="$PROJECT_DIR$/src/html/tpl/bingo.html" />
</list>
<ignored path="fromage-js.iws" />
<ignored path=".idea/workspace.xml" />
@ -35,8 +33,8 @@
<file leaf-file-name="GulpFile.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/GulpFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-166">
<caret line="102" column="56" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="56" />
<state relative-caret-position="210">
<caret line="115" column="39" selection-start-line="115" selection-start-column="39" selection-end-line="115" selection-end-column="39" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>
@ -57,8 +55,8 @@
<file leaf-file-name="main.coffee" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="64" column="12" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
<state relative-caret-position="360">
<caret line="78" column="48" selection-start-line="78" selection-start-column="48" selection-end-line="78" selection-end-column="48" />
<folding />
</state>
</provider>
@ -74,63 +72,33 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="34" column="7" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
<folding>
<marker date="1466005683685" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="_pages.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sass/_pages.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="_extendables.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sass/_extendables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="137" column="0" selection-start-line="137" selection-start-column="0" selection-end-line="137" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bower.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<state relative-caret-position="360">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding>
<marker date="1466070417037" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bingo.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/html/tpl/bingo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="28" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
<state relative-caret-position="210">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
@ -138,6 +106,31 @@
</provider>
</entry>
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="25" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-360">
<caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
<folding>
<marker date="1466071761623" expanded="true" signature="20:85" placeholder="..." />
<marker date="1466071761623" expanded="true" signature="93:148" placeholder="..." />
<marker date="1466071761623" expanded="true" signature="156:204" placeholder="..." />
<marker date="1466071761623" expanded="true" signature="250:626" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
@ -152,16 +145,16 @@
<option value="$PROJECT_DIR$/src/tests/spec/app.js" />
<option value="$PROJECT_DIR$/src/html/tpl/main.html" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/dist/index.html" />
<option value="$PROJECT_DIR$/dist/tpl/bingo.html" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/html/tpl/bingo.html" />
<option value="$PROJECT_DIR$/src/sass/_global.scss" />
<option value="$PROJECT_DIR$/src/json/squares.json" />
<option value="$PROJECT_DIR$/GulpFile.js" />
<option value="$PROJECT_DIR$/src/html/index.html" />
<option value="$PROJECT_DIR$/src/sass/_pages.scss" />
<option value="$PROJECT_DIR$/src/sass/_extendables.scss" />
<option value="$PROJECT_DIR$/src/html/index.html" />
<option value="$PROJECT_DIR$/dist/index.html" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/GulpFile.js" />
<option value="$PROJECT_DIR$/src/html/tpl/bingo.html" />
<option value="$PROJECT_DIR$/src/coffee/main.coffee" />
</list>
</option>
@ -203,7 +196,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="NBKnowledgePane" />
<pane id="ProjectPane">
@ -346,8 +338,45 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dist" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tpl" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dist" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="json" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@ -415,19 +444,20 @@
<option name="presentableId" value="Default" />
<updated>1465650457129</updated>
<workItem from="1465650458202" duration="9170000" />
<workItem from="1465999890532" duration="6276000" />
<workItem from="1465999890532" duration="7260000" />
<workItem from="1466070023161" duration="1886000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15446000" />
<option name="totallyTimeSpent" value="18316000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="24" width="1855" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16749585" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16915423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@ -454,6 +484,66 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/sass/_global.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="34" column="7" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
<folding>
<marker date="1466070417037" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_pages.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_extendables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2055">
<caret line="137" column="0" selection-start-line="137" selection-start-column="0" selection-end-line="137" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/tpl/bingo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/GulpFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1695">
@ -494,7 +584,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
@ -503,7 +592,7 @@
<state relative-caret-position="525">
<caret line="35" column="29" selection-start-line="35" selection-start-column="24" selection-end-line="35" selection-end-column="29" />
<folding>
<marker date="1466005683685" expanded="true" signature="842:996" placeholder="..." />
<marker date="1466070417037" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
@ -613,7 +702,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
@ -621,17 +709,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="56" column="35" selection-start-line="56" selection-start-column="27" selection-end-line="56" selection-end-column="35" />
<folding>
<element signature="e#425#728#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
@ -643,32 +720,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<entry file="file://$PROJECT_DIR$/src/sass/_pages.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<entry file="file://$PROJECT_DIR$/src/sass/_extendables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<state relative-caret-position="514">
<caret line="137" column="0" selection-start-line="137" selection-start-column="0" selection-end-line="137" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/tpl/bingo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="28" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_global.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
@ -685,46 +752,69 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_pages.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_extendables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="137" column="0" selection-start-line="137" selection-start-column="0" selection-end-line="137" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="34" column="7" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
<state relative-caret-position="345">
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding>
<marker date="1466005683685" expanded="true" signature="842:996" placeholder="..." />
<marker date="1466070417037" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-360">
<caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
<folding>
<marker date="1466071761623" expanded="true" signature="20:85" placeholder="..." />
<marker date="1466071761623" expanded="true" signature="93:148" placeholder="..." />
<marker date="1466071761623" expanded="true" signature="156:204" placeholder="..." />
<marker date="1466071761623" expanded="true" signature="250:626" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="25" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/GulpFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-166">
<caret line="102" column="56" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="56" />
<state relative-caret-position="210">
<caret line="115" column="39" selection-start-line="115" selection-start-column="39" selection-end-line="115" selection-end-column="39" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/tpl/bingo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="64" column="12" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
<state relative-caret-position="360">
<caret line="78" column="48" selection-start-line="78" selection-start-column="48" selection-end-line="78" selection-end-column="48" />
<folding />
</state>
</provider>

View File

@ -113,7 +113,7 @@ gulp.task('lint', function () {
.pipe(jshint.reporter('jshint-stylish'));
});
gulp.task("html_transform", function () {
gulp.task("html_transform",['wiredep'], function () {
console.log("html was changed");
gulp.src(sources.json)
.pipe(gulp.dest(destinations.json));

View File

@ -18,6 +18,7 @@
"angularjs": "~1.3.15",
"bootstrap": "~3.3.4",
"font-awesome": "~4.3.0",
"angular-mocks": "~1.3.15"
"angular-mocks": "~1.3.15",
"angular": "^1.5.7"
}
}

View File

@ -4,6 +4,7 @@
"description": "bingo your conversation fallacies",
"main": "GulpFile.js",
"dependencies": {
"angular": "^1.5.7",
"bootstrap": "^3.3.4",
"browser-sync": "^2.7.1",
"chai": "~1.9.0",

View File

@ -57,7 +57,11 @@ angular.module "tkApp", []
rows[i]=0
diagonalSlash = 0 # diagonal /
diagonalAntiSlash = 0 # diagonal \
rowsTakenForSlash = []
###
# identify all the active squares
#  check their position to find if a line is formed
###
for s in $scope.config.squares
s.position = colCurrent+", "+rowCurrent
if(s.active)
@ -65,15 +69,20 @@ angular.module "tkApp", []
rows[rowCurrent]++
# find if a diagonal has all its squares actives
if(colCurrent==rowCurrent)
diagonalAntiSlash++
# console.log('added slash', colCurrent, rowCurrent)
if(diagonalAntiSlash==squareSide)
$scope.winReason = "diagonale antislash \\"
return true
# find for diagonal / slash
console.log('rowsTakenForSlash.indexOf(rowCurrent)', rowsTakenForSlash.indexOf(rowCurrent))
if(colCurrent+rowCurrent== squareSide+1 && rowsTakenForSlash.indexOf(rowCurrent) is -1)
diagonalSlash++
rowsTakenForSlash.push(rowCurrent)
# console.log('added anti slash ', colCurrent, rowCurrent )
if(diagonalSlash==squareSide)
$scope.winReason = "diagonale slash /"
return true
if(colCurrent==rowCurrent-colCurrent)
diagonalAntiSlash++
if(diagonalAntiSlash==squareSide)
$scope.winReason = "diagonale antislash \\"
return true
# find if a column has all its squares actives
if(columns[colCurrent]==squareSide)
$scope.winReason = "colonne "+colCurrent
@ -87,7 +96,7 @@ angular.module "tkApp", []
if(colCurrent > squareSide)
colCurrent=1
rowCurrent++
console.log('rows,columns', rows,columns)
console.log('diagonalSlash', 'diagonalAntiSlash', diagonalSlash, diagonalAntiSlash)
false
###
# initilise everything
@ -97,5 +106,5 @@ angular.module "tkApp", []
$scope.init()
)
$(document).ready( ->
$('[data-toggle="tooltip"]').tooltip()
$('.tip').tooltip()
)

View File

@ -41,9 +41,7 @@
</div>
<div ng-include="'tpl/bingo.html'"></div>
<!-- Add your site or application content here -->
<div class="container" ng-view="">
</div>
<h2>
<i class="fa fa-file fa-2x"></i>
Comment jouer:

View File

@ -1,18 +1,23 @@
<div class="alert alert-success">
<div id="board"
style=" width : {{config.cols * 160}}px ; "
style=" width : {{config.cols * 160}}px ; height: {{config.cols * 160}}px ; "
>
<div class="square"
<div class="square "
ng-repeat="s in config.squares"
ng-click="toggleSquare(s)"
ng-class="{active: s.active}"
data-toggle="tooltip" title="{{s.details}}"
>
<strong> {{s.text}}</strong>
<strong class="tip"
data-toggle="tooltip" title="{{s.details}}"
> {{s.text}}</strong>
<i> {{s.position}}</i>
</div>
</div>
<button class="btn btn-default" ng-click="reinitSquares()">réinitialiser</button>
</div>
<!--<pre class="debug padded warning">-->
<!--config :-->
<!--{{config|json}}-->
<!--</pre>-->