Skip to content

Commit 65dbddd

Browse files
committed
fixed popstate navigation behavior
1 parent 523c7fc commit 65dbddd

File tree

6 files changed

+23
-50
lines changed

6 files changed

+23
-50
lines changed

app/concepts/matestack/ui/core/app/app.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
22
import VRuntimeTemplate from "v-runtime-template"
33
import Vuex from 'vuex'
4-
import isNavigatingToAnotherPage from "./location"
54

65
const componentDef = {
76
props: ['appConfig', 'params'],
@@ -10,12 +9,14 @@ const componentDef = {
109
},
1110
computed: Vuex.mapState({
1211
asyncTemplate: state => state.pageTemplate,
12+
currentPath: state => state.currentPath
1313
}),
1414
mounted: function(){
15+
const self = this;
1516
window.onpopstate = (event) => {
16-
if (isNavigatingToAnotherPage(document.location, event)) {
17-
this.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
18-
};
17+
if (self.currentPath != document.location.pathname){
18+
self.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
19+
}
1920
}
2021
},
2122
components: {

app/concepts/matestack/ui/core/app/location.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

spec/usage/components/transition_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ def page2
141141
expect(page).to have_content("This is Page 2")
142142
expect(page).to have_selector("body.not-reloaded")
143143

144-
page.evaluate_script('window.history.back()')
144+
# page.evaluate_script('window.history.back()')
145+
page.go_back
145146

146147
element = page.find("#my-div-on-page-1")
147148
refreshed_content_on_page_1 = element.text

vendor/assets/javascripts/dist/manifest.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@
22
"entrypoints": {
33
"matestack-ui-core": {
44
"css": [
5-
"/dist/matestack-ui-core.min.css"
5+
"/dist/matestack-ui-core.css"
66
],
77
"js": [
8-
"/dist/matestack-ui-core.min.js"
8+
"/dist/matestack-ui-core.js"
9+
],
10+
"css.map": [
11+
"/dist/matestack-ui-core.css.map"
912
],
1013
"js.map": [
11-
"/dist/matestack-ui-core.min.js.map"
14+
"/dist/matestack-ui-core.js.map"
1215
]
1316
}
1417
},
15-
"matestack-ui-core.css": "/dist/matestack-ui-core.min.css",
16-
"matestack-ui-core.js": "/dist/matestack-ui-core.min.js",
17-
"matestack-ui-core.js.map": "/dist/matestack-ui-core.min.js.map"
18+
"matestack-ui-core.css": "/dist/matestack-ui-core.css",
19+
"matestack-ui-core.css.map": "/dist/matestack-ui-core.css.map",
20+
"matestack-ui-core.js": "/dist/matestack-ui-core.js",
21+
"matestack-ui-core.js.map": "/dist/matestack-ui-core.js.map"
1822
}

vendor/assets/javascripts/dist/matestack-ui-core.js

Lines changed: 5 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/dist/matestack-ui-core.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)