Merge pull request #1 from stvnthomas/master

Functionality

3 files changed, 59 insertions, 19 deletions

diff --git a/js/utility.min.js b/js/utility.min.js
index 5f5a5f6..a8b0a58 100644
--- a/js/utility.min.js
+++ b/js/utility.min.js
@@ -1 +1 @@
-if(typeof Math.rangeInt!="function"){Math.rangeInt=function(b,a){if(a==undefined){a=b;b=0}return Math.floor(Math.random()*(a-b+1))+b}}if(typeof Object.merge!="function"){Object.merge=function(c,b){for(var a in c){b[a]=c[a]}return b}};
\ No newline at end of file
+"function"!=typeof Math.rangeInt&&(Math.rangeInt=function(n,t){return void 0==t&&(t=n,n=0),Math.floor(Math.random()*(t-n+1))+n}),"function"!=typeof Object.merge&&(Object.merge=function(n,t){for(var e in n)t[e]=n[e];return t});
\ No newline at end of file
diff --git a/js/wordsearch.js b/js/wordsearch.js
index 37dfa25..964f61d 100644
--- a/js/wordsearch.js
+++ b/js/wordsearch.js
@@ -2,8 +2,8 @@
   'use strict';
 
   // Extend the element method
-  Element.prototype.wordSeach = function(settings) {
-    return new WordSeach(this, settings);
+  Element.prototype.wordSearch = function(settings) {
+    return new WordSearch(this, settings);
   }
 
   /**
@@ -13,12 +13,15 @@
    * @param {Array} settings
    * constructor
    */
-  function WordSeach(wrapEl, settings) {
+  function WordSearch(wrapEl, settings) {
     this.wrapEl = wrapEl;
 
     // Add `.ws-area` to wrap element
     this.wrapEl.classList.add('ws-area');
 
+    //Words solved.
+    this.solved = 0;
+
     // Default settings
     var default_settings = {
       'directions': ['W', 'N', 'WN', 'EN'],
@@ -55,7 +58,7 @@
    * @param {Number} Max size
    * @return {Boolean}
    */
-  WordSeach.prototype.parseWords = function(maxSize) {
+  WordSearch.prototype.parseWords = function(maxSize) {
     var itWorked = true;
 
     for (var i = 0; i < this.settings.words.length; i++) {
@@ -76,7 +79,7 @@
   /**
    * Put the words into the matrix
    */
-  WordSeach.prototype.addWords = function() {
+  WordSearch.prototype.addWords = function() {
       var keepGoing = true,
         counter = 0,
         isWorked = true;
@@ -107,7 +110,7 @@
    * @param {String} word
    * @param {Number} direction
    */
-  WordSeach.prototype.addWord = function(word, direction) {
+  WordSearch.prototype.addWord = function(word, direction) {
     var itWorked = true,
       directions = {
         'W': [0, 1], // Horizontal (From left to right)
@@ -166,7 +169,7 @@
   /**
    * Initialize the application
    */
-  WordSeach.prototype.initialize = function() {
+  WordSearch.prototype.initialize = function() {
     /**
      * Letter matrix
      *
@@ -192,7 +195,7 @@
    * Fill default items into the matrix
    * @param {Number} size Grid size
    */
-  WordSeach.prototype.initmatrix = function(size) {
+  WordSearch.prototype.initmatrix = function(size) {
     for (var row = 0; row < size; row++) {
       for (var col = 0; col < size; col++) {
         var item = {
@@ -213,7 +216,7 @@
   /**
    * Draw the matrix
    */
-  WordSeach.prototype.drawmatrix = function() {
+  WordSearch.prototype.drawmatrix = function() {
     for (var row = 0; row < this.settings.gridSize; row++) {
       // New row
       var divEl = document.createElement('div');
@@ -250,7 +253,7 @@
   /**
    * Fill up the remaining items
    */
-  WordSeach.prototype.fillUpFools = function() {
+  WordSearch.prototype.fillUpFools = function() {
     for (var row = 0; row < this.settings.gridSize; row++) {
       for (var col = 0; col < this.settings.gridSize; col++) {
         if (this.matrix[row][col].letter == '.') {
@@ -269,7 +272,7 @@
    * @param colTo
    * @return {Array}
    */
-  WordSeach.prototype.getItems = function(rowFrom, colFrom, rowTo, colTo) {
+  WordSearch.prototype.getItems = function(rowFrom, colFrom, rowTo, colTo) {
     var items = [];
 
     if ( rowFrom === rowTo || colFrom === colTo || Math.abs(rowTo - rowFrom) == Math.abs(colTo - colFrom) ) {
@@ -295,14 +298,14 @@
    * @param {Number} col
    * @return {*}
    */
-  WordSeach.prototype.getItem = function(row, col) {
+  WordSearch.prototype.getItem = function(row, col) {
     return (this.matrix[row] ? this.matrix[row][col] : undefined);
   }
 
   /**
    * Clear the exist highlights
    */
-  WordSeach.prototype.clearHighlight = function() {
+  WordSearch.prototype.clearHighlight = function() {
     var selectedEls = document.querySelectorAll('.ws-selected');
     for (var i = 0; i < selectedEls.length; i++) {
       selectedEls[i].classList.remove('ws-selected');
@@ -313,7 +316,7 @@
    * Lookup if the wordlist contains the selected
    * @param {Array} selected
    */
-  WordSeach.prototype.lookup = function(selected) {
+  WordSearch.prototype.lookup = function(selected) {
     var words = [''];
 
     for (var i = 0; i < selected.length; i++) {
@@ -330,14 +333,51 @@
 
         el.classList.add('ws-found');
       }
+
+      //Cross word off list.
+      var wordList = document.querySelector(".ws-words");
+      var wordListItems = wordList.getElementsByTagName("li");
+      for(var i=0; i<wordListItems.length; i++){
+        if(words[0].toLowerCase() == wordListItems[i].innerHTML.toLowerCase()){
+          wordListItems[i].innerHTML = "<del>"+wordListItems[i].innerHTML+"</del>";
+        }
+      }
+
+      //Increment solved words.
+      this.solved++;
+
+      //Game over?
+      if(this.solved == this.settings.words.length){
+        this.gameOver();
+      }
     }
   }
 
   /**
+   * Game Over
+   */
+  WordSearch.prototype.gameOver = function() {
+    //Create overlay.
+    var overlay = document.createElement("div");
+    overlay.setAttribute("id", "ws-game-over-outer");
+    overlay.setAttribute("class", "ws-game-over-outer");
+    this.wrapEl.parentNode.appendChild(overlay);
+
+    //Create overlay content.
+    var overlay = document.getElementById("ws-game-over-outer");
+      overlay.innerHTML = "<div class='ws-game-over-inner' id='ws-game-over-inner'>"+
+                            "<div class='ws-game-over' id='ws-game-over'>"+
+                              "<h2>Congratulations!</h2>"+
+                              "<p>You've found all of the words!</p>"+
+                            "</div>"+
+                          "</div>";
+  }
+
+  /**
    * Mouse event - Mouse down
    * @param {Object} item
    */
-  WordSeach.prototype.onMousedown = function(item) {
+  WordSearch.prototype.onMousedown = function(item) {
     var _this = this;
     return function() {
       _this.selectFrom = item;
@@ -348,7 +388,7 @@
    * Mouse event - Mouse move
    * @param {Object}
    */
-  WordSeach.prototype.onMouseover = function(item) {
+  WordSearch.prototype.onMouseover = function(item) {
     var _this = this;
     return function() {
       if (_this.selectFrom) {
@@ -371,7 +411,7 @@
   /**
    * Mouse event - Mouse up
    */
-  WordSeach.prototype.onMouseup = function() {
+  WordSearch.prototype.onMouseup = function() {
     var _this = this;
     return function() {
       _this.selectFrom = null;
diff --git a/js/wordsearch.min.js b/js/wordsearch.min.js
index 76854e3..2511d88 100644
--- a/js/wordsearch.min.js
+++ b/js/wordsearch.min.js
@@ -1 +1 @@
-(function(){Element.prototype.wordSeach=function(b){return new a(this,b)};function a(b,d){this.wrapEl=b;this.wrapEl.classList.add("ws-area");var c={"directions":["W","N","WN","EN"],"gridSize":10,"words":["one","two","three","four","five"],"debug":false};this.settings=Object.merge(d,c);if(this.parseWords(this.settings.gridSize)){var e=false;while(e==false){this.initialize();e=this.addWords()}if(!this.settings.debug){this.fillUpFools()}this.drawmatrix()}}a.prototype.parseWords=function(e){var b=true;for(var c=0;c<this.settings.words.length;c++){this.settings.words[c]=this.settings.words[c].toUpperCase();var d=this.settings.words[c];if(d.length>e){alert("The length of word `"+d+"` is overflow the gridSize.");console.error("The length of word `"+d+"` is overflow the gridSize.");b=false}}return b};a.prototype.addWords=function(){var e=true,c=0,f=true;while(e){var d=this.settings.directions[Math.rangeInt(this.settings.directions.length-1)],b=this.addWord(this.settings.words[c],d),f=true;if(b==false){e=false;f=false}c++;if(c>=this.settings.words.length){e=false}}return f};a.prototype.addWord=function(b,j){var d=true,g={"W":[0,1],"N":[1,0],"WN":[1,1],"EN":[1,-1]},m,e;switch(j){case"W":var m=Math.rangeInt(this.settings.gridSize-1),e=Math.rangeInt(this.settings.gridSize-b.length);break;case"N":var m=Math.rangeInt(this.settings.gridSize-b.length),e=Math.rangeInt(this.settings.gridSize-1);break;case"WN":var m=Math.rangeInt(this.settings.gridSize-b.length),e=Math.rangeInt(this.settings.gridSize-b.length);break;case"EN":var m=Math.rangeInt(this.settings.gridSize-b.length),e=Math.rangeInt(b.length-1,this.settings.gridSize-1);break;default:var h="UNKNOWN DIRECTION "+j+"!";alert(h);console.log(h);break}for(var f=0;f<b.length;f++){var l=m+f*g[j][0],c=e+f*g[j][1];var k=this.matrix[l][c].letter;if(k=="."||k==b[f]){this.matrix[l][c].letter=b[f]}else{d=false}}return d};a.prototype.initialize=function(){this.matrix=[];this.selectFrom=null;this.selected=[];this.initmatrix(this.settings.gridSize)};a.prototype.initmatrix=function(c){for(var e=0;e<c;e++){for(var b=0;b<c;b++){var d={letter:".",row:e,col:b};if(!this.matrix[e]){this.matrix[e]=[]}this.matrix[e][b]=d}}};a.prototype.drawmatrix=function(){for(var g=0;g<this.settings.gridSize;g++){var e=document.createElement("div");e.setAttribute("class","ws-row");this.wrapEl.appendChild(e);for(var d=0;d<this.settings.gridSize;d++){var f=document.createElement("canvas");f.setAttribute("class","ws-col");f.setAttribute("width",40);f.setAttribute("height",40);var b=f.width/2,h=f.height/2;var c=f.getContext("2d");c.font="400 28px Calibri";c.textAlign="center";c.textBaseline="middle";c.fillStyle="#333";c.fillText(this.matrix[g][d].letter,b,h);f.addEventListener("mousedown",this.onMousedown(this.matrix[g][d]));f.addEventListener("mouseover",this.onMouseover(this.matrix[g][d]));f.addEventListener("mouseup",this.onMouseup());e.appendChild(f)}}};a.prototype.fillUpFools=function(){for(var c=0;c<this.settings.gridSize;c++){for(var b=0;b<this.settings.gridSize;b++){if(this.matrix[c][b].letter=="."){this.matrix[c][b].letter=String.fromCharCode(Math.rangeInt(65,90))}}}};a.prototype.getItems=function(e,c,i,h){var d=[];if(e===i||c===h||Math.abs(i-e)==Math.abs(h-c)){var f=(e===i)?0:(i>e)?1:-1,g=(c===h)?0:(h>c)?1:-1,j=e,b=c;d.push(this.getItem(j,b));do{j+=f;b+=g;d.push(this.getItem(j,b))}while(j!==i||b!==h)}return d};a.prototype.getItem=function(c,b){return(this.matrix[c]?this.matrix[c][b]:undefined)};a.prototype.clearHighlight=function(){var b=document.querySelectorAll(".ws-selected");for(var c=0;c<b.length;c++){b[c].classList.remove("ws-selected")}};a.prototype.lookup=function(e){var g=[""];for(var c=0;c<e.length;c++){g[0]+=e[c].letter}g.push(g[0].split("").reverse().join(""));if(this.settings.words.indexOf(g[0])>-1||this.settings.words.indexOf(g[1])>-1){for(var c=0;c<e.length;c++){var f=e[c].row+1,b=e[c].col+1,d=document.querySelector(".ws-area .ws-row:nth-child("+f+") .ws-col:nth-child("+b+")");d.classList.add("ws-found")}}};a.prototype.onMousedown=function(b){var c=this;return function(){c.selectFrom=b}};a.prototype.onMouseover=function(b){var c=this;return function(){if(c.selectFrom){c.selected=c.getItems(c.selectFrom.row,c.selectFrom.col,b.row,b.col);c.clearHighlight();for(var e=0;e<c.selected.length;e++){var g=c.selected[e],h=g.row+1,d=g.col+1,f=document.querySelector(".ws-area .ws-row:nth-child("+h+") .ws-col:nth-child("+d+")");f.className+=" ws-selected"}}}};a.prototype.onMouseup=function(){var b=this;return function(){b.selectFrom=null;b.clearHighlight();b.lookup(b.selected);b.selected=[]}}})();
\ No newline at end of file
+!function(){"use strict";function t(t,e){this.wrapEl=t,this.wrapEl.classList.add("ws-area"),this.solved=0;var r={directions:["W","N","WN","EN"],gridSize:10,words:["one","two","three","four","five"],debug:!1};if(this.settings=Object.merge(e,r),this.parseWords(this.settings.gridSize)){for(var i=!1;0==i;)this.initialize(),i=this.addWords();this.settings.debug||this.fillUpFools(),this.drawmatrix()}}Element.prototype.wordSearch=function(e){return new t(this,e)},t.prototype.parseWords=function(t){for(var e=!0,r=0;r<this.settings.words.length;r++){this.settings.words[r]=this.settings.words[r].toUpperCase();var i=this.settings.words[r];i.length>t&&(alert("The length of word `"+i+"` is overflow the gridSize."),console.error("The length of word `"+i+"` is overflow the gridSize."),e=!1)}return e},t.prototype.addWords=function(){for(var t=!0,e=0,r=!0;t;){var i=this.settings.directions[Math.rangeInt(this.settings.directions.length-1)],s=this.addWord(this.settings.words[e],i),r=!0;0==s&&(t=!1,r=!1),e++,e>=this.settings.words.length&&(t=!1)}return r},t.prototype.addWord=function(t,e){var r,i,s=!0,o={W:[0,1],N:[1,0],WN:[1,1],EN:[1,-1]};switch(e){case"W":var r=Math.rangeInt(this.settings.gridSize-1),i=Math.rangeInt(this.settings.gridSize-t.length);break;case"N":var r=Math.rangeInt(this.settings.gridSize-t.length),i=Math.rangeInt(this.settings.gridSize-1);break;case"WN":var r=Math.rangeInt(this.settings.gridSize-t.length),i=Math.rangeInt(this.settings.gridSize-t.length);break;case"EN":var r=Math.rangeInt(this.settings.gridSize-t.length),i=Math.rangeInt(t.length-1,this.settings.gridSize-1);break;default:var n="UNKNOWN DIRECTION "+e+"!";alert(n),console.log(n)}for(var a=0;a<t.length;a++){var h=r+a*o[e][0],l=i+a*o[e][1],d=this.matrix[h][l].letter;"."==d||d==t[a]?this.matrix[h][l].letter=t[a]:s=!1}return s},t.prototype.initialize=function(){this.matrix=[],this.selectFrom=null,this.selected=[],this.initmatrix(this.settings.gridSize)},t.prototype.initmatrix=function(t){for(var e=0;t>e;e++)for(var r=0;t>r;r++){var i={letter:".",row:e,col:r};this.matrix[e]||(this.matrix[e]=[]),this.matrix[e][r]=i}},t.prototype.drawmatrix=function(){for(var t=0;t<this.settings.gridSize;t++){var e=document.createElement("div");e.setAttribute("class","ws-row"),this.wrapEl.appendChild(e);for(var r=0;r<this.settings.gridSize;r++){var i=document.createElement("canvas");i.setAttribute("class","ws-col"),i.setAttribute("width",40),i.setAttribute("height",40);var s=i.width/2,o=i.height/2,n=i.getContext("2d");n.font="400 28px Calibri",n.textAlign="center",n.textBaseline="middle",n.fillStyle="#333",n.fillText(this.matrix[t][r].letter,s,o),i.addEventListener("mousedown",this.onMousedown(this.matrix[t][r])),i.addEventListener("mouseover",this.onMouseover(this.matrix[t][r])),i.addEventListener("mouseup",this.onMouseup()),e.appendChild(i)}}},t.prototype.fillUpFools=function(){for(var t=0;t<this.settings.gridSize;t++)for(var e=0;e<this.settings.gridSize;e++)"."==this.matrix[t][e].letter&&(this.matrix[t][e].letter=String.fromCharCode(Math.rangeInt(65,90)))},t.prototype.getItems=function(t,e,r,i){var s=[];if(t===r||e===i||Math.abs(r-t)==Math.abs(i-e)){var o=t===r?0:r>t?1:-1,n=e===i?0:i>e?1:-1,a=t,h=e;s.push(this.getItem(a,h));do a+=o,h+=n,s.push(this.getItem(a,h));while(a!==r||h!==i)}return s},t.prototype.getItem=function(t,e){return this.matrix[t]?this.matrix[t][e]:void 0},t.prototype.clearHighlight=function(){for(var t=document.querySelectorAll(".ws-selected"),e=0;e<t.length;e++)t[e].classList.remove("ws-selected")},t.prototype.lookup=function(t){for(var e=[""],r=0;r<t.length;r++)e[0]+=t[r].letter;if(e.push(e[0].split("").reverse().join("")),this.settings.words.indexOf(e[0])>-1||this.settings.words.indexOf(e[1])>-1){for(var r=0;r<t.length;r++){var i=t[r].row+1,s=t[r].col+1,o=document.querySelector(".ws-area .ws-row:nth-child("+i+") .ws-col:nth-child("+s+")");o.classList.add("ws-found")}for(var n=document.querySelector(".ws-words"),a=n.getElementsByTagName("li"),r=0;r<a.length;r++)e[0].toLowerCase()==a[r].innerHTML.toLowerCase()&&(a[r].innerHTML="<del>"+a[r].innerHTML+"</del>");this.solved++,this.solved==this.settings.words.length&&this.gameOver()}},t.prototype.gameOver=function(){var t=document.createElement("div");t.setAttribute("id","ws-game-over-outer"),t.setAttribute("class","ws-game-over-outer"),this.wrapEl.parentNode.appendChild(t);var t=document.getElementById("ws-game-over-outer");t.innerHTML="<div class='ws-game-over-inner' id='ws-game-over-inner'><div class='ws-game-over' id='ws-game-over'><h2>Congratulations!</h2><p>You've found all of the words!</p></div></div>"},t.prototype.onMousedown=function(t){var e=this;return function(){e.selectFrom=t}},t.prototype.onMouseover=function(t){var e=this;return function(){if(e.selectFrom){e.selected=e.getItems(e.selectFrom.row,e.selectFrom.col,t.row,t.col),e.clearHighlight();for(var r=0;r<e.selected.length;r++){var i=e.selected[r],s=i.row+1,o=i.col+1,n=document.querySelector(".ws-area .ws-row:nth-child("+s+") .ws-col:nth-child("+o+")");n.className+=" ws-selected"}}}},t.prototype.onMouseup=function(){var t=this;return function(){t.selectFrom=null,t.clearHighlight(),t.lookup(t.selected),t.selected=[]}}}();
\ No newline at end of file