Merge pull request #1 from ChenShuang/master

"use strict"
lgarron · Feb 14, 2012 · c32f7ea · c32f7ea
2 parents 9e5e194 + 9dfce39
commit c32f7ea
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 41 deletions.
diff --git a/inc/mark2/common.js b/inc/mark2/common.js
@@ -1,4 +1,4 @@
-
+"use strict";
 // Offline Caching
 if (typeof window.applicationCache !== "undefined") {
 	window.applicationCache.addEventListener('updateready', function() {

diff --git a/inc/mark2/controller.js b/inc/mark2/controller.js
@@ -4,7 +4,7 @@
  * Lucas Garron, November/December 2011
  *
  */
-
+"use strict";
 mark2.controller = (function() {
 
 	/*
@@ -18,7 +18,7 @@ mark2.controller = (function() {
 	var workerMap = {};
 
 	// alg.garron.us puzzle ID mapping.
-	eventIDToAlgPuzzleID = {
+	var eventIDToAlgPuzzleID = {
 		"333": "3x3x3",
 		"444": "4x4x4",
 		"555": "5x5x5",
@@ -60,7 +60,7 @@ mark2.controller = (function() {
     var getScrambleSetsJSON = function() {
 
     	var rounds = mark2.ui.getRoundsJSON();
-    	scrambleSets = [];
+    	var scrambleSets = [];
 
 		for (var i = 0; i < rounds.length; i++) {
 
@@ -649,4 +649,4 @@ mark2.controller = (function() {
 		initialize: initialize,
 		go: go
 	};
-})();
+})();
diff --git a/inc/mark2/ui.js b/inc/mark2/ui.js
@@ -5,7 +5,7 @@
  *
  */
 
-
+"use strict";
 mark2.ui = (function() {
 
 	/*
@@ -45,7 +45,7 @@ mark2.ui = (function() {
 		var currentEventsTR;
 
 		for (var i =0; i < settings.event_order.length; i++) {
-			eventID = settings.event_order[i]
+			var eventID = settings.event_order[i]
 
 			settings.events[eventID].initialized = false;
 
@@ -256,4 +256,4 @@ mark2.ui = (function() {
 		updateHash: updateHash,
 		getRoundsJSON: getRoundsJSON
 	};
-})();
+})();
diff --git a/inc/mark2/workers.js b/inc/mark2/workers.js
@@ -1,4 +1,4 @@
-
+"use strict";
 Math.random = undefined; // So we won't use it by accident.
 
 var web_worker_manager = (function() {
@@ -133,4 +133,4 @@ var web_worker_manager = (function() {
 })();
 
 var console = web_worker_manager.console;
-onmessage = web_worker_manager.onmessage;
+onmessage = web_worker_manager.onmessage;
diff --git a/inc/scramblers/scramble_222.js b/inc/scramblers/scramble_222.js
@@ -9,6 +9,7 @@ Ported by Lucas Garron, November 23, 2011.
 
  */
 
+"use strict";
 if (typeof scramblers === "undefined") {
   var scramblers = {};
 }
@@ -114,7 +115,7 @@ scramblers["222"] = (function() {
       tot=new Array(0,0,0,0,0,0,0);
       for(var e=0;e<24;e++) tot[posit[e]]++;
   }
-  mov2fc=new Array()
+  var mov2fc=new Array()
   mov2fc[0]=new Array(0, 2, 3, 1, 23,19,10,6 ,22,18,11,7 ); //D
   mov2fc[1]=new Array(4, 6, 7, 5, 12,20,2, 10,14,22,0, 8 ); //L
   mov2fc[2]=new Array(8, 10,11,9, 12,7, 1, 17,13,5, 0, 19); //B
@@ -135,7 +136,7 @@ scramblers["222"] = (function() {
           q--;
       }
   }
-  sol=new Array();
+  var sol=new Array();
   function solve(){
       calcadj();
       var opp=new Array();
@@ -210,10 +211,10 @@ scramblers["222"] = (function() {
       }
       return(false);
   }
-  perm=new Array();
-  twst=new Array();
-  permmv=new Array()
-  twstmv=new Array();
+  var perm=new Array();
+  var twst=new Array();
+  var permmv=new Array()
+  var twstmv=new Array();
   function calcperm(){
       //calculate solving arrays
       //first permutation
@@ -425,7 +426,7 @@ scramblers["222"] = (function() {
   function initialize(){
 
     if (!initialized) {
-
+      var i, j;
       // build lookup table
       flat2posit=new Array(12*size*size);
       for(i=0; i<flat2posit.length; i++) flat2posit[i]=-1;
@@ -510,7 +511,7 @@ scramblers["222"] = (function() {
     var r = Raphael(parentElement, w, h);
 
     var s="",i,f,d=0,q;
-    ori = 0;
+    var ori = 0;
     d=0;
     s="<table border=0 cellpadding=0 cellspacing=0>";
     for(i=0;i<3*size;i++){
@@ -666,4 +667,4 @@ scramblers["222"] = (function() {
     /* Other methods */
   };
 
-})();
+})();
diff --git a/inc/scramblers/scramble_333.js b/inc/scramblers/scramble_333.js
@@ -10,15 +10,15 @@ Compiled to Javascript using GWT.
 
  */
 
-
+"use strict";
 if (typeof scramblers === "undefined") {
   var scramblers = {};
 }
 
 scramblers["333"] = (function() {
 
 
-
+var _;
 function nullMethod(){
 }
 
@@ -1692,6 +1692,7 @@ var Cnk, ckmv, ckmv2, cornerColor, cornerFacelet, edgeColor, edgeFacelet, fact,
   };
 
   var initialized = false;
+  var search;
 
   var ini = function(callback, iniRandomSource, statusCallback) {
 
@@ -1710,8 +1711,6 @@ var Cnk, ckmv, ckmv2, cornerColor, cornerFacelet, edgeColor, edgeFacelet, fact,
 
   var getRandomScramble = function() {
 
-    theRandomCube = randomCube_0();
-
     var posit = randomCube_0();
     var solution = $solution(search, posit);
 
@@ -1739,4 +1738,4 @@ scramblers["333fm"] = scramblers["333"];
 scramblers["333ft"] = scramblers["333"];
 scramblers["333bf"] = scramblers["333"];
 scramblers["333oh"] = scramblers["333"];
-scramblers["333mbf"] = scramblers["333"];
+scramblers["333mbf"] = scramblers["333"];
diff --git a/inc/scramblers/scramble_NNN.js b/inc/scramblers/scramble_NNN.js
@@ -9,7 +9,7 @@ Ported by Lucas Garron, November 24, 2011.
 
  */
 
-
+"use strict";
 if (typeof scramblers === "undefined") {
   var scramblers = {};
 }
@@ -96,6 +96,7 @@ if (typeof scramblers === "undefined") {
         }*/
 
         // build lookup table
+        var i, j;
         flat2posit=new Array(12*size*size);
         for(i=0; i<flat2posit.length; i++) flat2posit[i]=-1;
         for(i=0; i<size; i++){
@@ -166,7 +167,7 @@ if (typeof scramblers === "undefined") {
         var la; // last axis moved
 
         // for each cube scramble
-        for( n=0; n<numcub; n++){
+        for( var n=0; n<numcub; n++){
           // initialise this scramble
           la=-1;
           seq[n]=new Array(); // moves generated so far
@@ -282,7 +283,7 @@ if (typeof scramblers === "undefined") {
         var r = Raphael(parentElement, w, h);
 
         var s="",i,f,d=0,q;
-        ori = 0;
+        var ori = 0;
         d=0;
         s="<table border=0 cellpadding=0 cellspacing=0>";
         for(i=0;i<3*size;i++){

diff --git a/inc/scramblers/scramble_clock.js b/inc/scramblers/scramble_clock.js
@@ -1,5 +1,5 @@
 
-
+"use strict";
 if (typeof scramblers === "undefined") {
   var scramblers = {};
 }
@@ -223,6 +223,7 @@ scramblers["clock"] = (function() {
   }
 
   Math.TAU = Math.PI * 2;
+  var arrx, arry;
 
   function drawClockFace(r, w, h, cx, cy, face_fill, hour) {
 
@@ -284,8 +285,8 @@ scramblers["clock"] = (function() {
 
       drawCircle(r, w, h, cx, cy, clock_radius, fill, stroke, stroke_width);
 
-  		for (x = cx - face_background_dist; x <= cx + face_background_dist; x += face_background_dist) {
-  			for (y = cy - face_background_dist; y <= cy + face_background_dist; y += face_background_dist) {
+  		for (var x = cx - face_background_dist; x <= cx + face_background_dist; x += face_background_dist) {
+  			for (var y = cy - face_background_dist; y <= cy + face_background_dist; y += face_background_dist) {
           drawCircle(r, w, h, x, y, face_background_radius, fill, stroke, stroke_width);
   			}
   		}
@@ -298,8 +299,8 @@ scramblers["clock"] = (function() {
     drawSideBackground(cx, cy, "#36F", "none");
 
     var i = 0;
-  	for (y = cy - face_dist; y <= cy + face_dist; y += face_dist) {
-  		for (x = cx - face_dist; x <= cx + face_dist; x += face_dist) {
+  	for (var y = cy - face_dist; y <= cy + face_dist; y += face_dist) {
+  		for (var x = cx - face_dist; x <= cx + face_dist; x += face_dist) {
   			drawClockFace(r, w, h, x, y, "#8AF", state.dials[i]);
   			//console.log(state.dials[i]);
   			i++;
@@ -345,4 +346,4 @@ scramblers["clock"] = (function() {
 
     /* Other methods */
   };
-})();
+})();
diff --git a/inc/scramblers/scramble_minx.js b/inc/scramblers/scramble_minx.js
@@ -9,7 +9,7 @@ R means all layers right from the L face together in one move.
 U is the regular move of the U face, according to standard cube notation.
 <br>
  */
-
+"use strict";
 if (typeof scramblers === "undefined") {
   var scramblers = {};
 }
@@ -48,16 +48,16 @@ scramblers["minx"] = (function() {
 
    function applyMove(state, movePerm) {
    	 var stateNew = [];
-  	 for (i = 0; i < 11*12; i++) {
+  	 for (var i = 0; i < 11*12; i++) {
   		stateNew[i] = state[movePerm[i]];
   	 }
   	 return stateNew;
    }
 
   function getRandomScramble(){
 
-
-	seq =new Array();
+	var i;
+	var seq =new Array();
 	for(i=0; i<linenbr*linelen; i++){
 		seq[i]=Math.floor(randomSource.random()*2);
 	}
@@ -268,4 +268,4 @@ scramblers["minx"] = (function() {
 
     /* Other methods */
   };
-})();
+})();
diff --git a/inc/scramblers/scramble_pyram.js b/inc/scramblers/scramble_pyram.js
@@ -3,7 +3,7 @@
 /* Random-State modification by Lucas Garron (lucasg a t gmx d o t de / garron.us) in collaboration with Michael Gottlieb (mzrg.com)*/
 /* Optimal modification by Michael Gottlieb (qqwref a t gmail d o t com) from Jaap's code */
 /* Version 1.0*/
-
+"use strict";
 if (typeof scramblers == "undefined") {
   var scramblers = {};
 }
@@ -629,4 +629,4 @@ scramblers["pyram"] = (function() {
 
     /* Other methods */
   };
-})();
+})();
diff --git a/inc/scramblers/scramble_sq1.js b/inc/scramblers/scramble_sq1.js
@@ -1177,4 +1177,4 @@ function drawSq(stickers, middleIsSolved, shapes, parentElement, width, height,
     generate: square1SolverGenerate,
   };
 
-})();
+})();