Merge pull request #10 from lerit/master

fix go bug and history mode event listen
kallsave · Jun 15, 2023 · 1226113 · 1226113
2 parents fa60322 + e37acfd
commit 1226113
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/history/history-state-event.js b/src/history/history-state-event.js
@@ -3,13 +3,15 @@ import historyStack from './history-stack'
 import { BACK, FORWARD } from './history-direction-name'
 
 const historyStateEvent = new Events()
-
-window.addEventListener('hashchange', () => {
+function historyChangeEvt(){
   if (historyStack.getByIndex(1) === window.location.href) {
-    historyStateEvent.emit(BACK)
+    historyStateEvent.emit(BACK);
   } else {
-    historyStateEvent.emit(FORWARD)
+    historyStateEvent.emit(FORWARD);
   }
-})
+}
+
+window.addEventListener('hashchange', historyChangeEvt);
+window.addEventListener('popstate', historyChangeEvt);
 
 export default historyStateEvent
diff --git a/src/router-middle/index.js b/src/router-middle/index.js
@@ -63,9 +63,9 @@ const routerMiddle = (Vue, config) => {
 
   router.go = (n) => {
     // dev: go(n > 1)会导致方向判断错误
-    if (n > 1) {
+    if (n > 0) {
       direction = FORWARD
-    } else if (n < -1) {
+    } else if (n < 0) {
       direction = BACK
       historyStack.removeBackByIndex(-n)
       config.setHistoryStack(historyStack.getStore())