code cleanup

Author: yyx990803

src/history/abstract.js

@@ -5,20 +5,20 @@ function AbstractHistory (options) {
   this.currentPath = '/'
 }
 
-var p = AbstractHistory.prototype
-
-p.start = function () {
+AbstractHistory.prototype.start = function () {
   this.onChange('/')
 }
 
-p.stop = function () {}
+AbstractHistory.prototype.stop = function () {
+  // noop
+}
 
-p.go = function (path) {
+AbstractHistory.prototype.go = function (path) {
   path = this.currentPath = this.formatPath(path)
   this.onChange(path)
 }
 
-p.formatPath = function (path) {
+AbstractHistory.prototype.formatPath = function (path) {
   return path.charAt(0) === '/'
     ? path
     : util.resolvePath(this.currentPath, path)

src/history/hash.js

@@ -5,9 +5,7 @@ function HashHistory (options) {
   this.onChange = options.onChange
 }
 
-var p = HashHistory.prototype
-
-p.start = function () {
+HashHistory.prototype.start = function () {
   var self = this
   this.listener = function () {
     var path = location.hash
@@ -25,11 +23,11 @@ p.start = function () {
   this.listener()
 }
 
-p.stop = function () {
+HashHistory.prototype.stop = function () {
   window.removeEventListener('hashchange', this.listener)
 }
 
-p.go = function (path, replace) {
+HashHistory.prototype.go = function (path, replace) {
   path = this.formatPath(path)
   if (replace) {
     location.replace(path)
@@ -38,7 +36,7 @@ p.go = function (path, replace) {
   }
 }
 
-p.formatPath = function (path, expectAbsolute) {
+HashHistory.prototype.formatPath = function (path, expectAbsolute) {
   path = path.replace(/^#!?/, '')
   var isAbsoloute = path.charAt(0) === '/'
   if (expectAbsolute && !isAbsoloute) {

src/history/html5.js

@@ -20,9 +20,7 @@ function HTML5History (options) {
   this.base = baseEl && baseEl.getAttribute('href')
 }
 
-var p = HTML5History.prototype
-
-p.start = function () {
+HTML5History.prototype.start = function () {
   var self = this
   this.listener = function (e) {
     var url = decodeURI(location.pathname + location.search)
@@ -35,11 +33,11 @@ p.start = function () {
   this.listener()
 }
 
-p.stop = function () {
+HTML5History.prototype.stop = function () {
   window.removeEventListener('popstate', this.listener)
 }
 
-p.go = function (path, replace) {
+HTML5History.prototype.go = function (path, replace) {
   var root = this.root
   var url = this.formatPath(path, root)
   if (replace) {
@@ -65,7 +63,7 @@ p.go = function (path, replace) {
   this.onChange(path, null, hash)
 }
 
-p.formatPath = function (path) {
+HTML5History.prototype.formatPath = function (path) {
   return path.charAt(0) === '/'
     // absolute path
     ? this.root

src/router/api.js

@@ -2,13 +2,11 @@ var routerUtil = require('../util')
 
 module.exports = function (Vue, Router) {
 
-  var p = Router.prototype
-
   /**
    * Register a map of top-level paths.
    */
 
-  p.map = function (map) {
+  Router.prototype.map = function (map) {
     for (var route in map) {
       this.on(route, map[route])
     }
@@ -26,7 +24,7 @@ module.exports = function (Vue, Router) {
    *                 - {Function} [after]
    */
 
-  p.on = function (rootPath, handler) {
+  Router.prototype.on = function (rootPath, handler) {
     if (rootPath === '*') {
       this._notFound(handler)
     } else {
@@ -40,7 +38,7 @@ module.exports = function (Vue, Router) {
    * @param {Object} map
    */
 
-  p.redirect = function (map) {
+  Router.prototype.redirect = function (map) {
     for (var path in map) {
       this._addRedirect(path, map[path])
     }
@@ -52,7 +50,7 @@ module.exports = function (Vue, Router) {
    * @param {Object} map
    */
 
-  p.alias = function (map) {
+  Router.prototype.alias = function (map) {
     for (var path in map) {
       this._addAlias(path, map[path])
     }
@@ -64,7 +62,7 @@ module.exports = function (Vue, Router) {
    * @param {Function} fn
    */
 
-  p.beforeEach = function (fn) {
+  Router.prototype.beforeEach = function (fn) {
     this._beforeEachHook = fn
   }
 
@@ -77,7 +75,7 @@ module.exports = function (Vue, Router) {
    * @param {Boolean} [replace]
    */
 
-  p.go = function (path, replace) {
+  Router.prototype.go = function (path, replace) {
     this.history.go(path + '', replace)
   }
 
@@ -87,7 +85,7 @@ module.exports = function (Vue, Router) {
    * @param {String} path
    */
 
-  p.replace = function (path) {
+  Router.prototype.replace = function (path) {
     this.go(path, true)
   }
 
@@ -98,7 +96,7 @@ module.exports = function (Vue, Router) {
    * @param {String|Element} container
    */
 
-  p.start = function (App, container) {
+  Router.prototype.start = function (App, container) {
     /* istanbul ignore if */
     if (this._started) {
       routerUtil.warn('already started.')
@@ -125,7 +123,7 @@ module.exports = function (Vue, Router) {
    * Stop listening to route changes.
    */
 
-  p.stop = function () {
+  Router.prototype.stop = function () {
     this.history.stop()
     this._started = false
   }

src/router/internal.js

@@ -5,7 +5,6 @@ var RouteTransition = require('../transition')
 module.exports = function (Vue, Router) {
 
   var _ = Vue.util
-  var p = Router.prototype
 
   /**
    * Add a route containing a list of segments to the internal
@@ -17,7 +16,7 @@ module.exports = function (Vue, Router) {
    * @param {Array} segments
    */
 
-  p._addRoute = function (path, handler, segments) {
+  Router.prototype._addRoute = function (path, handler, segments) {
     guardComponent(handler)
     segments.push({
       path: path,
@@ -44,7 +43,7 @@ module.exports = function (Vue, Router) {
    * @param {Object} handler
    */
 
-  p._notFound = function (handler) {
+  Router.prototype._notFound = function (handler) {
     guardComponent(handler)
     this._notFoundHandler = [{ handler: handler }]
   }
@@ -56,7 +55,7 @@ module.exports = function (Vue, Router) {
    * @param {String} redirectPath
    */
 
-  p._addRedirect = function (path, redirectPath) {
+  Router.prototype._addRedirect = function (path, redirectPath) {
     this._addGuard(path, redirectPath, this.replace)
   }
 
@@ -67,7 +66,7 @@ module.exports = function (Vue, Router) {
    * @param {String} aliasPath
    */
 
-  p._addAlias = function (path, aliasPath) {
+  Router.prototype._addAlias = function (path, aliasPath) {
     this._addGuard(path, aliasPath, this._match)
   }
 
@@ -79,7 +78,7 @@ module.exports = function (Vue, Router) {
    * @param {Function} handler
    */
 
-  p._addGuard = function (path, mappedPath, handler) {
+  Router.prototype._addGuard = function (path, mappedPath, handler) {
     var router = this
     this._guardRecognizer.add([{
       path: path,
@@ -101,7 +100,7 @@ module.exports = function (Vue, Router) {
    * @return {Boolean} - if true, will skip normal match.
    */
 
-  p._checkGuard = function (path) {
+  Router.prototype._checkGuard = function (path) {
     var matched = this._guardRecognizer.recognize(path)
     if (matched) {
       matched[0].handler(matched[0], matched.queryParams)
@@ -118,7 +117,7 @@ module.exports = function (Vue, Router) {
    * @param {String} [anchor]
    */
 
-  p._match = function (path, state, anchor) {
+  Router.prototype._match = function (path, state, anchor) {
     var self = this
 
     if (this._checkGuard(path)) {
@@ -186,7 +185,7 @@ module.exports = function (Vue, Router) {
    * @param {Route} route
    */
 
-  p._updateRoute = function (route) {
+  Router.prototype._updateRoute = function (route) {
     this._currentRoute = route
     // update route context for all children
     if (this.app.$route !== route) {
@@ -205,7 +204,7 @@ module.exports = function (Vue, Router) {
    * @param {String} [anchor]
    */
 
-  p._postTransition = function (route, state, anchor) {
+  Router.prototype._postTransition = function (route, state, anchor) {
     // handle scroll positions
     // saved scroll positions take priority
     // then we check if the path has an anchor