wait #2362

diff --git a/AccordHotel-p112/style.sass b/AccordHotel-p112/style.sass
index b3883a4501789a8b64b19df5e07bfebd912c80ac..da5dcbd4f1a81c0e2df8b282c7e1b6b81105670b 100644 (file)
--- a/AccordHotel-p112/style.sass
+++ b/AccordHotel-p112/style.sass
@@ -10,8 +10,6 @@ $bubble-bg: #B2D1C8
   display: none
   position: absolute
 .container
-  //background-image: url("bg.png")
-  background: darksalmon
   width: 540px
   height: 749px
 .bubble

diff --git a/Fluidbook-presentation-p7/index.html b/Fluidbook-presentation-p7/index.html
index bf06853211a6a83bda69e0c797556ad833ef47c0..c1fe163f3344cb265ec2afb6f071828f344e6fba 100644 (file)
--- a/Fluidbook-presentation-p7/index.html
+++ b/Fluidbook-presentation-p7/index.html
@@ -9,10 +9,7 @@
 <canvas id="canva" width="407" height="282"></canvas>
 <div class="container">
 
-    <div class="item-contain">
-
-    </div>
-
+    <div class="item-contain"></div>
 
     <div class="frame-black"></div>
     <div class="frame-left"></div>

diff --git a/Fluidbook-presentation-p7/main.js b/Fluidbook-presentation-p7/main.js
index a45e146ed36b2cb08ce630af54aed620702f6b18..c7a3caee4901a416210d167ddab9ddac7c5a1552 100644 (file)
--- a/Fluidbook-presentation-p7/main.js
+++ b/Fluidbook-presentation-p7/main.js
@@ -1,34 +1,54 @@
-var sources=['src/accorhotel.png','src/airbus.png','src/airfrance.png','src/bic.png','src/bnp.png','src/bonjour.png'
-    ,'src/brandbook.png','src/caisse.png','src/canal.png','src/canin.png','src/clubmed.png','src/credit.png','src/darty.png'
-    ,'src/disney.png','src/donne.png','src/eco.png','src/essilor.png','src/france.png','src/freud.png','src/lacoste.png'
-    ,'src/loicraison.png','src/mairie.png','src/myfm.png','src/nespresso.png','src/nikon.png','src/om.png','src/piquenique.png'
-    ,'src/project.png','src/renault.png','src/rjvp.png','src/seiko.png','src/sncf.png','src/societegeneral.png','src/tahiti.png'
-    ,'src/total.png','src/unopiu.png','src/villabeyer.png','src/vision.png','src/wesco.png']; // tableau qui contient les img
+
+var sources = ['src/accorhotel.png', 'src/airbus.png', 'src/airfrance.png', 'src/bic.png', 'src/bnp.png', 'src/bonjour.png'
+    , 'src/brandbook.png', 'src/caisse.png', 'src/canal.png', 'src/canin.png', 'src/clubmed.png', 'src/credit.png', 'src/darty.png'
+    , 'src/disney.png', 'src/donne.png', 'src/eco.png', 'src/essilor.png', 'src/france.png', 'src/freud.png', 'src/lacoste.png'
+    , 'src/loicraison.png', 'src/mairie.png', 'src/myfm.png', 'src/nespresso.png', 'src/nikon.png', 'src/om.png', 'src/piquenique.png'
+    , 'src/project.png', 'src/renault.png', 'src/rjvp.png', 'src/seiko.png', 'src/sncf.png', 'src/societegeneral.png', 'src/tahiti.png'
+    , 'src/total.png', 'src/unopiu.png', 'src/villabeyer.png', 'src/vision.png', 'src/wesco.png'];
+
 var imgtab = [];
+var n = 0;
+var randomsource = sources[Math.floor(Math.random()* sources.length)];
+console.log(randomsource);
+loadimg();
+
+$.when( n>=1 ).then(function() {
+    timeline();
+});
 
-$.each(sources, function (i,v) {
+function loadimg() {
     var image = new Image();
-    image.src = v;
-    imgtab.push(image);
 
-});
+    $(image).on('load', function () {
+        n++;
+        loadimg();
+    });
+    if (n === sources.length){
+        return ;
+    }
+    image.src = randomsource;
+    imgtab.push(image);
+}
 
-var tl = new TimelineMax({repeat:-1, repeatDelay:1});
-var timescale=1;
-slide();
-tl.to('.frame-left',0.6,{left:446});
-tl.to('.frame-right',0.6,{left:-531},'-=0.4');
-tl.to('.frame-black',0.6,{left:446},'-=0.3');
-tl.call(slide,[],null,'-=0.43');
-tl.timeScale(timescale);
+function timeline() {
+    var tl = new TimelineMax({repeat: -1, repeatDelay: 1});
+    var timescale = 1;
+    slide();
+    tl.to('.frame-left', 0.6, {left: 446});
+    tl.to('.frame-right', 0.6, {left: -531}, '-=0.4');
+    tl.to('.frame-black', 0.6, {left: 446}, '-=0.3');
+    tl.call(slide, [], null, '-=0.43');
+    tl.timeScale(timescale);
+}
 
 var slideItem = $(".item-contain");
-var sliderLength = imgtab.length;
+var sliderLength = sources.length;
 var counter = 0;
 
 function slide() {
-    var img=$(imgtab[(counter++)% sliderLength]);
+    var img = $(imgtab[(counter++) % sliderLength]);
+
     $(img).addClass('item');
     $(slideItem).append(img);
-}
-
+    $(img).prev().remove();
+}
\ No newline at end of file