File tree Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Original file line number Diff line number Diff line change 1
1
/*!
2
- * vue-router v0.7.8
2
+ * vue-router v0.7.9
3
3
* (c) 2016 Evan You
4
4
* Released under the MIT License.
5
5
*/
182
182
} ,
183
183
184
184
generate : function generate ( params ) {
185
- return params [ this . name ] ;
185
+ return params [ this . name ] || ":" + this . name ;
186
186
}
187
187
} ;
188
188
199
199
} ,
200
200
201
201
generate : function generate ( params ) {
202
- return params [ this . name ] ;
202
+ return params [ this . name ] || ":" + this . name ;
203
203
}
204
204
} ;
205
205
1933
1933
if ( this . el . tagName !== 'A' ) {
1934
1934
return ;
1935
1935
}
1936
- if ( this . target && this . target . name ) {
1937
- this . el . href = '#' + this . target . name ;
1938
- return ;
1939
- }
1940
1936
var path = this . path ;
1941
1937
var router = this . router ;
1942
1938
var isAbsolute = path . charAt ( 0 ) === '/' ;
2530
2526
if ( path && typeof path === 'object' ) {
2531
2527
if ( path . name ) {
2532
2528
var extend = Vue . util . extend ;
2533
- var currentParams = this . _currentTransition . to . params ;
2529
+ var currentParams = this . _currentTransition && this . _currentTransition . to . params ;
2534
2530
var targetParams = path . params || { } ;
2535
2531
var params = currentParams ? extend ( extend ( { } , currentParams ) , targetParams ) : targetParams ;
2536
2532
if ( path . query ) {
You can’t perform that action at this time.
0 commit comments