simplified audio cassette animation code

diff --git a/package.json b/package.json
index 18733e8a5c2d7ff55d56e947b64b1f25b1cbb3da..dff585f8324f02ff104a3ab8e003fabffc83255d 100644 (file)
--- a/package.json
+++ b/package.json
@@ -24,5 +24,5 @@
     "start": "node app.js"
   },
   "subdomain": "binb",
-  "version": "0.3.5-15"
+  "version": "0.3.5-16"
 }

diff --git a/public/js/app.js b/public/js/app.js
index 4017f6b73e89465c6af371535ff103480c4ea243..4ea11d1f0c50eb1400333f3d8ec19783e3eb8e9b 100644 (file)
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -301,48 +301,46 @@
 
   // Start cassette animation
   var cassetteAnimation = function(endtime, forward) {
-    var millisleft = endtime - Date.now()
-      , secleft = millisleft / 1000
-      , width
-      , deg
+    var deg
+      , factor
+      , millisleft = endtime - Date.now()
       , offsetleft
       , offsetright
-      , css;
+      , secleft = millisleft / 1000
+      , width;
 
-    if (forward) {
-      width = 148 - (148*secleft/30);
-      deg = 360 - (360*secleft/30);
-      offsetleft = 44 - 24*secleft/30;
-      offsetright = 130 - 24*secleft/30;
-      DOM.progress.width(width);
-      DOM.cassettewheels.css('transform', 'rotate('+deg+'deg)');
-      DOM.tapeleft.css('left', offsetleft+'px');
-      DOM.taperight.css('left', offsetright+'px');
-    }
-    else {
-      width = 148*secleft/5;
-      deg = 360*secleft/5;
-      offsetleft = 20 + 24*secleft/5;
-      offsetright = 106 + 24*secleft/5;
-      DOM.progress.width(width);
-      DOM.cassettewheels.css('transform', 'rotate('+deg+'deg)');
-      DOM.tapeleft.css('left', offsetleft+'px');
-      DOM.taperight.css('left', offsetright+'px');
+    if (stopanimation || millisleft < 50) {
+      return;
     }
 
     if (forward) {
+      if (touchplay) {
+        elapsedtime = 30 - Math.round(secleft);
+      }
       DOM.countdown.text(secleft.toFixed(1));
-      if (touchplay) {elapsedtime = 30 - Math.round(secleft);}
+      factor = secleft / 30;
+      width = 148 - 148 * factor;
+      deg = 360 - 360 * factor;
+      offsetleft = 44 - 24 * factor;
+      offsetright = 130 - 24 * factor;
     }
     else {
       DOM.countdown.text(Math.round(secleft));
+      factor = secleft / 5;
+      width = 148 * factor;
+      deg = 360 * factor;
+      offsetleft = 20 + 24 * factor;
+      offsetright = 106 + 24 * factor;
     }
 
-    if (stopanimation || millisleft < 50) {
-      return;
-    }
+    DOM.progress.width(width);
+    DOM.cassettewheels.css('transform', 'rotate('+deg+'deg)');
+    DOM.tapeleft.css('left', offsetleft+'px');
+    DOM.taperight.css('left', offsetright+'px');
 
-    setTimeout(function() {cassetteAnimation(endtime, forward);}, 50);
+    setTimeout(function() {
+      cassetteAnimation(endtime, forward);
+    }, 50);
   };
 
   var clearPrivate = function() {