Merge pull request #3 from Chouchen/diagonal_detection

added diagonal word stroke

Gruntfile.js

@@ -28,10 +28,24 @@ module.exports = function(grunt) {
                     {expand: true, cwd: 'src/', src: '*.html', dest: 'dist/', filter: 'isFile'},
                     {expand: true, cwd: 'vendor/', src: '*.min.js', dest: 'dist/js/', filter: 'isFile'}
                 ]
+            },
+            dev: {
+                files: [
+                    {expand: true, cwd: 'src/', src: '*.html', dest: 'dist/', filter: 'isFile'},
+                    {expand: true, cwd: 'vendor/', src: '*.min.js', dest: 'dist/js/', filter: 'isFile'},
+                    {expand: true, cwd: 'src/js/', src: '*.js', dest: 'dist/js/', filter: 'isFile'},
+                    {expand: true, cwd: 'src/css/', src: '*.js', dest: 'dist/js/', filter: 'isFile'}
+                ]
+            }
+        },
+        concat: {
+            dist: {
+                src: ['src/js/*.js'],
+                dest: 'dist/js/<%= pkg.name %>.min.js'
             }
         },
         clean: {
-            dist: ['dist/']
+            dist: ['dist/js','dist/css','index.html']
         }
     });
 
@@ -40,7 +54,9 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-contrib-concat');
 
-    grunt.registerTask('default', ['clean', 'jshint', 'uglify', 'cssmin', 'copy']);
+    grunt.registerTask('default', ['clean:dist', 'jshint', 'uglify', 'cssmin', 'copy:main']);
+    grunt.registerTask('dev', ['clean:dist', 'jshint', 'concat', 'copy:dev']);
 
 };

dist/js/motsmeles.min.js

