# HG changeset patch # User Edwin Razafimahatratra # Date 1355251704 -3600 # Node ID 21a791340354af6cdc2ae78cb55eddc9c892812c # Parent 01415303372e892bc32591f9429348f73f085e5e ecrant choix unique diff -r 01415303372e -r 21a791340354 web/choix.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/choix.html Tue Dec 11 19:48:24 2012 +0100 @@ -0,0 +1,64 @@ + + + + + The End - @todo + + + + + + + + + + + + +
+ +
+ +
+
+ +
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff -r 01415303372e -r 21a791340354 web/choix_1.html --- a/web/choix_1.html Tue Dec 11 17:39:04 2012 +0100 +++ b/web/choix_1.html Tue Dec 11 19:48:24 2012 +0100 @@ -23,12 +23,12 @@ this comment corrects the white-space (display: inline); -->
@@ -53,11 +53,11 @@ // Init the resize object incResize.init("content", null, "mosaic", null, null, 130, 1920/809, null, incMosaic.registerPostNewCanvasSize); + // Set the choice logic + incChoice.setWords(0); + // Set the mosaic effect - incChoice.setMosaicEffect(["choix1fond1.jpg", "choix1fond2.jpg", "choix1fond3.jpg"], - ["choix2fond1.jpg", "choix2fond2.jpg", "choix2fond3.jpg"], - "choix_2.html"); - incChoice.currentWorldIndex = 0; + incChoice.setMosaicEffect(["choix1fond1.jpg", "choix1fond2.jpg", "choix1fond3.jpg"], ["choix2fond1.jpg", "choix2fond2.jpg", "choix2fond3.jpg"]); }); diff -r 01415303372e -r 21a791340354 web/choix_2.html --- a/web/choix_2.html Tue Dec 11 17:39:04 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ - - - - - The End - @todo - - - - - - - - - - - - -
- -
- -
- - -
- -
-
- - - - - - - - - - - - - \ No newline at end of file diff -r 01415303372e -r 21a791340354 web/choix_3.html --- a/web/choix_3.html Tue Dec 11 17:39:04 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - - - - - The End - @todo - - - - - - - - - - - - -
- -
- -
- - -
- -
-
- - - - - - - - - - - - - \ No newline at end of file diff -r 01415303372e -r 21a791340354 web/static/res/js/incchoice.js --- a/web/static/res/js/incchoice.js Tue Dec 11 17:39:04 2012 +0100 +++ b/web/static/res/js/incchoice.js Tue Dec 11 19:48:24 2012 +0100 @@ -2,10 +2,10 @@ function IncChoice() { - this.currentWorldIndex = -1; - this.lastWorldIndex = -1; + this.currentWorldIndex = 0; + this.canSelectWord = true; - this.setMosaicEffect = function(images1, images2, nextUrl) + this.setMosaicEffect = function(images1, images2) { // Choose 2 image for the effect var image1 = images1[incMosaic.randomInt(0, images1.length)]; @@ -14,16 +14,46 @@ incMosaic.addImageUrl("static/res/img/" + image2); // Start mosaic effect - incMosaic.start("mosaic", effectSpeed, 9, 5, false, true, function() { location.href = nextUrl;}); + incMosaic.start("mosaic", effectSpeed, 9, 5, false, true, function() {incChoice.effectIsDone();}); }; - this.selectWord = function(word) + this.setWords = function(choiceIndex) { - if (this.currentWorldIndex == this.lastWorldIndex) { + if (choiceIndex == 0) { + $("#mot1").html("famille"); + $("#mot2").html("amour"); + $("#mot3").html("travail"); + $("#mot4").html("international"); + $("#mot5").html("dieu"); + $("#mot6").html("president"); + + } else if (choiceIndex == 1) { + $("#mot1").html("actif"); + $("#mot2").html("passif"); + $("#mot3").html("corps"); + $("#mot4").html("charité"); + $("#mot5").html("patrie"); + $("#mot6").html("politique"); + + } else { + $("#mot1").html("spleen"); + $("#mot2").html("ideal"); + $("#mot3").html("origines"); + $("#mot4").html("peur"); + $("#mot5").html("desir"); + $("#mot6").html("bonheur"); + } + }; + + this.selectWord = function(wordIndex) + { + if (!this.canSelectWord) { // Don't set the word 2 times return; } + this.canSelectWord = false; + // Start the mosaic effect incMosaic.goEffect(); @@ -31,11 +61,26 @@ $('.big_txt').animate({opacity: 0}, 20000 * 1 / effectSpeed); // Save the word - this.setCookie("niv1_world" + this.currentWorldIndex, word); - this.lastWorldIndex = this.currentWorldIndex; - //++this.currentWorldIndex; + this.setCookie("niv1_world" + this.currentWorldIndex, $("#mot" + wordIndex).html()); }; + this.effectIsDone = function() + { + this.canSelectWord = true; + ++this.currentWorldIndex; + + // Change list of words + this.setWords(this.currentWorldIndex); + + // Fade the text + $('.big_txt').animate({opacity: 1}, 20000 * 1 / effectSpeed); + + if (this.currentWorldIndex == 3) { + // The 3 words get choosen + location.href = "niv1_videoplayer.html"; + } + } + this.setCookie = function(name, value) { $.removeCookie(name); diff -r 01415303372e -r 21a791340354 web/static/res/js/incmosaic.js --- a/web/static/res/js/incmosaic.js Tue Dec 11 17:39:04 2012 +0100 +++ b/web/static/res/js/incmosaic.js Tue Dec 11 19:48:24 2012 +0100 @@ -215,6 +215,7 @@ } else if (this.endEffecFunc != undefined && this.endEffecFunc != null) { // Call the end callback this.endEffecFunc(); + this.endEffecFunc = null; } } };