Skip to content
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

[Regression Fix] Readd loading icon #479

Merged
merged 3 commits into from
Oct 14, 2020
Merged

[Regression Fix] Readd loading icon #479

Show file tree
Hide file tree
Changes from 2 commits
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
217 changes: 210 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":"0775a17703c879a3649f","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=49a0849da34a8d9a153d
2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 40 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,40 @@
<!--
- @copyright Copyright (c) 2020 Nextcloud
-
- @license GNU AGPL version 3 or any later version
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, you're the owner!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw please also add yourself as the author for the other files you edited

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😞

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->

skjnldsv marked this conversation as resolved.
Show resolved Hide resolved
<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