minor changes

2 files changed, 36 insertions, 83 deletions

diff --git a/examples/English_Animal_Identification/js/ui.scoreboard.js b/examples/English_Animal_Identification/js/ui.scoreboard.js
index 43ed9d7..e8b3277 100644
--- a/examples/English_Animal_Identification/js/ui.scoreboard.js
+++ b/examples/English_Animal_Identification/js/ui.scoreboard.js
@@ -37,7 +37,7 @@
 		      var divDisplay = "inline";
 		      var score = this.options.score;
 		      var total = this.options.total;
-		      var iconPlayAgain = "";
+		      var iconPlayAgain = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oBBg4CK/NuVU0AAAS6SURBVDjLtZVbbFRFGMf/38w5e/bSZdvSK71tW1JIgYhGg4Axpl4ACxoTIWh48AnwUSVc5EFfuDSYkGgCkaCJCb6IogEqPBhuYjW0xpIAQaBttpXet3vfPWfPOfP5soWWYsKLk/xfJt/85ptv/t8MMTP+jyGeJIg2nZRPEte47mC4bu3hUgCgx2Xc3H6gBSR2MlEbK64GQScgDcI4My4o1z1ZPlF2padnqz29punN/ZXKFV2C3bb+zr2RWWAiUFN7x3EmbPb5gx6P36dJqcHj0aAJgF0XlmW56VQybWbzGog6/JncYcsH4QpvNzO3CEkNfad3DWozM21q7/haaPrGUHmFXykFVi50TcCjCRi6Bl0TkKJI6jXlISJGJDK2ZxJqB0DDzeHqhpHRybSVdRQAPAA3th9YIaV82z8vFIhPjCnlukIKibjrMDMcn1fPlpYW+ysr5+uKgZzpYsnieh+rGt9kNBlc3lpPP3ROOJYONevyBIntRDKQjkW5vKKCGpqbzNLqqu8Gzu4STFxp5Z3XRkYnT/Ve/zubjCe5tiKIaNLEZCqP5nAV6VKACSQdmg1m0BrHsWnR4pZY6+LGv/J5JwaoQwAQObs71n9m57X+Mzs3s3JW90eGu3/vvpWpDHlQWx5E141haFJAKTUXDIIRCoXuNzfVfBnye0+AxB2XPbFHHTPQ+XGvctUe27I1n1fH6FQGAGB4JBzXJWnQ7BozOFtSHPw86POeyeeNSbbom2BdRXKuFTuWCYHTL65sNUrmBVBRGsQLy2rg0SXARFlbzAaH02bjpco+dfG9LQoAsLVljr/Da/dXQxPnieG/1HXDUgWrTjuWmT2aL6lmNUjT+o4JBhc9tvMYKQh6Vbr+244x5fuvzuM8G5GfPx1nBj/0MXPx+++2aR79YdmzloPvz12zorHch5HOXdcL0xYAPLvtmA6U+FctfdqcH8yXXP2zd1Vf/9AxZpQ9UmMiw5D48co9MAPrVoTR1X0nF09mj0TO7T7xaHaaClRKQx01fKmfEqYqn5xKbCMp3TmPEBNAIJi2i6YFIUhBGByLAUTLFq7ZVzfn3BLzXFetTKSyW7p7b+6Ix+NhMPc/2HhGhUgIwuqlC3D3nzhuD8XxzobnfZe67758t+/+7cb1B78gxT2QcrAoVKzphvczj3CLf/2t5yXbdlhquu3k1fE5YAIgiCDYxcrWKqRyDm4ORLG0pVa2hKv8A0PjH8VSmVwykRW5VDJgZZLQDQPeQAA+qVF8fMwk0/x2bsaKaGhkik+d70kwsVi+qFZb3hr2j8RN5G0X5eWlWjAUCnINw1WMnOUgazlIZ0xMjo6k4bgfDFz8xHzoJGYQkQy/vt82dC0djXRvSPZdGC1ZsvGN4Pz67Q11ZTVlpSV6oCggNF1DJmcjY9pIpk1EozGViCXybibaMXT50BEAJgCTmfPTYG943YFYLnZv09gfX90E4CvIW9zc9lRR/XObNe+8Z0DC0KWwbVdJZoayM1czw71Hp251XgeQKyjLzNlpMNW/svetwV/2XQbgBWDMkF6QlEZI91UuLLUTEzErMRgDkC/42ipAUwAsZuY5XxMRyRmwaWkAJAAG4BZkF5QH4DCzO5PzL1gVS5MKhAwdAAAAAElFTkSuQmCC";
 
 		   
 		      this._setData('initialScore', parseInt(this.options.score));
