Skip to content

Commit a0b6a2c

Browse files
jonasjabarijonasjabari
committed
fixed page loading state
1 parent 1498499 commit a0b6a2c

File tree

7 files changed

+18
-53
lines changed

7 files changed

+18
-53
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ const store = new Vuex.Store({
99
state: {
1010
pageTemplate: null,
1111
pageLoading: false,
12-
pageLoadingStart: false,
13-
pageLoadingEnd: true,
1412
currentPathName: document.location.pathname,
1513
currentSearch: document.location.search,
1614
currentOrigin: document.location.origin
@@ -22,12 +20,6 @@ const store = new Vuex.Store({
2220
setPageLoading (state, boolean){
2321
state.pageLoading = boolean
2422
},
25-
setPageLoadingStart (state, boolean){
26-
state.pageLoadingStart = boolean
27-
},
28-
setPageLoadingEnd (state, boolean){
29-
state.pageLoadingEnd = boolean
30-
},
3123
setCurrentLocation (state, current){
3224
state.currentPathName = current.path
3325
state.currentSearch = current.search
@@ -41,8 +33,6 @@ const store = new Vuex.Store({
4133
navigateTo ({ commit, state }, { url, backwards }) {
4234
const self = this
4335
commit('setPageLoading', true)
44-
commit('setPageLoadingEnd', false)
45-
commit('setPageLoadingStart', true)
4636
matestackEventHub.$emit("page_loading", url);
4737
if (typeof matestackUiCoreTransitionStart !== 'undefined') {
4838
matestackUiCoreTransitionStart(url);
@@ -71,8 +61,6 @@ const store = new Vuex.Store({
7161
commit('setPageTemplate', response["data"])
7262
commit('setCurrentLocation', { path: url.split("?")[0], search: document.location.search, origin: document.location.origin })
7363
commit('setPageLoading', false)
74-
commit('setPageLoadingStart', false)
75-
commit('setPageLoadingEnd', true)
7664
matestackEventHub.$emit("page_loaded", url);
7765
if (typeof matestackUiCoreTransitionSuccess !== 'undefined') {
7866
matestackUiCoreTransitionSuccess(url);

‎app/concepts/matestack/ui/core/page/content/content.haml

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

‎app/concepts/matestack/ui/core/page/content/content.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ const componentDef = {
99
},
1010
computed: Vuex.mapState({
1111
asyncPageTemplate: state => state.pageTemplate,
12-
loading: state => state.pageLoading,
13-
loadingStart: state => state.pageLoadingStart,
14-
loadingEnd: state => state.pageLoadingEnd
12+
loading: state => state.pageLoading
1513
})
1614
}
1715

‎app/concepts/matestack/ui/core/page/content/content.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def response
2020
end
2121

2222
def loading_classes
23-
{ "v-bind:class": "{ 'loading': loading === true, 'loading-start' : loadingStart === true, 'loading-end' : loadingEnd === true}" }
23+
{ "v-bind:class": "{ 'loading': loading === true }" }
2424
end
2525

2626
end

‎spec/0.8/base/core/page/loading_state_spec.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ def response
7272

7373
visit "page_loading_state_spec/page_test_1"
7474

75-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="matestack-page-wrapper loading-end"]')
76-
expect(page).not_to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="loading-state-element-wrapper loading-end"]')
75+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]')
76+
expect(page).not_to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="loading-state-element-wrapper"]')
7777

7878
click_on("Page 2")
7979

80-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading loading-start"]/div[@class="matestack-page-wrapper loading loading-start"]')
80+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading"]/div[@class="matestack-page-wrapper loading"]')
8181
# after transition back to init state
82-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="matestack-page-wrapper loading-end"]')
82+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]')
8383
end
8484

8585
it "during loading the wrapping page elements get loading classes which can be used for css animations" do
@@ -129,16 +129,16 @@ def response
129129

130130
visit "page_loading_state_spec/page_test_1"
131131

132-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="matestack-page-wrapper loading-end"]')
133-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="loading-state-element-wrapper loading-end"]/div[@id="loading-spinner"]')
132+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]')
133+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="loading-state-element-wrapper"]/div[@id="loading-spinner"]')
134134

135135
click_on("Page 2")
136136

137-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading loading-start"]/div[@class="matestack-page-wrapper loading loading-start"]')
138-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading loading-start"]/div[@class="loading-state-element-wrapper loading loading-start"]/div[@id="loading-spinner"]')
137+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading"]/div[@class="matestack-page-wrapper loading"]')
138+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading"]/div[@class="loading-state-element-wrapper loading"]/div[@id="loading-spinner"]')
139139
# after transition back to init state
140-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="matestack-page-wrapper loading-end"]')
141-
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="loading-state-element-wrapper loading-end"]/div[@id="loading-spinner"]')
140+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]')
141+
expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="loading-state-element-wrapper"]/div[@id="loading-spinner"]')
142142

143143
end
144144

@@ -149,11 +149,11 @@ def response
149149
#
150150
# page.go_back
151151
#
152-
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading loading-start"]/div[@class="matestack-page-wrapper loading loading-start"]')
153-
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading loading-start"]/div[@class="loading-state-element-wrapper loading loading-start"]/div[@id="loading-spinner"]')
152+
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading"]/div[@class="matestack-page-wrapper loading"]')
153+
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading"]/div[@class="loading-state-element-wrapper loading"]/div[@id="loading-spinner"]')
154154
# # after transition back to init state
155-
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="matestack-page-wrapper loading-end"]')
156-
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container loading-end"]/div[@class="loading-state-element-wrapper loading-end"]/div[@id="loading-spinner"]')
155+
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]')
156+
# expect(page).to have_xpath('//div[@class="matestack-app-wrapper"]/main/div[@class="matestack-page-container"]/div[@class="loading-state-element-wrapper"]/div[@id="loading-spinner"]')
157157
end
158158

159159
end

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

Lines changed: 1 addition & 15 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)