From efa1918f17b4d3bee470f1b1afed27810e419c3c Mon Sep 17 00:00:00 2001 From: Shikiryu Date: Tue, 27 Jan 2015 18:15:28 +0100 Subject: [PATCH] Cleaner init --- dist/js/motsmeles.min.js | 2 +- src/js/const.js | 6 +-- src/js/script.js | 88 ++++++++++++++++++++++++++++------------ 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/dist/js/motsmeles.min.js b/dist/js/motsmeles.min.js index 8605f6d..c706903 100644 --- a/dist/js/motsmeles.min.js +++ b/dist/js/motsmeles.min.js @@ -1,2 +1,2 @@ /*! motsmeles 2015-01-27 */ -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="";if(f){for(b=Math.min(m[1],n[1]),c=Math.max(m[1],n[1]),a=b;c>=a;a++)i+=e[m[0]][a];return Math.max(g.indexOf(i),g.indexOf(i.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++)i+=e[a][m[1]];return Math.max(g.indexOf(i),g.indexOf(i.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=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); \ No newline at end of file diff --git a/src/js/const.js b/src/js/const.js index bf20618..0b80726 100644 --- a/src/js/const.js +++ b/src/js/const.js @@ -1,5 +1,4 @@ var SIZE = 30; -var NUMCASE = 10; var GRID = [ ['S','S','S','A','U','B','A','G','N','E'], ['E','P','A','A','M','V','E','N','C','E'], @@ -12,7 +11,4 @@ var GRID = [ ['C','A','S','S','U','J','E','R','F','L'], ['E','B','E','L','S','I','S','S','A','C'] ]; - -var words = ['AIX','APT','ARLES','AUBAGNE','AUPS','AVIGNON','BANDOL','CANNES','CASSIS','DIGNE','FREJUS','HYERES','LUNEL','MIRAMAS','NICE','ORANGE','SALON','SORGUES','TOULON','VENCE']; - -var reponse = 'BA'; \ No newline at end of file +var words = ['AIX','APT','ARLES','AUBAGNE','AUPS','AVIGNON','BANDOL','CANNES','CASSIS','DIGNE','FREJUS','HYERES','LUNEL','MIRAMAS','NICE','ORANGE','SALON','SORGUES','TOULON','VENCE']; \ No newline at end of file diff --git a/src/js/script.js b/src/js/script.js index 9062797..719e68b 100644 --- a/src/js/script.js +++ b/src/js/script.js @@ -1,4 +1,4 @@ -(function(fabric, document, SIZE, NUMCASE, GRID, reponse, words){ +(function(fabric, SIZE, GRID, words){ var canvas = new fabric.Canvas('c', { selection: false }); var i; var j; @@ -8,7 +8,7 @@ var end = []; var isDragging = false; var drawingLine; - canvas.setDimensions({width: SIZE*NUMCASE + NUMCASE, height: SIZE*NUMCASE + NUMCASE}); + var LabeledRect = fabric.util.createClass(fabric.Rect, { type: 'labeledRect', initialize: function(options) { @@ -66,29 +66,63 @@ } }; - // init grid - for (i = 0; i < NUMCASE; i++) { - for (j = 0; j < NUMCASE; j++) { - var rect = new LabeledRect({ - left: i*SIZE, - top: j*SIZE, - fill: 'white', - stroke: 'black', - width: SIZE, - height: SIZE, - label: GRID[j][i], - selectable: false - }); - canvas.add(rect); + var validateGrid = function validateGrid() { + var i = 1; + var l = GRID.length; + var supposed; + if(l !== 0 && GRID[0]) { + supposed = GRID[0].length; + for(;i