Skip to content

Commit 2c7041c

Browse files
QingWei-LiQingWei-Li
committed
refactor(router): dupports multiple mode
1 parent 2a21c40 commit 2c7041c

20 files changed

Lines changed: 382 additions & 225 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"build": "rm -rf lib themes && node build/build.js && mkdir lib/themes && mkdir themes && node build/build-css.js",
2424
"dev:build": "rm -rf lib themes && mkdir themes && node build/build.js --dev && node build/build-css.js --dev",
2525
"dev": "node app.js & nodemon -w src -e js,css --exec 'npm run dev:build'",
26-
"test": "eslint src"
26+
"test": "eslint src --fix"
2727
},
2828
"dependencies": {
2929
"marked": "^0.3.6",

‎src/core/event/scroll.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isMobile } from '../util/env'
22
import * as dom from '../util/dom'
3-
import { parse } from '../route/hash'
3+
import { parse } from '../router/hash'
44

55
const nav = {}
66
let hoverOver = false

‎src/core/event/sidebar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isMobile } from '../util/env'
22
import * as dom from '../util/dom'
3-
import { getHash } from '../route/hash'
3+
import { getHash } from '../router/hash'
44

55
const title = dom.$.title
66
/**

‎src/core/fetch/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { get } from './ajax'
22
import { callHook } from '../init/lifecycle'
3-
import { getParentPath } from '../route/util'
3+
import { getParentPath } from '../router/util'
44
import { noop } from '../util/core'
55

66
function loadNested (path, file, next, vm, first) {
@@ -9,7 +9,7 @@ function loadNested (path, file, next, vm, first) {
99

1010
if (!path) return
1111

12-
get(vm.$getFile(path + file))
12+
get(vm.router.getFile(path + file))
1313
.then(next, _ => loadNested(path, file, next, vm))
1414
}
1515

@@ -22,7 +22,7 @@ export function fetchMixin (proto) {
2222
// Abort last request
2323
last && last.abort && last.abort()
2424

25-
last = get(this.$getFile(path), true)
25+
last = get(this.router.getFile(path), true)
2626

2727
// Current page is html
2828
this.isHTML = /\.html$/g.test(path)
@@ -47,7 +47,7 @@ export function fetchMixin (proto) {
4747
proto._fetchCover = function () {
4848
const { coverpage } = this.config
4949
const root = getParentPath(this.route.path)
50-
const path = this.$getFile(root + coverpage)
50+
const path = this.router.getFile(root + coverpage)
5151

5252
if (this.route.path !== '/' || !coverpage) {
5353
this._renderCover()

‎src/core/global-api.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as util from './util'
22
import * as dom from './util/dom'
33
import * as render from './render/compiler'
4-
import * as route from './route/hash'
4+
import * as route from './router/hash'
55
import { slugify } from './render/slugify'
66
import { get } from './fetch/ajax'
77
import marked from 'marked'

‎src/core/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { initMixin } from './init'
2-
import { routeMixin } from './route'
2+
import { routerMixin } from './router'
33
import { renderMixin } from './render'
44
import { fetchMixin } from './fetch'
55
import { eventMixin } from './event'
@@ -12,7 +12,7 @@ function Docsify () {
1212
const proto = Docsify.prototype
1313

1414
initMixin(proto)
15-
routeMixin(proto)
15+
routerMixin(proto)
1616
renderMixin(proto)
1717
fetchMixin(proto)
1818
eventMixin(proto)

‎src/core/init/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import config from '../config'
22
import { initLifecycle, callHook } from './lifecycle'
33
import { initRender } from '../render'
4-
import { initRoute } from '../route'
4+
import { initRouter } from '../router'
55
import { initEvent } from '../event'
66
import { initFetch } from '../fetch'
77
import { isFn } from '../util/core'
@@ -14,9 +14,9 @@ export function initMixin (proto) {
1414
initLifecycle(vm) // Init hooks
1515
initPlugin(vm) // Install plugins
1616
callHook(vm, 'init')
17+
initRouter(vm) // Add router
1718
initRender(vm) // Render base DOM
1819
initEvent(vm) // Bind events
19-
initRoute(vm) // Add hashchange eventListener
2020
initFetch(vm) // Fetch data
2121
callHook(vm, 'mounted')
2222
}

0 commit comments

Comments
 (0)