From: nael Date: Wed, 28 Nov 2018 15:27:13 +0000 (+0100) Subject: wait #2338 @3.3 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=eeb8adb6255b2e0cd394cf04b34f0789d59d026b;p=Animations.git wait #2338 @3.3 --- diff --git a/Fluidbook-presentation-p7/main.js b/Fluidbook-presentation-p7/main.js index c7a3cae..3f6936a 100644 --- a/Fluidbook-presentation-p7/main.js +++ b/Fluidbook-presentation-p7/main.js @@ -1,15 +1,17 @@ + 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']; +Shuffle(sources); var imgtab = []; var n = 0; -var randomsource = sources[Math.floor(Math.random()* sources.length)]; -console.log(randomsource); + + loadimg(); $.when( n>=1 ).then(function() { @@ -18,17 +20,21 @@ $.when( n>=1 ).then(function() { function loadimg() { var image = new Image(); - $(image).on('load', function () { n++; loadimg(); + }); if (n === sources.length){ return ; } - image.src = randomsource; + image.src = sources[n]; imgtab.push(image); } +function Shuffle(o) { + for(var j, x, i = o.length; i; j = parseInt(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x); + return o; +} function timeline() { var tl = new TimelineMax({repeat: -1, repeatDelay: 1});