@@ -52,26 +52,23 @@
 		      this.element.css({'max-width':'400px', 'max-height': '400px'});
 
 		      this.valueDiv = $("<div></div>")
-			  .addClass('ui-corner-all')
+			  .addClass('ui-corner-all ui-widget')
 			  .css({border:"2px solid black", background : 'white'});
 		      var clone = $('<div>').css({display:divDisplay, padding:'5px'});
 				      
-		      this._scoreText = clone.clone().text("Score:");
-		      //this._scoreText = $("<div>Score:</div>")
-		      //  .css({display:divDisplay});
-		      this._scoreText.appendTo(this.valueDiv);
-		      this._score = $("<div>" + score + "</div>")
-			  .css({display:divDisplay, padding:'5px'});
-		      this._score.appendTo(this.valueDiv);
-		      $("<div>Total:</div>").css({display:divDisplay})
+		      this._scoreText = clone.clone().text("Score:")
 			  .appendTo(this.valueDiv);
-		      this._total = $("<div>" + total + "</div>")
-			  .css({display:divDisplay});
-		      this._total.appendTo(this.valueDiv);
-		      $("<div>Play Again</div>").css({display:divDisplay})
-			  .appendTo(this.valueDiv);
-		      $('<img>').attr({src:iconPlayAgain}).appendTo(this.valueDiv);
-				  
+		      this._score = clone.clone().text(score).appendTo(this.valueDiv);
+		      clone.clone().text("Total:").appendTo(this.valueDiv);
+		      this._total = clone.clone().text(total).appendTo(this.valueDiv);
+		      var playAgainDiv = clone.clone()
+			  .addClass('ui-corner-all ui-state-default')
+			  .css({'border':'black solid 2px', 'background-color':'red' })
+		          .appendTo(this.valueDiv);
+		      $('<img>').attr({src:iconPlayAgain}).appendTo(playAgainDiv);
+		      $("<span>Play Again</span>").appendTo(playAgainDiv);
+			      
+
 		      this.valueDiv.appendTo(this.element);
 
 		  },
diff --git a/tests/js/tests.js b/tests/js/tests.js
index a384f0f..1179613 100755
--- a/tests/js/tests.js
+++ b/tests/js/tests.js
@@ -43,18 +43,6 @@
 	     while($('#karma-status').length === 1){
 		 $('#karma-status').remove();
 	     };
-	     /* if (this._statusDiv){
-		 if (this._statusDiv.parentNode){
-		     this._statusDiv.parentNode.removeChild(this._statusDiv);
-		 }
-	     }
-
-	     var starterMsg = document.getElementById('starterMsg');
-	     if(starterMsg){
-		 if(starterMsg.parentNode){
-		     starterMsg.parentNode.removeChild(starterMsg);
-		 }
-	     }*/
 	     
 	     this._assetPath = "assets/";
 	     this.locale = undefined;
@@ -83,7 +71,7 @@
 	     };
 	 };
 
-
+	 
 	 module("Module Helpers");
 
 
