Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-01-19 01:31:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

page auto-scroll now only happens when moving page

Browse Source 
specifically the auto-scroll in uploads/users/albums list.
previously it'd auto scroll to the top for every same-page operation.
now it'd only auto scroll when actually moving page.
so same-page operations such as deleting uploads, editing users, etc.
will no longer scroll away.
This commit is contained in:
Bobby Wibowo 2020-12-26 23:50:52 +07:00
parent 3d1374680a
commit 441faad4a7
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
1 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/js/dashboard.js
View File

@ -70,6 +70,13 @@ const page = {
pageNum: null
}
},
prevPageNums: {
uploads: null,
uploadsAll: null,
albums: null,
albumsAll: null,
users: null
},
// ids of selected items (shared across pages and will be synced with localStorage)
selected: {
@ -245,7 +252,8 @@ page.prepareDashboard = () => {
// eslint-disable-next-line compat/compat
itemMenus[i].onclick.call(null, Object.assign(itemMenus[i].params || {}, {
trigger: event.currentTarget
trigger: event.currentTarget,
forceScroll: true
}))
})
@ -411,7 +419,7 @@ page.domClick = event => {
}
}
page.fadeAndScroll = disableFading => {
page.fadeInDom = disableFading => {
if (page.fadingIn) {
clearTimeout(page.fadingIn)
page.dom.classList.remove('fade-in')
@ -423,9 +431,11 @@ page.fadeAndScroll = disableFading => {
page.dom.classList.remove('fade-in')
}, 500)
}
}
page.scrollToDom = disableSmooth => {
page.dom.scrollIntoView({
behavior: disableFading ? 'auto' : 'smooth',
behavior: disableSmooth ? 'auto' : 'smooth',
block: 'start',
inline: 'nearest'
})
@ -873,18 +883,27 @@ page.getUploads = (params = {}) => {
selectAll.title = 'Unselect all'
}
page.fadeInDom()
const pageNum = files.length ? params.pageNum : 0
if (params.forceScroll ||
page.prevPageNums[page.currentView] === null ||
page.prevPageNums[page.currentView] !== pageNum) {
const disableSmooth = !params.forceScroll && page.views[page.currentView].type === 'thumbs'
page.scrollToDom(disableSmooth)
}
if (page.views[page.currentView].type === 'thumbs') {
page.fadeAndScroll(true)
page.lazyLoad.update()
} else {
page.fadeAndScroll()
}
page.updateTrigger(params.trigger, 'active')
if (page.currentView === 'uploads') page.views.uploads.album = params.album
if (page.currentView === 'uploads') {
page.views.uploads.album = params.album
}
page.views[page.currentView].filters = params.filters
page.views[page.currentView].pageNum = files.length ? params.pageNum : 0
page.views[page.currentView].pageNum = page.prevPageNums[page.currentView] = pageNum
}).catch(error => {
page.updateTrigger(params.trigger)
page.onAxiosError(error)
@ -1341,7 +1360,8 @@ page.deleteUploadsByNames = (params = {}) => {
</div>
</form>
`
page.fadeAndScroll()
page.fadeInDom()
page.scrollToDom()
page.updateTrigger(params.trigger, 'active')
document.querySelector('#submitBulkDelete').addEventListener('click', () => {
@ -1831,11 +1851,21 @@ page.getAlbums = (params = {}) => {
selectAll.title = 'Unselect all'
}
page.fadeAndScroll()
page.fadeInDom()
const pageNum = albums.length ? params.pageNum : 0
if (params.forceScroll ||
page.prevPageNums[page.currentView] === null ||
page.prevPageNums[page.currentView] !== pageNum) {
page.scrollToDom()
}
page.updateTrigger(params.trigger, 'active')
if (page.currentView === 'albumsAll') page.views[page.currentView].filters = params.filters
page.views[page.currentView].pageNum = albums.length ? params.pageNum : 0
if (page.currentView === 'albumsAll') {
page.views[page.currentView].filters = params.filters
}
page.views[page.currentView].pageNum = page.prevPageNums[page.currentView] = pageNum
}).catch(error => {
page.updateTrigger(params.trigger)
page.onAxiosError(error)
@ -2127,7 +2157,8 @@ page.changeToken = (params = {}) => {
</div>
</div>
`
page.fadeAndScroll()
page.fadeInDom()
page.scrollToDom()
page.updateTrigger(params.trigger, 'active')
document.querySelector('#getNewToken').addEventListener('click', event => {
@ -2192,7 +2223,8 @@ page.changePassword = (params = {}) => {
</div>
</form>
`
page.fadeAndScroll()
page.fadeInDom()
page.scrollToDom()
page.updateTrigger(params.trigger, 'active')
document.querySelector('#sendChangePassword').addEventListener('click', event => {
@ -2472,10 +2504,18 @@ page.getUsers = (params = {}) => {
selectAll.title = 'Unselect all'
}
page.fadeAndScroll()
page.fadeInDom()
const pageNum = users.length ? params.pageNum : 0
if (params.forceScroll ||
page.prevPageNums[page.currentView] === null ||
page.prevPageNums[page.currentView] !== pageNum) {
page.scrollToDom()
}
page.updateTrigger(params.trigger, 'active')
page.views[page.currentView].pageNum = users.length ? params.pageNum : 0
page.views[page.currentView].pageNum = page.prevPageNums[page.currentView] = pageNum
}).catch(error => {
page.updateTrigger(params.trigger)
page.onAxiosError(error)
@ -2948,7 +2988,8 @@ page.getStatistics = (params = {}) => {
}
page.dom.innerHTML = content
page.fadeAndScroll()
page.fadeInDom()
page.scrollToDom()
page.updateTrigger(params.trigger, 'active')
}).catch(error => {
page.updateTrigger(params.trigger)