Names all 4 digits now

wearecollins · May 18, 2016 · 8d4fbcd · 8d4fbcd
1 parent 4487423
commit 8d4fbcd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/Webserver/static/anythingmuppets/share/main.js b/Webserver/static/anythingmuppets/share/main.js
@@ -91,6 +91,15 @@ var share = function(data, configHandler){
       index = 0;
     }
     configHandler.set({'currentName':index});
+
+    if ( index.length == 1 ){
+      index = "000" + index;
+    } else if ( index.length == 2 ){
+      index = "00" + index;
+    } else if ( index.length == 3 ){
+      index = "0" + index;
+    }
+
     name = "AM_"+ index;
 
     // show buttons after 1 second
@@ -218,14 +227,16 @@ var share = function(data, configHandler){
         setTimeout(function(){
           document.getElementById("shareLocalContainer").classList.add("enabled");
           document.getElementById("shareLocalContainer").classList.remove("disabled");
+          document.getElementById("shareOnlineContainer").classList.add("freezeAnim")
 
           setTimeout(function(){
             document.getElementById("shareLocalContainer").classList.add("freezeAnim");
-          })
+          }, 1000)
 
         }, 1000);
     } else {
         document.getElementById("shareOnlineContainer").classList.add("freezeAnim");
+        document.getElementById("shareLocalContainer").classList.add("freezeAnim");
         window.events.dispatchEvent( new Event("next") );
     }
   }
@@ -254,11 +265,18 @@ var share = function(data, configHandler){
       // show 'local'
       setTimeout(function(){
         document.getElementById("shareLocalContainer").classList.add("enabled");
+        document.getElementById("shareOnlineContainer").classList.add("freezeAnim");
+
+        setTimeout(function(){
+          document.getElementById("shareLocalContainer").classList.add("freezeAnim")
+        }, 1000)
+
         MMI.hide(("shareOnlineContainer"), "flex");
       }, 1000);
+
     } else {
-      // document.getElementById("shareOnlineContainer").classList.remove("enabled");
-      // document.getElementById("shareOnlineContainer").classList.add("disabled");
+      document.getElementById("shareOnlineContainer").classList.add("freezeAnim");
+      document.getElementById("shareLocalContainer").classList.add("freezeAnim");
       window.events.dispatchEvent( new Event("next") );
     }
   }

diff --git a/Webserver/static/performance/config.json b/Webserver/static/performance/config.json
@@ -1 +1 @@
-{"showLocalShare":true,"attractVideo":"output/performance/56-2016-05-12-16-19-32-089_final.mp4","countdownTime":3,"timeout":300,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":1.33,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":100,"allowControl":true}
+{"showLocalShare":true,"attractVideo":"output/performance/56-2016-05-12-16-19-32-089_final.mp4","countdownTime":3,"timeout":300,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":1.33,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":102,"allowControl":true}
diff --git a/Webserver/static/performance/perform/main.js b/Webserver/static/performance/perform/main.js
@@ -79,6 +79,15 @@ var perform = function(data, configHandler){
     if ( index > 1000 ){
       index = 0;
     }
+
+    if ( index.length == 1 ){
+      index = "000" + index;
+    } else if ( index.length == 2 ){
+      index = "00" + index;
+    } else if ( index.length == 3 ){
+      index = "0" + index;
+    }
+
     configHandler.set({'currentName':index});
     name = index;
 

diff --git a/Webserver/static/performance/share/main.js b/Webserver/static/performance/share/main.js
@@ -131,14 +131,16 @@ var share = function( data, configHandler ){
 			setTimeout(function(){
 				document.getElementById("shareLocalContainer").classList.add("enabled");
 				document.getElementById("shareLocalContainer").classList.remove("disabled");
+				document.getElementById("shareOnlineContainer").classList.add("freezeAnim")
 
 				setTimeout(function(){
 					document.getElementById("shareLocalContainer").classList.add("freezeAnim");
-				})
+				}, 1000)
 
 			}, 1000);
 	    } else {
 			document.getElementById("shareOnlineContainer").classList.add("freezeAnim");
+			document.getElementById("shareLocalContainer").classList.add("freezeAnim");
 		    window.events.dispatchEvent( new Event("next") );
 	    }
 	}
@@ -167,14 +169,16 @@ var share = function( data, configHandler ){
 			setTimeout(function(){
 				document.getElementById("shareLocalContainer").classList.add("enabled");
 				document.getElementById("shareLocalContainer").classList.remove("disabled");
+				document.getElementById("shareOnlineContainer").classList.add("freezeAnim");
 
 				setTimeout(function(){
 					document.getElementById("shareLocalContainer").classList.add("freezeAnim");
-				})
+				}, 1000)
 
 			}, 1000);
 	    } else {
 			document.getElementById("shareOnlineContainer").classList.add("freezeAnim");
+			document.getElementById("shareLocalContainer").classList.add("freezeAnim");
 		    window.events.dispatchEvent( new Event("next") );
 	    }
 	  }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"showLocalShare":true,"attractVideo":"output/performance/56-2016-05-12-16-19-32-089_final.mp4","countdownTime":3,"timeout":300,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":1.33,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":100,"allowControl":true}
		{"showLocalShare":true,"attractVideo":"output/performance/56-2016-05-12-16-19-32-089_final.mp4","countdownTime":3,"timeout":300,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":1.33,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":102,"allowControl":true}