Merge pull request #1155 from njam/issue-1155

Fix page stateChange for hash-based navigation (IE9)
cargomedia · Apr 25, 2014 · 348468f · 348468f
2 parents 35ecc6e + 02dfb95
commit 348468f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/CM/App.js b/library/CM/App.js
@@ -1136,15 +1136,15 @@ var CM_App = CM_Class_Abstract.extend({
     /**
      * @returns Location
      */
-    _getLocation: function() {
+    getLocation: function() {
       return window.history.location || document.location;
     },
 
     /**
      * @returns string
      */
     _getFragment: function() {
-      var location = this._getLocation();
+      var location = this.getLocation();
       return location.pathname + location.search;
     },
 

diff --git a/library/CM/Page/Abstract.js b/library/CM/Page/Abstract.js
@@ -20,7 +20,7 @@ var CM_Page_Abstract = CM_Component_Abstract.extend({
     CM_Component_Abstract.prototype._ready.call(this);
 
     if (this.hasStateParams()) {
-      var location = window.location;
+      var location = cm.router.getLocation();
       var params = queryString.parse(location.search);
       var state = _.pick(params, _.intersection(_.keys(params), this.getStateParams()));
       this.routeToState(state, location.pathname + location.search);