Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-02-22 21:29:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed filter button not having loading spinner

Browse Source 
Also "fixed" some more Object.assign().
Not exactly fixed since they didn't really break, but they weren't
written in the way they were logically intended for.

Bumped v1 version string and rebuilt client assets.
This commit is contained in:
Bobby Wibowo 2020-05-17 00:49:38 +07:00
parent 8cd76a31f9
commit 83a7459a01
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/dashboard.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/dashboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

17
src/js/dashboard.js
View File

@ -229,9 +229,9 @@ page.prepareDashboard = () => {
return page.warnSomethingLoading() return page.warnSomethingLoading()
// eslint-disable-next-line compat/compat // eslint-disable-next-line compat/compat
itemMenus[i].onclick.call(null, Object.assign({ itemMenus[i].onclick.call(null, Object.assign(itemMenus[i].params || {}, {
trigger: event.currentTarget trigger: event.currentTarget
}, itemMenus[i].params || {})) }))
}) })
item.classList.remove('is-hidden') item.classList.remove('is-hidden')
@ -421,9 +421,9 @@ page.switchPage = (action, element) => {
return page.warnSomethingLoading() return page.warnSomethingLoading()
// eslint-disable-next-line compat/compat // eslint-disable-next-line compat/compat
const params = Object.assign({ const params = Object.assign(page.views[page.currentView], {
trigger: element trigger: element
}, page.views[page.currentView]) })
const func = page.currentView === 'users' ? page.getUsers : page.getUploads const func = page.currentView === 'users' ? page.getUsers : page.getUploads
@ -830,9 +830,9 @@ page.setUploadsView = (view, element) => {
page.views[page.currentView].type = view page.views[page.currentView].type = view
// eslint-disable-next-line compat/compat // eslint-disable-next-line compat/compat
page.getUploads(Object.assign({ page.getUploads(Object.assign(page.views[page.currentView], {
trigger: element trigger: element
}, page.views[page.currentView])) }))
} }
page.displayPreview = id => { page.displayPreview = id => {
@ -1121,8 +1121,9 @@ page.filterUploads = element => {
// eslint-disable-next-line compat/compat // eslint-disable-next-line compat/compat
page.getUploads(Object.assign(page.views[page.currentView], { page.getUploads(Object.assign(page.views[page.currentView], {
filters, filters,
pageNum: 0 pageNum: 0,
}), element) trigger: element
}))
} }
page.viewUserUploads = (id, element) => { page.viewUserUploads = (id, element) => {

2
src/versions.json
View File

@ -1,5 +1,5 @@
{ {
"1": "1589650309", "1": "1589651276",
"2": "1589010026", "2": "1589010026",
"3": "1581416390", "3": "1581416390",
"4": "1581416390", "4": "1581416390",