v1.1.1

mayyingzi · Aug 11, 2017 · f4ee9ef · f4ee9ef
1 parent 25e22ed
commit f4ee9ef
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 20 deletions.
diff --git a/dist/vue-navigation.esm.js b/dist/vue-navigation.esm.js
@@ -1,5 +1,5 @@
 /**
-* vue-navigation v1.1.0
+* vue-navigation v1.1.1
 * https://github.com/zack24q/vue-navigation
 * Released under the MIT License.
 */
@@ -176,10 +176,11 @@ var NavComponent = (function (keyName) {
     render: function render() {
       var vnode = this.$slots.default ? this.$slots.default[0] : null;
       if (vnode) {
-        var key = getKey(this.$route, keyName);
+        vnode.key = vnode.key || (vnode.isComment ? 'comment' : vnode.tag);
 
+        var key = getKey(this.$route, keyName);
         if (vnode.key.indexOf(key) === -1) {
-          vnode.key += key;
+          vnode.key = '__navigation-' + key + '-' + vnode.key;
         }
         if (this.cache[key]) {
           if (vnode.key === this.cache[key].key) {

diff --git a/dist/vue-navigation.esm.min.js b/dist/vue-navigation.esm.min.js
diff --git a/dist/vue-navigation.umd.js b/dist/vue-navigation.umd.js
@@ -1,5 +1,5 @@
 /**
-* vue-navigation v1.1.0
+* vue-navigation v1.1.1
 * https://github.com/zack24q/vue-navigation
 * Released under the MIT License.
 */
@@ -182,10 +182,11 @@ var NavComponent = (function (keyName) {
     render: function render() {
       var vnode = this.$slots.default ? this.$slots.default[0] : null;
       if (vnode) {
-        var key = getKey(this.$route, keyName);
+        vnode.key = vnode.key || (vnode.isComment ? 'comment' : vnode.tag);
 
+        var key = getKey(this.$route, keyName);
         if (vnode.key.indexOf(key) === -1) {
-          vnode.key += key;
+          vnode.key = '__navigation-' + key + '-' + vnode.key;
         }
         if (this.cache[key]) {
           if (vnode.key === this.cache[key].key) {

diff --git a/dist/vue-navigation.umd.min.js b/dist/vue-navigation.umd.min.js
diff --git a/docs/examples/index.html b/docs/examples/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=0"><title>examples</title><link href=./static/css/app.172d045cc07af344a79b1a326ea5ac7f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d5db008ec46c1d5472f6.js></script><script type=text/javascript src=./static/js/app.57ec3ff9efb442947262.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=0"><title>examples</title><link href=./static/css/app.e75e9573199a2eca689612e10834d038.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fa39ccef9acb5957cf06.js></script><script type=text/javascript src=./static/js/app.775e77d525c007ba3487.js></script></body></html>
diff --git a/.../app.172d045cc07af344a79b1a326ea5ac7f.css → .../app.e75e9573199a2eca689612e10834d038.css b/.../app.172d045cc07af344a79b1a326ea5ac7f.css → .../app.e75e9573199a2eca689612e10834d038.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=0"><title>examples</title><link href=./static/css/app.172d045cc07af344a79b1a326ea5ac7f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d5db008ec46c1d5472f6.js></script><script type=text/javascript src=./static/js/app.57ec3ff9efb442947262.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=0"><title>examples</title><link href=./static/css/app.e75e9573199a2eca689612e10834d038.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fa39ccef9acb5957cf06.js></script><script type=text/javascript src=./static/js/app.775e77d525c007ba3487.js></script></body></html>