web/static/res/js/incmosaic.js
changeset 78 8c3f0b94d056
parent 45 f7bfdc49982b
child 93 7c37aaa2a8ae
--- a/web/static/res/js/incmosaic.js	Tue Jan 15 17:17:14 2013 +0100
+++ b/web/static/res/js/incmosaic.js	Wed Jan 16 08:26:00 2013 +0100
@@ -105,10 +105,6 @@
 		}
 	};
 
-	this.registerPreNewCanvasSize = function(newCanvasWidth, newCanvasHeight)
-	{
-	};
-
 	this.registerPostNewCanvasSize = function(newCanvasWidth, newCanvasHeight)
 	{
 		// Recalculate the size of the mosaic squares
@@ -118,20 +114,31 @@
 
 	this.fillListUrl = function()
 	{
-		var urls = [];
-		for (var i = 1; i < this.imageUrls.length; ++i) {
-			urls.push(this.imageUrls[i]);
-		}
+
+		if (this.waitStartEffectGo) {
+			// Not Random
 
-		// Set random url
+			for (var i = 0; i < this.imageUrls.length; ++i) {
+				this.listeUrls.push(this.imageUrls[i]);
+			}
+
+		} else {
+
+			// Random
 
-		// The first images is always the first in this array 
-		this.listeUrls.push(this.imageUrls[0]);
+			var urls = [];
+			for (var i = 1; i < this.imageUrls.length; ++i) {
+				urls.push(this.imageUrls[i]);
+			}
 
-		while (urls.length > 0) {
-			var randInd = this.randomInt(0, urls.length);
-			this.listeUrls.push(urls[randInd]);
-			urls.remove(randInd);
+			// The first images is always the first in this array 
+			this.listeUrls.push(this.imageUrls[0]);
+
+			while (urls.length > 0) {
+				var randInd = this.randomInt(0, urls.length);
+				this.listeUrls.push(urls[randInd]);
+				urls.remove(randInd);
+			}
 		}
 	};