@@ -1,2 +1,2 @@
-/*! motsmeles 2015-01-27 */
+/*! motsmeles 2015-01-29 */
-var SIZE=30,GRID=[["S","S","S","A","U","B","A","G","N","E"],["E","P","A","A","M","V","E","N","C","E"],["L","U","L","M","I","R","A","M","A","S"],["R","A","O","G","E","X","A","C","O","E"],["A","L","N","E","G","N","A","R","O","R"],["T","O","U","L","O","N","G","L","R","E"],["N","D","S","T","N","U","E","I","E","Y"],["I","N","P","E","E","N","I","L","D","H"],["C","A","S","S","U","J","E","R","F","L"],["E","B","E","L","S","I","S","S","A","C"]],words=["AIX","APT","ARLES","AUBAGNE","AUPS","AVIGNON","BANDOL","CANNES","CASSIS","DIGNE","FREJUS","HYERES","LUNEL","MIRAMAS","NICE","ORANGE","SALON","SORGUES","TOULON","VENCE"];!function(a,b,c,d){var e,f,g,h,i=new a.Canvas("c",{selection:!1}),j=[],k=[],l=!1,m=a.util.createClass(a.Rect,{type:"labeledRect",initialize:function(a){a=a||{},this.callSuper("initialize",a),this.set("label",a.label||"")},toObject:function(){return a.util.object.extend(this.callSuper("toObject"),{label:this.get("label")})},_render:function(a){this.callSuper("_render",a),a.font="20px Helvetica",a.fillStyle="#333",a.fillText(this.label,-this.width/2+5,-this.height/2+20)}}),n=function(){var a,b,e,f=-1,g=j[0]===k[0],h=j[1]===k[1],i="";if(g){for(b=Math.min(j[1],k[1]),e=Math.max(j[1],k[1]),a=b;e>=a;a++)i+=c[j[0]][a];return Math.max(d.indexOf(i),d.indexOf(i.split("").reverse().join("")))}if(h){for(b=Math.min(j[0],k[0]),e=Math.max(j[0],k[0]),a=b;e>=a;a++)i+=c[a][j[1]];return Math.max(d.indexOf(i),d.indexOf(i.split("").reverse().join("")))}return f},o=function(a){var b=document.getElementById("words").getElementsByTagName("li"),c=b.length;for(g=0;c>g;g++)if(b[g].textContent===a){b[g].className="validate";break}},p=function(){var a,b=1,d=c.length;if(0!==d&&c[0]){for(a=c[0].length;d>b;b++)if(c[b].length!==a)return!1;return!0}return!1},q=function(){if(!p())throw new Error("invalid grid");var a=c.length,g=c[0].length;for(i.setDimensions({width:b*g+g,height:b*a+a}),e=0;g>e;e++)for(f=0;a>f;f++){var h=new m({left:e*b,top:f*b,fill:"white",stroke:"black",width:b,height:b,label:c[f][e],selectable:!1});i.add(h)}var j,k=document.createDocumentFragment();d.forEach(function(a){j=document.createElement("li"),j.innerHTML=a.toUpperCase(),k.appendChild(j)}),document.getElementById("words").appendChild(k)};i.on("mouse:down",function(c){l=!0;var d=i.getPointer(c.e),e=[d.x,d.y,d.x,d.y];j=[Math.floor(e[1]/b),Math.floor(e[0]/b)],h=new a.Line(e,{stroke:"black",strokeLineCap:"round",strokeWidth:b/2,originX:"center",originY:"center"}),i.add(h)}),i.on("mouse:move",function(a){if(l){var b=i.getPointer(a.e);h.set({x2:b.x,y2:b.y}),i.renderAll()}}),i.on("mouse:up",function(c){l=!1;var e=i.getPointer(c.e),f=[e.x,e.y];if(k=[Math.floor(f[1]/b),Math.floor(f[0]/b)],i.remove(h),j[0]!==k[0]||j[1]!==k[1]){var g=n();if(-1!==g){var m=d[g];m=j.reverse().join("").concat(k.reverse().join("")).split(""),m=m.map(function(a){return a*b+b/2});var p=new a.Line(m,{stroke:"black",strokeLineCap:"round",strokeWidth:b/2,originX:"center",originY:"center",selectable:!1});o(d[g]),d.splice(g,1),i.add(p),0===d.length&&r()}}j=[],k=[]});var r=function(){};q()}(fabric,SIZE,GRID,words);
+var SIZE=30,NUMCASE=10,GRID=[["S","S","S","A","U","B","A","G","N","E"],["E","P","A","A","M","V","E","N","C","E"],["L","U","L","M","I","R","A","M","A","S"],["R","A","O","G","E","X","A","C","O","E"],["A","L","N","E","G","N","A","R","O","R"],["T","O","U","L","O","N","G","L","R","E"],["N","D","S","T","N","U","E","I","E","Y"],["I","N","P","E","E","N","I","L","D","H"],["C","A","S","S","U","J","E","R","F","L"],["E","B","E","L","S","I","S","S","A","C"]],words=["AIX","APT","ARLES","AUBAGNE","AUPS","AVIGNON","BANDOL","CANNES","CASSIS","DIGNE","FREJUS","HYERES","LUNEL","MIRAMAS","NICE","ORANGE","SALON","SORGUES","TOULON","VENCE"],reponse="BA";!function(a,b,c,d,e,f,g){var h,i,j,k,l=new a.Canvas("c",{selection:!1}),m=[],n=[],o=!1;l.setDimensions({width:c*d+d,height:c*d+d});var p=a.util.createClass(a.Rect,{type:"labeledRect",initialize:function(a){a=a||{},this.callSuper("initialize",a),this.set("label",a.label||"")},toObject:function(){return a.util.object.extend(this.callSuper("toObject"),{label:this.get("label")})},_render:function(a){this.callSuper("_render",a),a.font="20px Helvetica",a.fillStyle="#333",a.fillText(this.label,-this.width/2+5,-this.height/2+20)}}),q=function(){var a,b,c,d=-1,f=m[0]===n[0],h=m[1]===n[1],i=Math.abs(m[0]-n[0])===Math.abs(m[1]-n[1]),j="";if(f){for(b=Math.min(m[1],n[1]),c=Math.max(m[1],n[1]),a=b;c>=a;a++)j+=e[m[0]][a];return Math.max(g.indexOf(j),g.indexOf(j.split("").reverse().join("")))}if(h){for(b=Math.min(m[0],n[0]),c=Math.max(m[0],n[0]),a=b;c>=a;a++)j+=e[a][m[1]];return Math.max(g.indexOf(j),g.indexOf(j.split("").reverse().join("")))}if(i){for(var k=m[0]-n[0]<0,l=m[1]-n[1]<0,o=0,p=Math.abs(m[0]-n[0]);p>=o;o++)j+=e[k?m[0]+o:m[0]-o][l?m[1]+o:m[1]-o];return Math.max(g.indexOf(j),g.indexOf(j.split("").reverse().join("")))}return d},r=function(a){var c=b.getElementById("words").getElementsByTagName("li"),d=c.length;for(j=0;d>j;j++)if(c[j].textContent===a){c[j].className="validate";break}};for(h=0;d>h;h++)for(i=0;d>i;i++){var s=new p({left:h*c,top:i*c,fill:"white",stroke:"black",width:c,height:c,label:e[i][h],selectable:!1});l.add(s)}for(var t=0;t<g.length;t++){var u=b.createElement("li");u.innerHTML=g[t].toUpperCase(),b.getElementById("words").appendChild(u)}l.on("mouse:down",function(b){o=!0;var d=l.getPointer(b.e),e=[d.x,d.y,d.x,d.y];m=[Math.floor(e[1]/c),Math.floor(e[0]/c)],k=new a.Line(e,{stroke:"black",strokeLineCap:"round",strokeWidth:c/6,strokeDashArray:[c/6,c/6],originX:"center",originY:"center"}),l.add(k)}),l.on("mouse:move",function(a){if(o){var b=l.getPointer(a.e);k.set({x2:b.x,y2:b.y}),l.renderAll()}}),l.on("mouse:up",function(b){o=!1;var d=l.getPointer(b.e),e=[d.x,d.y];if(n=[Math.floor(e[1]/c),Math.floor(e[0]/c)],l.remove(k),m[0]!==n[0]||m[1]!==n[1]){var f=q();if(-1!==f){var h=g[f];h=m.reverse().join("").concat(n.reverse().join("")).split(""),h=h.map(function(a){return a*c+c/2});var i=new a.Line(h,{stroke:"black",strokeLineCap:"round",strokeWidth:c/6,originX:"center",originY:"center",selectable:!1});r(g[f]),g.splice(f,1),l.add(i),0===g.length&&v()}}m=[],n=[]});var v=function(){}}(fabric,document,SIZE,NUMCASE,GRID,reponse,words);

