Skip to content

[Regression Fix] Readd loading icon #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 3 commits into from
Oct 14, 2020
Merged

[Regression Fix] Readd loading icon #479

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1779bd1
Readd loading icon
Oct 13, 2020
f97c2ac
Add missing copyright
Oct 13, 2020
fab1171
Add missing copyrights CM
Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Readd loading icon 
Signed-off-by: Corentin Mors <[email protected]>
  • Loading branch information
Corentin Mors committed Oct 13, 2020
commit 1779bd1cc74c1cbfc0cc6be1e194d8b3d4c022c0
198 changes: 191 additions & 7 deletions js/photos-5.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-5.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
/******/ return __webpack_require__.p + "photos-" + ({}[chunkId]||chunkId) + ".js?v=" + {"0":"f851824c46ef168a8074","1":"ee67a9dd6a1596f5e14b","2":"93adc2b3775fad33d9d5","3":"55d64d057de391151ae1","4":"4fa47638f772698a0fda","5":"a63c242973f45b36be88","6":"38a8c65bb96fc35410e6","7":"9207e8f25dfdcd66d4be","8":"0d499ff26d5e8adee5e0","9":"df4decb3849a228e34d1","10":"636c794a5eae8126bb03"}[chunkId] + ""
/******/ return __webpack_require__.p + "photos-" + ({}[chunkId]||chunkId) + ".js?v=" + {"0":"f851824c46ef168a8074","1":"ee67a9dd6a1596f5e14b","2":"93adc2b3775fad33d9d5","3":"55d64d057de391151ae1","4":"4fa47638f772698a0fda","5":"d43d527a6d3d35d9d3fa","6":"38a8c65bb96fc35410e6","7":"9207e8f25dfdcd66d4be","8":"0d499ff26d5e8adee5e0","9":"df4decb3849a228e34d1","10":"636c794a5eae8126bb03"}[chunkId] + ""
/******/ }
/******/
/******/ // The require function
Expand Down Expand Up @@ -37847,4 +37847,4 @@ var isNumber = function isNumber(num) {
/***/ })

/******/ });
//# sourceMappingURL=photos-main.js.map?v=6751183a8a3f63207fb0
//# sourceMappingURL=photos-main.js.map?v=ba8cbd6ca63f1bf84c88
2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions src/components/Loader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

<template>
<div class="loader" icon="loading">
<slot name="icon">
<span :class="['loading']" />
</slot>
</div>
</template>

<script>
export default {
name: 'Loader',
}
</script>

<style lang="scss">
.loader {
display: grid;
height: 60px;
}
</style>
5 changes: 4 additions & 1 deletion src/views/Timeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
:update-function="getContent"
:get-column-count="() => gridConfig.count"
:get-grid-gap="() => gridConfig.gap"
:update-trigger-margin="700" />
:update-trigger-margin="700"
:loader="loaderComponent" />
</div>
</div>
</template>
Expand All @@ -65,6 +66,7 @@ import FileVirtualGrid from '../components/FileVirtualGrid'
import SeparatorVirtualGrid from '../components/SeparatorVirtualGrid'
import VirtualGrid from 'vue-virtual-grid'
import Navigation from '../components/Navigation'
import Loader from '../components/Loader'

import cancelableRequest from '../utils/CancelableRequest'
import GridConfigMixin from '../mixins/GridConfig'
Expand Down Expand Up @@ -103,6 +105,7 @@ export default {
error: null,
page: 0,
lastSection: '',
loaderComponent: Loader,
}
},

Expand Down