mirror of
https://github.com/BobbyWibowo/lolisafe.git
synced 2025-02-21 20:59:04 +00:00
Fixed filter button not having loading spinner
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:
parent
8cd76a31f9
commit
83a7459a01
2
dist/js/dashboard.js
vendored
2
dist/js/dashboard.js
vendored
File diff suppressed because one or more lines are too long
2
dist/js/dashboard.js.map
vendored
2
dist/js/dashboard.js.map
vendored
File diff suppressed because one or more lines are too long
@ -229,9 +229,9 @@ page.prepareDashboard = () => {
|
||||
return page.warnSomethingLoading()
|
||||
|
||||
// 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
|
||||
}, itemMenus[i].params || {}))
|
||||
}))
|
||||
})
|
||||
|
||||
item.classList.remove('is-hidden')
|
||||
@ -421,9 +421,9 @@ page.switchPage = (action, element) => {
|
||||
return page.warnSomethingLoading()
|
||||
|
||||
// eslint-disable-next-line compat/compat
|
||||
const params = Object.assign({
|
||||
const params = Object.assign(page.views[page.currentView], {
|
||||
trigger: element
|
||||
}, page.views[page.currentView])
|
||||
})
|
||||
|
||||
const func = page.currentView === 'users' ? page.getUsers : page.getUploads
|
||||
|
||||
@ -830,9 +830,9 @@ page.setUploadsView = (view, element) => {
|
||||
page.views[page.currentView].type = view
|
||||
|
||||
// eslint-disable-next-line compat/compat
|
||||
page.getUploads(Object.assign({
|
||||
page.getUploads(Object.assign(page.views[page.currentView], {
|
||||
trigger: element
|
||||
}, page.views[page.currentView]))
|
||||
}))
|
||||
}
|
||||
|
||||
page.displayPreview = id => {
|
||||
@ -1121,8 +1121,9 @@ page.filterUploads = element => {
|
||||
// eslint-disable-next-line compat/compat
|
||||
page.getUploads(Object.assign(page.views[page.currentView], {
|
||||
filters,
|
||||
pageNum: 0
|
||||
}), element)
|
||||
pageNum: 0,
|
||||
trigger: element
|
||||
}))
|
||||
}
|
||||
|
||||
page.viewUserUploads = (id, element) => {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{
|
||||
"1": "1589650309",
|
||||
"1": "1589651276",
|
||||
"2": "1589010026",
|
||||
"3": "1581416390",
|
||||
"4": "1581416390",
|
||||
|
Loading…
Reference in New Issue
Block a user