diff -r dbd46ed42b0d -r d92196482ad9 web/static/res/js/incchoice.js --- a/web/static/res/js/incchoice.js Wed Dec 12 04:01:13 2012 +0100 +++ b/web/static/res/js/incchoice.js Wed Dec 12 15:54:57 2012 +0100 @@ -68,20 +68,27 @@ this.canSelectWord = false; - // Start the mosaic effect - incMosaic.UnpauseEffect(true); - - // Fade the text - $('.big_txt').animate({opacity: 0}, 20000 * 1 / effectSpeed); - // Save the word this.setCookie("niv1_world" + this.currentWorldIndex, $("#mot" + wordIndex).html()); + + ++this.currentWorldIndex; + + if (this.currentWorldIndex == 3) { + // The 3 words get choosen + location.href = "niv1_videoplayer.html"; + } else { + + // Start the mosaic effect + incMosaic.UnpauseEffect(true); + + // Fade the text + $('.big_txt').animate({opacity: 0}, 20000 * 1 / effectSpeed); + } }; this.effectIsDone = function() { this.canSelectWord = true; - ++this.currentWorldIndex; // Set the list of words and the mosaic effect this.setWordsAndEffect(this.currentWorldIndex); @@ -91,11 +98,6 @@ // Fade the text $('.big_txt').animate({opacity: 1}, 10000 * 1 / effectSpeed); - - if (this.currentWorldIndex == 3) { - // The 3 words get choosen - location.href = "niv1_videoplayer.html"; - } }; this.getChoosenWords = function()