package.json

@@ -5,6 +5,7 @@
   "author": "Shikiryu",
   "devDependencies": {
     "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-concat": "^0.5.0",
     "grunt-contrib-copy": "^0.7.0",
     "grunt-contrib-cssmin": "^0.11.0",
     "grunt-contrib-jshint": "^0.11.0",

src/js/script.js

@@ -33,6 +33,7 @@
 		var result = -1;
 		var isHorizontal = origin[0] === end[0];
 		var isVertical = origin[1] === end[1];
+		var isDiagonal = Math.abs(origin[0]-end[0]) === Math.abs(origin[1]-end[1]);
 		var x;
 		var first;
 		var last;
@@ -51,6 +52,15 @@
 				word += GRID[x][origin[1]];
 			}
 			return Math.max(words.indexOf(word), words.indexOf(word.split('').reverse().join('')));
+		} else if(isDiagonal) {
+			var xRight = origin[0] - end[0] < 0;
+			var yDown = origin[1] - end[1] < 0;
+			var i = 0;
+			var loopTime = Math.abs(origin[0]-end[0]);
+			for (;i<=loopTime;i++) {
+				word += GRID[xRight ? origin[0] + i : origin[0] - i][yDown ? origin[1] +i : origin[1] - i];
+			}
+			return Math.max(words.indexOf(word), words.indexOf(word.split('').reverse().join('')));
 		}
 		return result;
 	};
@@ -132,7 +142,7 @@
 		drawingLine = new fabric.Line(points, {
 					stroke: 'black',
 					strokeLineCap: 'round',
-					strokeWidth: SIZE/2,
+					strokeWidth: SIZE/6,
 					originX: 'center',
 					originY: 'center'
 				});
@@ -162,7 +172,7 @@
 				var line = new fabric.Line(lineCoord, {
 					stroke: 'black',
 					strokeLineCap: 'round',
-					strokeWidth: SIZE/2,
+					strokeWidth: SIZE/6,
 					originX: 'center',
 					originY: 'center',
 					selectable: false