[changed] Rename Scrolling => ScrollHistory

surajahmed · Feb 16, 2015 · ae6fcda · ae6fcda
1 parent 8276235
commit ae6fcda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/modules/Scrolling.js → modules/ScrollHistory.js b/modules/Scrolling.js → modules/ScrollHistory.js
@@ -26,9 +26,10 @@ function shouldUpdateScroll(state, prevState) {
  * Provides the router with the ability to manage window scroll position
  * according to its scroll behavior.
  */
-var Scrolling = {
+var ScrollHistory = {
 
   statics: {
+
     /**
      * Records curent scroll position as the last known position for the given URL path.
      */
@@ -48,11 +49,12 @@ var Scrolling = {
 
       return this.scrollHistory[path] || null;
     }
+
   },
 
   componentWillMount: function () {
     invariant(
-      this.getScrollBehavior() == null || canUseDOM,
+      this.constructor.getScrollBehavior() == null || canUseDOM,
       'Cannot use scroll behavior without a DOM'
     );
   },
@@ -69,7 +71,7 @@ var Scrolling = {
     if (!shouldUpdateScroll(this.state, prevState))
       return;
 
-    var scrollBehavior = this.getScrollBehavior();
+    var scrollBehavior = this.constructor.getScrollBehavior();
 
     if (scrollBehavior)
       scrollBehavior.updateScrollPosition(
@@ -80,4 +82,4 @@ var Scrolling = {
 
 };
 
-module.exports = Scrolling;
+module.exports = ScrollHistory;
diff --git a/modules/createRouter.js b/modules/createRouter.js
@@ -10,8 +10,8 @@ var HistoryLocation = require('./locations/HistoryLocation');
 var RefreshLocation = require('./locations/RefreshLocation');
 var StaticLocation = require('./locations/StaticLocation');
 var NavigationContext = require('./NavigationContext');
+var ScrollHistory = require('./ScrollHistory');
 var StateContext = require('./StateContext');
-var Scrolling = require('./Scrolling');
 var createRoutesFromReactChildren = require('./Routing').createRoutesFromReactChildren;
 var isReactChildren = require('./isReactChildren');
 var Transition = require('./Transition');
@@ -442,11 +442,15 @@ function createRouter(options) {
           location.removeChangeListener(Router.handleLocationChange);
 
         this.isRunning = false;
+      },
+
+      getScrollBehavior: function () {
+        return scrollBehavior;
       }
 
     },
 
-    mixins: [ NavigationContext, StateContext, Scrolling ],
+    mixins: [ NavigationContext, StateContext, ScrollHistory ],
 
     propTypes: {
       children: PropTypes.falsy
@@ -482,10 +486,6 @@ function createRouter(options) {
       return location;
     },
 
-    getScrollBehavior: function () {
-      return scrollBehavior;
-    },
-
     getRouteAtDepth: function (depth) {
       var routes = this.state.routes;
       return routes && routes[depth];