removing some old files and cleaning some trash comments

dhg · May 13, 2014 · 2e8d539 · 2e8d539
1 parent 320f652
commit 2e8d539
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 37 deletions.
diff --git a/parallax/.DS_Store b/parallax/.DS_Store
diff --git a/parallax/favicon.png b/parallax/favicon.png
diff --git a/parallax/img/bg2-small.jpg b/parallax/img/bg2-small.jpg
diff --git a/parallax/img/davegamache.jpg b/parallax/img/davegamache.jpg
diff --git a/parallax/index.html b/parallax/index.html
@@ -62,8 +62,6 @@ <h2 class="byline">An experiment by Dave Gamache</h2>
 </div>
 <h3 class="error">Whoops! Right now this demo doesn't handle resizing or browsers less than 1000px wide. Reload this page or get on a laptop!</h3>
 
-<!-- <script src="js/yepnope-1.5.4.min.js"></script> -->
-<!-- <script src="js/loading.js"></script> -->
 <script src="js/jquery-2.0.2.min.js"></script>
 <script src="js/picasso.js"></script>
 </body>

diff --git a/parallax/js/loading.js b/parallax/js/loading.js
diff --git a/parallax/js/picasso.js b/parallax/js/picasso.js
@@ -349,16 +349,13 @@
     /*  Animation/Scrolling
     -------------------------------------------------- */
     updatePage = function() {
-      // console.log(Math.abs(scrollTop - $window.scrollTop()) < 100);
-      // if(Math.abs(scrollTop - $window.scrollTop()) < 100) {
       window.requestAnimationFrame(function() {
-          setScrollTops();
-          if(scrollTop > 0 && scrollTop <= (bodyHeight - windowHeight)) {
-            animateElements();
-            setKeyframe();
-          }
-        });
-      // }
+        setScrollTops();
+        if(scrollTop > 0 && scrollTop <= (bodyHeight - windowHeight)) {
+          animateElements();
+          setKeyframe();
+        }
+      });
     }
 
     setScrollTops = function() {
@@ -396,21 +393,8 @@
     }
 
     easeInOutQuad = function (t, b, c, d) {
-      // linear
-      // return c*t/d + b;
-
-      //quad out
-      // t /= d;
-      // return -c * t*(t-2) + b;
-
       //sinusoadial in and out
       return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
-
-      // quadinout
-      // t /= d/2;
-      // if (t < 1) return c/2*t*t + b;
-      // t--;
-      // return -c/2 * (t*(t-2) - 1) + b;
     };
 
     setKeyframe = function() {
@@ -427,12 +411,10 @@
 
     showCurrentWrappers = function() {
       var i;
-      // console.log("showCurrentWrappers called")
       if(keyframes[currentKeyframe].wrapper != currentWrapper) {
         $(currentWrapper).hide();
         $(keyframes[currentKeyframe].wrapper).show();
         currentWrapper = keyframes[currentKeyframe].wrapper;
-        // console.log($(keyframes[currentKeyframe].wrapper));
       }
     }
 

diff --git a/parallax/js/yepnope-1.5.4.min.js b/parallax/js/yepnope-1.5.4.min.js