diff options
author | Bryan Berry <bryan@olenepal.org> | 2009-12-30 14:30:33 (GMT) |
---|---|---|
committer | Bryan Berry <bryan@olenepal.org> | 2009-12-30 14:30:33 (GMT) |
commit | 28e90ec31affc14099b7bea96d0b98f19f5fe1bb (patch) | |
tree | 175ad9389bb640c9bb8c0fd58ae04f8d9b71b81d | |
parent | 464829efe0dac42a2b6cd64f6222fc571e571778 (diff) | |
parent | faa55c0d17261ee45257fa6f22084c7dab9e9662 (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainline
-rw-r--r-- | examples/NumberWords/index.html | 1 | ||||
-rw-r--r-- | examples/NumberWords/js/lesson.js | 38 |
2 files changed, 22 insertions, 17 deletions
diff --git a/examples/NumberWords/index.html b/examples/NumberWords/index.html index c921aca..4c9319b 100644 --- a/examples/NumberWords/index.html +++ b/examples/NumberWords/index.html @@ -6,6 +6,7 @@ <script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script> <script type="text/javascript" src="../../js/karma.js"></script> <script type="text/javascript" src="js/lesson.js"></script> + <title>Number Words</title> </head> <body> <div id="instructions">Count the number of footballs in the box and find the corresponding number word in the crossword puzzle.</div> diff --git a/examples/NumberWords/js/lesson.js b/examples/NumberWords/js/lesson.js index 3b1ba17..cf16aba 100644 --- a/examples/NumberWords/js/lesson.js +++ b/examples/NumberWords/js/lesson.js @@ -21,6 +21,7 @@ $(document).ready (function(){ var counter=0,key; var paper,set; var totalQuest = 10; //total number of questions before gameover is displayed + var isActive=false; var shuffle = function (choices) { for(var i=0;i<choices.length;i++) { @@ -46,12 +47,12 @@ $(document).ready (function(){ } var showList = function () { //shows the list on right like One (1) - $("#"+ANS[key]).show().css({"color":COLOR[k.rand(0,COLOR.length)]}); + $("#"+ANS[key]).show().css({"color":COLOR[k.rand(0,COLOR.length-1)]}); }; var congrats = function() { - $('td[className!="cell"]').unbind('click'); $("#over").show(); + isActive=false; }; var init = function () { //lesson initialization stuffs @@ -76,26 +77,29 @@ $(document).ready (function(){ $("#"+elem).removeClass('cell').addClass(ANS[k]); //if the cell holds correct answer, do the steps }); } + isActive=true; } var addEvent = function() { $('td[className!="cell"]').hover(function(evt){$('.'+evt.target.className.split(' ')[0]).addClass('highlight')} ,function(evt){$('.'+evt.target.className.split(' ')[0]).removeClass('highlight')}).bind('click',function(evt) { - clickedAns = (evt.target.className).split(' ')[0]; - if(clickedAns===ANS[key]) { - $('.'+clickedAns).removeClass('highlight').removeClass('clickedAns').addClass('done'); - showList(); - counter++; - if (counter === totalQuest) { - congrats(); - return; - } - key = question[counter]; - updateQuestion(); - } - else { - console.log('no'); - } + if(isActive===true){ + clickedAns = (evt.target.className).split(' ')[0]; + if(clickedAns===ANS[key]) { + $('.'+clickedAns).removeClass('highlight').removeClass('clickedAns').addClass('done'); + showList(); + counter++; + if (counter === totalQuest) { + congrats(); + return; + } + key = question[counter]; + updateQuestion(); + } + else { + console.log('no'); + } + } }); }; |