fix: bugs related to getting location

router5 · Jul 9, 2015 · 4c6a1d2 · 4c6a1d2
1 parent 1a7246d
commit 4c6a1d2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 29 deletions.
diff --git a/dist/browser/router5.js b/dist/browser/router5.js
@@ -488,7 +488,7 @@ var Router5 = (function () {
         this.rootNode = routes instanceof RouteNode ? routes : new RouteNode('', '', routes);
         this.activeComponents = {};
         this.options = opts;
-        this.base = window.location.pathname;
+        this.base = window.location.pathname.replace(/^\/$/, '');
 
         return this;
     }
@@ -561,7 +561,7 @@ var Router5 = (function () {
             this.started = true;
 
             // Try to match starting path name
-            var startPath = this.getLocation().replace(new RegExp('^' + this.base), '');
+            var startPath = this.getLocation();
             var startState = this.matchPath(startPath);
 
             if (startState) {
@@ -796,7 +796,7 @@ var Router5 = (function () {
          * @private
          */
         value: function getLocation() {
-            return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname;
+            return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname.replace(new RegExp('^' + this.base), '');
         }
     }, {
         key: 'buildUrl',
@@ -839,10 +839,6 @@ var Router5 = (function () {
     }, {
         key: '_transition',
 
-        /**
-         *
-         */
-
         /**
          * @private
          */
@@ -851,7 +847,7 @@ var Router5 = (function () {
 
             if (!fromState) {
                 this.lastKnownState = toState;
-                this._invokeListeners('', toState, fromState);
+                this._invokeListeners('*', toState, fromState);
                 return true;
             }
 

diff --git a/dist/browser/router5.min.js b/dist/browser/router5.min.js
diff --git a/dist/commonjs/router5.js b/dist/commonjs/router5.js
@@ -46,7 +46,7 @@ var Router5 = (function () {
         this.rootNode = routes instanceof _routeNode2['default'] ? routes : new _routeNode2['default']('', '', routes);
         this.activeComponents = {};
         this.options = opts;
-        this.base = window.location.pathname;
+        this.base = window.location.pathname.replace(/^\/$/, '');
 
         return this;
     }
@@ -119,7 +119,7 @@ var Router5 = (function () {
             this.started = true;
 
             // Try to match starting path name
-            var startPath = this.getLocation().replace(new RegExp('^' + this.base), '');
+            var startPath = this.getLocation();
             var startState = this.matchPath(startPath);
 
             if (startState) {
@@ -354,7 +354,7 @@ var Router5 = (function () {
          * @private
          */
         value: function getLocation() {
-            return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname;
+            return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname.replace(new RegExp('^' + this.base), '');
         }
     }, {
         key: 'buildUrl',
@@ -397,10 +397,6 @@ var Router5 = (function () {
     }, {
         key: '_transition',
 
-        /**
-         *
-         */
-
         /**
          * @private
          */
@@ -409,7 +405,7 @@ var Router5 = (function () {
 
             if (!fromState) {
                 this.lastKnownState = toState;
-                this._invokeListeners('', toState, fromState);
+                this._invokeListeners('*', toState, fromState);
                 return true;
             }
 

diff --git a/dist/umd/router5.js b/dist/umd/router5.js
@@ -53,7 +53,7 @@
             this.rootNode = routes instanceof _RouteNode['default'] ? routes : new _RouteNode['default']('', '', routes);
             this.activeComponents = {};
             this.options = opts;
-            this.base = window.location.pathname;
+            this.base = window.location.pathname.replace(/^\/$/, '');
 
             return this;
         }
@@ -126,7 +126,7 @@
                 this.started = true;
 
                 // Try to match starting path name
-                var startPath = this.getLocation().replace(new RegExp('^' + this.base), '');
+                var startPath = this.getLocation();
                 var startState = this.matchPath(startPath);
 
                 if (startState) {
@@ -361,7 +361,7 @@
              * @private
              */
             value: function getLocation() {
-                return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname;
+                return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname.replace(new RegExp('^' + this.base), '');
             }
         }, {
             key: 'buildUrl',
@@ -404,10 +404,6 @@
         }, {
             key: '_transition',
 
-            /**
-             *
-             */
-
             /**
              * @private
              */
@@ -416,7 +412,7 @@
 
                 if (!fromState) {
                     this.lastKnownState = toState;
-                    this._invokeListeners('', toState, fromState);
+                    this._invokeListeners('*', toState, fromState);
                     return true;
                 }
 

diff --git a/modules/Router5.js b/modules/Router5.js
@@ -25,7 +25,7 @@ export default class Router5 {
         this.rootNode  = routes instanceof RouteNode ? routes : new RouteNode('', '', routes)
         this.activeComponents = {}
         this.options = opts
-        this.base = window.location.pathname
+        this.base = window.location.pathname.replace(/^\/$/, '')
 
         return this
     }
@@ -87,7 +87,7 @@ export default class Router5 {
         this.started = true
 
         // Try to match starting path name
-        let startPath = this.getLocation().replace(new RegExp('^' + this.base), '');
+        let startPath = this.getLocation();
         let startState = this.matchPath(startPath)
 
         if (startState) {
@@ -279,7 +279,9 @@ export default class Router5 {
      * @private
      */
     getLocation() {
-        return this.options.useHash ? window.location.hash.replace(/^#/, '') : window.location.pathname
+        return this.options.useHash
+            ? window.location.hash.replace(/^#/, '')
+            : window.location.pathname.replace(new RegExp('^' + this.base), '')
     }
 
     /**
@@ -320,7 +322,7 @@ export default class Router5 {
     _transition(toState, fromState) {
         if (!fromState) {
             this.lastKnownState = toState
-            this._invokeListeners('', toState, fromState)
+            this._invokeListeners('*', toState, fromState)
             return true
         }