handle root better

Author: yyx990803

src/index.js

@@ -69,6 +69,10 @@ p.redirect = function (map) {
  */
 p.go = function (path) {
   if (this._pushstate) {
+    // make it relative to root
+    path = this._root
+      ? this._root + '/' + path.replace(/^\//, '')
+      : path
     history.pushState({}, '', path)
     this._match(path)
   } else {
@@ -183,7 +187,11 @@ p._match = function (path) {
   }
   this._currentPath = path
   // normalize against root
-  if (this._root && path.indexOf(this._root) === 0) {
+  if (
+    this._pushstate &&
+    this._root &&
+    path.indexOf(this._root) === 0
+  ) {
     path = path.slice(this._root.length)
   }
   var matched = this._recognizer.recognize(path)

src/link.js

@@ -7,15 +7,13 @@ module.exports = function (Vue) {
 
     bind: function () {
       var vm = this.vm
-      // normalize leading slash
-      var href = '/' + this.expression.replace(/^\//, '')
+      var href = this.expression
       if (this.el.tagName === 'A') {
         this.el.href = href
       }
       this.handler = function (e) {
         e.preventDefault()
-        var router = vm.route._router
-        router.go((router._root || '') + href)
+        router.go(href)
       }
       this.el.addEventListener('click', this.handler)
     },

src/view.js

@@ -13,24 +13,14 @@ module.exports = function (Vue) {
   _.extend(viewDef, {
 
     bind: function () {
-      // implicitly pass down route context
-      // using v-with
-      this.el.setAttribute(
-        Vue.config.prefix + 'with',
-        'route:route'
-      )
-      // set currentView ref
-      this.el.setAttribute(
-        Vue.config.prefix + 'ref',
-        'currentView'
-      )
-      // force dynamic directive
-      this._isDynamicLiteral = true
       // react to route change
       this.currentRoute = null
       this.currentComponentId = null
       this.onRouteChange = _.bind(this.onRouteChange, this)
       this.unwatch = this.vm.$watch('route', this.onRouteChange)
+      // force dynamic directive so v-component doesn't
+      // attempt to build right now
+      this._isDynamicLiteral = true
       // finally, init by delegating to v-component
       component.bind.call(this)
       if (this.vm.route) {
@@ -60,7 +50,7 @@ module.exports = function (Vue) {
         this.currentComponentId = segment.handler.component
         this.update(segment.handler.component)
       } else if (this.childVM) {
-        // possible params change
+        // update route context
         this.childVM.route = route
       }
     },