@@ -269,10 +257,6 @@
 
 	 test("karma._isValidLocale(locale)",
 	      function () {
-		  /* reject locale if has more than 2 letters
-		   * before dash or underscore
-		   * 
-		   */
 		  expect(4);
 		  // test valid locale
 		  ok(k._isValidLocale("en"), "Valid locale option accepted");
@@ -290,15 +274,6 @@
 
 
 	 test("karma._normalizeLocale(locale)", function () { 
-		  /*
-		   * change any "-" dash to underscore
-		   * make sure first part lowercase
-		   * make sure part after underscore is uppercase
-		   *
-		   * don't do anything if already ok
-		   * 
-		   * don't choke on locale w/ only two letters 
-		   */
 		  expect(3);
 		  ok(k._normalizeLocale("EN-us") === "en_US",
 		      "lowercase, uppercase, and dash properly changed");
@@ -312,11 +287,11 @@
 	 
 	 test("karma._computeLocalePath(locale)",
 	      function() {
-		  /* 
-		   * for locale es_SP 
-		   *    make sure returns path  "../assets/locale_name/" 
-		   * 
-		   */
+		  
+		   // for locale es_SP 
+		   //    make sure returns path  "../assets/locale_name/" 
+		    
+		  
 		  expect(2);
 		  ok(Karma._computeLocalePath("en_US") === 
 		     "assets/en_US/", "computes correct path");
@@ -328,7 +303,7 @@
 
 
 	 //have to do this asynchronously let the error event propagate
-	 asyncTest("Karma.kImage._init(/* bad options */)", 
+	 asyncTest("Karma.kImage._init( bad options )", 
 	      function(){
 		  expect(4);
 		  var kImage1 = Karma.create(Karma.kImage);		  
@@ -355,7 +330,7 @@
 			  
 
 
-	 asyncTest("Karma.kImage._init(/* good options */)", 
+	 asyncTest("Karma.kImage._init( good options )", 
 	     function(){
 		 expect(3);
 		 k.reset()._init();
@@ -377,7 +352,7 @@
 	     });
 
 
-	 test("Karma.kImage._init( /* localize an asset when locale not set */)",
+	 test("Karma.kImage._init( localize an asset when locale not set )",
 	      function(){
 		  expect(1);
 		  var kMock = Karma.create(Karma.kImage);
@@ -434,12 +409,12 @@
 
 	 test("Karma._isLocalized(boolLocalized)",
 		 function(){
-		  /*
-		   * reject non-boolean values
-		   * 
-		   * produce error if item is localized but not
-		   * locale isn't set for karma object
-		   */
+		  
+		 //  reject non-boolean values
+		    
+		 //  produce error if item is localized but not
+		 //  locale isn't set for karma object
+		   
 	 	     expect(4);
 		     
 		     k.locale = "en";
@@ -748,11 +723,12 @@
 
 	 //Karma.shuffle
 	 test('Karma.shuffle', function(){
-		  var list = [1,2,3,4,5];
+		  var list = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,
+			       24,25];
 		  var newList = [];
 		  var isShuffled = false;
 		  
-		  for (var i = 0; i < 5; i++){
+		  for (var i = 0; i < 20; i++){
 		      newList = Karma.shuffle(list);
 		      for (var j = 0; j < newList.length; j++){ 
 			  if(newList[j] !== list[j]){
@@ -825,19 +801,6 @@
 	      });
 
 
-	 /*
-	  //this is boilerplate text for an asyncTest
-	  //don't delete it unless u love typing ;)
-	  asyncTest(" ",  
-	       function(){
-	         expect(0);
-		 setTimeout(
-	             function(){
-		        start();	 
-	  }, 500);
-	     });
-
-	  */
 	 
 	 test("Karma.karma.ready() removes 'Karma is loading ... ' message",  
 		   function(){
@@ -849,13 +812,7 @@
 		       ok(regex.test(k._statusDiv.getAttribute('style')), 
 			       "ready() hides Karma is loading message");
 			    
-		      /* setTimeout(function() {
-			       var style = k._statusDiv.getAttribute('style');
-			       ok(style === "display:none;", 
-			       "ready() hides Karma is loading message");
-			       start();
-				   },
- 			       10);*/
+		      
 		   });
 
 	 //for whatever reason, this test only works if run last
@@ -886,16 +843,15 @@
 				  10);
 		   }); 	 
 
+     
 	 test("Karma.kCanvas 2DRendering Context Helpers",
 	      function(){
 		 k.reset()._init();
-		 /* var config = {name: "myCanvas", domId:"testCanvas"};
+		  var config = {name: "myCanvas", domId:"testCanvas"};
 		  var myCanvas = Karma.kCanvas._init(config);
 		  myCanvas.globalAlpha(0.1);
 		  ok(myCanvas.ctx.globalAlpha === 0.1,
-		     "globalAlpha property set");
-		  */
-		  ok( 1=== 1, 'foo');
+		     "globalAlpha property set");		  
 		  k.reset();
 		  
 	      });