fix: support requestAnimationFrame

caisui · Oct 10, 2015 · f1b5bd8 · f1b5bd8
1 parent 8e6138d
commit f1b5bd8
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/plugin/smooth-scroll.js b/plugin/smooth-scroll.js
@@ -1,5 +1,13 @@
 // vim: set fdm=marker:
 (function () {
+    const prefix = "mozRequestAnimationFrame" in window;
+    const requestAnimationFrame =
+        prefix ? "mozRequestAnimationFrame" : "requestAnimationFrame";
+    const cancelRequestAnimationFrame =
+        prefix ? "mozCancelRequestAnimationFrame" : "CancelRequestAnimationFrame";
+
+    const now = prefix ? Date.now.bind(Date) : performance.now.bind(performance);
+
     function SmoothScroller(elem, dir) {
         this.elem = Cu.getWeakReference(elem);
         this.dir = dir || "x";
@@ -21,7 +29,7 @@
                 return;
             }
 
-            this.startTime = Date.now();
+            this.startTime = now();
             this.endTime = this.startTime + this.duration;
 
             this._start = this._pos;
@@ -97,23 +105,23 @@
                 array.splice(k);
             }
             if (k > 0) {
-                this.handle = window.mozRequestAnimationFrame(this);
+                this.handle = window[requestAnimationFrame](this.sample.bind(this));
             } else {
                 this.handle = 0;
                 Cu.reportError("new");
             }
         },
         update: function () {
             if (!this.handle) {
-                this.handle = window.mozRequestAnimationFrame(this);
+                this.handle = window[requestAnimationFrame](this.sample.bind(this));
             }
         },
         reset: function reset() {
             this.array = [];
             this.x.clear();
             this.y.clear();
             if (this.handle) {
-                window.mozCancelRequestAnimationFrame(this.handle);
+                window[cancelRequestAnimationFrame](this.handle);
                 this.handle = 0;
             }
         },