[build] 2.0.3

vuejs · Nov 18, 2016 · 3c436b3 · 3c436b3
1 parent 6a18729
commit 3c436b3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/dist/vue-router.js b/dist/vue-router.js
@@ -1,5 +1,5 @@
 /**
- * vue-router v2.0.2
+ * vue-router v2.0.3
  * (c) 2016 Evan You
  * @license MIT
  */
@@ -1035,6 +1035,8 @@ function normalizePath (path, parent) {
 
 var regexpCache = Object.create(null)
 
+var regexpParamsCache = Object.create(null)
+
 var regexpCompileCache = Object.create(null)
 
 function createMatcher (routes) {
@@ -1052,14 +1054,15 @@ function createMatcher (routes) {
 
     if (name) {
       var record = nameMap[name]
+      var paramNames = getParams(record.path)
 
       if (typeof location.params !== 'object') {
         location.params = {}
       }
 
       if (currentRoute && typeof currentRoute.params === 'object') {
         for (var key in currentRoute.params) {
-          if (!(key in location.params)) {
+          if (!(key in location.params) && paramNames.indexOf(key) > -1) {
             location.params[key] = currentRoute.params[key]
           }
         }
@@ -1174,13 +1177,10 @@ function createMatcher (routes) {
   return match
 }
 
-function matchRoute (
-  path,
-  params,
-  pathname
-) {
-  var keys, regexp
+function getRouteRegex (path) {
   var hit = regexpCache[path]
+  var keys, regexp
+
   if (hit) {
     keys = hit.keys
     regexp = hit.regexp
@@ -1189,6 +1189,18 @@ function matchRoute (
     regexp = index(path, keys)
     regexpCache[path] = { keys: keys, regexp: regexp }
   }
+
+  return { keys: keys, regexp: regexp }
+}
+
+function matchRoute (
+  path,
+  params,
+  pathname
+) {
+  var ref = getRouteRegex(path);
+  var regexp = ref.regexp;
+  var keys = ref.keys;
   var m = pathname.match(regexp)
 
   if (!m) {
@@ -1222,6 +1234,11 @@ function fillParams (
   }
 }
 
+function getParams (path) {
+  return regexpParamsCache[path] ||
+    (regexpParamsCache[path] = getRouteRegex(path).keys.map(function (key) { return key.name; }))
+}
+
 function resolveRecordPath (path, record) {
   return resolvePath(path, record.parent ? record.parent.path : '/', true)
 }