Merge pull request #2751 from XhmikosR/js-tweaks

JS tweaks
pull/2768/head
REJack 2020-06-02 11:27:47 +02:00 committed by GitHub
commit bbb22a16de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 135 additions and 153 deletions

View File

@ -81,22 +81,17 @@ const CardRefresh = ($ => {
this._removeOverlay() this._removeOverlay()
}, this._settings.responseType !== '' && this._settings.responseType) }, this._settings.responseType !== '' && this._settings.responseType)
const loadedEvent = $.Event(Event.LOADED) $(this._element).trigger($.Event(Event.LOADED))
$(this._element).trigger(loadedEvent)
} }
_addOverlay() { _addOverlay() {
this._parent.append(this._overlay) this._parent.append(this._overlay)
$(this._element).trigger($.Event(Event.OVERLAY_ADDED))
const overlayAddedEvent = $.Event(Event.OVERLAY_ADDED)
$(this._element).trigger(overlayAddedEvent)
} }
_removeOverlay() { _removeOverlay() {
this._parent.find(this._overlay).remove() this._parent.find(this._overlay).remove()
$(this._element).trigger($.Event(Event.OVERLAY_REMOVED))
const overlayRemovedEvent = $.Event(Event.OVERLAY_REMOVED)
$(this._element).trigger(overlayRemovedEvent)
} }
// Private // Private
@ -143,7 +138,7 @@ const CardRefresh = ($ => {
CardRefresh._jQueryInterface.call($(this), 'load') CardRefresh._jQueryInterface.call($(this), 'load')
}) })
$(document).ready(() => { $(() => {
$(Selector.DATA_REFRESH).each(function () { $(Selector.DATA_REFRESH).each(function () {
CardRefresh._jQueryInterface.call($(this)) CardRefresh._jQueryInterface.call($(this))
}) })

View File

@ -76,9 +76,7 @@ const CardWidget = ($ => {
.addClass(this._settings.expandIcon) .addClass(this._settings.expandIcon)
.removeClass(this._settings.collapseIcon) .removeClass(this._settings.collapseIcon)
const collapsed = $.Event(Event.COLLAPSED) this._element.trigger($.Event(Event.COLLAPSED), this._parent)
this._element.trigger(collapsed, this._parent)
} }
expand() { expand() {
@ -91,17 +89,12 @@ const CardWidget = ($ => {
.addClass(this._settings.collapseIcon) .addClass(this._settings.collapseIcon)
.removeClass(this._settings.expandIcon) .removeClass(this._settings.expandIcon)
const expanded = $.Event(Event.EXPANDED) this._element.trigger($.Event(Event.EXPANDED), this._parent)
this._element.trigger(expanded, this._parent)
} }
remove() { remove() {
this._parent.slideUp() this._parent.slideUp()
this._element.trigger($.Event(Event.REMOVED), this._parent)
const removed = $.Event(Event.REMOVED)
this._element.trigger(removed, this._parent)
} }
toggle() { toggle() {
@ -131,9 +124,7 @@ const CardWidget = ($ => {
$(this).dequeue() $(this).dequeue()
}) })
const maximized = $.Event(Event.MAXIMIZED) this._element.trigger($.Event(Event.MAXIMIZED), this._parent)
this._element.trigger(maximized, this._parent)
} }
minimize() { minimize() {
@ -156,9 +147,7 @@ const CardWidget = ($ => {
$(this).dequeue() $(this).dequeue()
}) })
const MINIMIZED = $.Event(Event.MINIMIZED) this._element.trigger($.Event(Event.MINIMIZED), this._parent)
this._element.trigger(MINIMIZED, this._parent)
} }
toggleMaximize() { toggleMaximize() {

View File

@ -80,8 +80,7 @@ const ControlSidebar = ($ => {
$('body').removeClass(ClassName.CONTROL_SIDEBAR_OPEN) $('body').removeClass(ClassName.CONTROL_SIDEBAR_OPEN)
} }
const collapsedEvent = $.Event(Event.COLLAPSED) $(this._element).trigger($.Event(Event.COLLAPSED))
$(this._element).trigger(collapsedEvent)
} }
show() { show() {
@ -99,8 +98,7 @@ const ControlSidebar = ($ => {
$('body').addClass(ClassName.CONTROL_SIDEBAR_OPEN) $('body').addClass(ClassName.CONTROL_SIDEBAR_OPEN)
} }
const expandedEvent = $.Event(Event.EXPANDED) $(this._element).trigger($.Event(Event.EXPANDED))
$(this._element).trigger(expandedEvent)
} }
toggle() { toggle() {
@ -134,6 +132,10 @@ const ControlSidebar = ($ => {
} }
_fixScrollHeight() { _fixScrollHeight() {
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
return
}
const heights = { const heights = {
scroll: $(document).height(), scroll: $(document).height(),
window: $(window).height(), window: $(window).height(),
@ -148,7 +150,6 @@ const ControlSidebar = ($ => {
let navbarFixed = false let navbarFixed = false
let footerFixed = false let footerFixed = false
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
if ( if (
$('body').hasClass(ClassName.NAVBAR_FIXED) || $('body').hasClass(ClassName.NAVBAR_FIXED) ||
$('body').hasClass(ClassName.NAVBAR_SM_FIXED) || $('body').hasClass(ClassName.NAVBAR_SM_FIXED) ||
@ -198,16 +199,18 @@ const ControlSidebar = ($ => {
$(Selector.CONTROL_SIDEBAR).css('top', heights.header) $(Selector.CONTROL_SIDEBAR).css('top', heights.header)
} }
} }
}
_fixHeight() { _fixHeight() {
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
return
}
const heights = { const heights = {
window: $(window).height(), window: $(window).height(),
header: $(Selector.HEADER).outerHeight(), header: $(Selector.HEADER).outerHeight(),
footer: $(Selector.FOOTER).outerHeight() footer: $(Selector.FOOTER).outerHeight()
} }
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
let sidebarHeight = heights.window - heights.header let sidebarHeight = heights.window - heights.header
if ( if (
@ -235,7 +238,6 @@ const ControlSidebar = ($ => {
}) })
} }
} }
}
// Static // Static

View File

@ -40,9 +40,7 @@ const DirectChat = ($ => {
toggle() { toggle() {
$(this._element).parents(Selector.DIRECT_CHAT).first().toggleClass(ClassName.DIRECT_CHAT_OPEN) $(this._element).parents(Selector.DIRECT_CHAT).first().toggleClass(ClassName.DIRECT_CHAT_OPEN)
$(this._element).trigger($.Event(Event.TOGGLED))
const toggledEvent = $.Event(Event.TOGGLED)
$(this._element).trigger(toggledEvent)
} }
// Static // Static

View File

@ -46,7 +46,7 @@ const Dropdown = ($ => {
this._element.siblings().show().toggleClass('show') this._element.siblings().show().toggleClass('show')
if (!this._element.next().hasClass('show')) { if (!this._element.next().hasClass('show')) {
this._element.parents('.dropdown-menu').first().find('.show').removeClass('show').hide() this._element.parents(Selector.DROPDOWN_MENU).first().find('.show').removeClass('show').hide()
} }
this._element.parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', () => { this._element.parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', () => {

View File

@ -60,7 +60,7 @@ const Layout = ($ => {
fixLayoutHeight(extra = null) { fixLayoutHeight(extra = null) {
let controlSidebar = 0 let controlSidebar = 0
if ($('body').hasClass(ClassName.CONTROL_SIDEBAR_SLIDE_OPEN) || $('body').hasClass(ClassName.CONTROL_SIDEBAR_OPEN) || extra === 'controlSidebar') { if ($('body').hasClass(ClassName.CONTROL_SIDEBAR_SLIDE_OPEN) || $('body').hasClass(ClassName.CONTROL_SIDEBAR_OPEN) || extra === 'control_sidebar') {
controlSidebar = $(Selector.CONTROL_SIDEBAR_CONTENT).height() controlSidebar = $(Selector.CONTROL_SIDEBAR_CONTENT).height()
} }
@ -93,7 +93,10 @@ const Layout = ($ => {
} }
} }
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) { if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
return
}
if (offset !== false) { if (offset !== false) {
$(Selector.CONTENT).css('min-height', (max + offset) - heights.header - heights.footer) $(Selector.CONTENT).css('min-height', (max + offset) - heights.header - heights.footer)
} }
@ -109,12 +112,11 @@ const Layout = ($ => {
}) })
} }
} }
}
fixLoginRegisterHeight() { fixLoginRegisterHeight() {
if ($(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).length === 0) { if ($(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).length === 0) {
$('body, html').css('height', 'auto') $('body, html').css('height', 'auto')
} else if ($(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).length !== 0) { } else {
const boxHeight = $(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).height() const boxHeight = $(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).height()
if ($('body').css('min-height') !== boxHeight) { if ($('body').css('min-height') !== boxHeight) {
@ -150,7 +152,7 @@ const Layout = ($ => {
this.fixLayoutHeight() this.fixLayoutHeight()
}) })
.on('expanded.lte.controlsidebar', () => { .on('expanded.lte.controlsidebar', () => {
this.fixLayoutHeight('controlSidebar') this.fixLayoutHeight('control_sidebar')
}) })
$(window).resize(() => { $(window).resize(() => {

View File

@ -72,8 +72,7 @@ const PushMenu = ($ => {
localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN) localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN)
} }
const shownEvent = $.Event(Event.SHOWN) $(this._element).trigger($.Event(Event.SHOWN))
$(this._element).trigger(shownEvent)
} }
collapse() { collapse() {
@ -89,8 +88,7 @@ const PushMenu = ($ => {
localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED) localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED)
} }
const collapsedEvent = $.Event(Event.COLLAPSED) $(this._element).trigger($.Event(Event.COLLAPSED))
$(this._element).trigger(collapsedEvent)
} }
toggle() { toggle() {
@ -102,7 +100,10 @@ const PushMenu = ($ => {
} }
autoCollapse(resize = false) { autoCollapse(resize = false) {
if (this._options.autoCollapseSize) { if (!this._options.autoCollapseSize) {
return
}
if ($(window).width() <= this._options.autoCollapseSize) { if ($(window).width() <= this._options.autoCollapseSize) {
if (!$(Selector.BODY).hasClass(ClassName.OPEN)) { if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
this.collapse() this.collapse()
@ -115,10 +116,12 @@ const PushMenu = ($ => {
} }
} }
} }
}
remember() { remember() {
if (this._options.enableRemember) { if (!this._options.enableRemember) {
return
}
const toggleState = localStorage.getItem(`remember${EVENT_KEY}`) const toggleState = localStorage.getItem(`remember${EVENT_KEY}`)
if (toggleState === ClassName.COLLAPSED) { if (toggleState === ClassName.COLLAPSED) {
if (this._options.noTransitionAfterReload) { if (this._options.noTransitionAfterReload) {
@ -138,7 +141,6 @@ const PushMenu = ($ => {
$('body').removeClass(ClassName.COLLAPSED) $('body').removeClass(ClassName.COLLAPSED)
} }
} }
}
// Private // Private

View File

@ -68,11 +68,9 @@ const Toasts = ($ => {
class Toasts { class Toasts {
constructor(element, config) { constructor(element, config) {
this._config = config this._config = config
this._prepareContainer() this._prepareContainer()
const initEvent = $.Event(Event.INIT) $('body').trigger($.Event(Event.INIT))
$('body').trigger(initEvent)
} }
// Public // Public
@ -133,17 +131,14 @@ const Toasts = ($ => {
$(this._getContainerId()).prepend(toast) $(this._getContainerId()).prepend(toast)
const createdEvent = $.Event(Event.CREATED) $('body').trigger($.Event(Event.CREATED))
$('body').trigger(createdEvent)
toast.toast('show') toast.toast('show')
if (this._config.autoremove) { if (this._config.autoremove) {
toast.on('hidden.bs.toast', function () { toast.on('hidden.bs.toast', function () {
$(this).delay(200).remove() $(this).delay(200).remove()
$('body').trigger($.Event(Event.REMOVED))
const removedEvent = $.Event(Event.REMOVED)
$('body').trigger(removedEvent)
}) })
} }
} }

View File

@ -68,10 +68,9 @@ const TodoList = ($ => {
// Private // Private
_init() { _init() {
const that = this
$(Selector.DATA_TOGGLE).find('input:checkbox:checked').parents('li').toggleClass(ClassName.TODO_LIST_DONE) $(Selector.DATA_TOGGLE).find('input:checkbox:checked').parents('li').toggleClass(ClassName.TODO_LIST_DONE)
$(Selector.DATA_TOGGLE).on('change', 'input:checkbox', event => { $(Selector.DATA_TOGGLE).on('change', 'input:checkbox', event => {
that.toggle($(event.target)) this.toggle($(event.target))
}) })
} }

View File

@ -1314,7 +1314,7 @@
<!-- AdminLTE for demo purposes --> <!-- AdminLTE for demo purposes -->
<script src="../../dist/js/demo.js"></script> <script src="../../dist/js/demo.js"></script>
<script> <script>
$(document).ready(function () { $(function () {
bsCustomFileInput.init(); bsCustomFileInput.init();
}); });
</script> </script>

View File

@ -798,7 +798,7 @@
<!-- AdminLTE for demo purposes --> <!-- AdminLTE for demo purposes -->
<script src="../../dist/js/demo.js"></script> <script src="../../dist/js/demo.js"></script>
<script> <script>
$(document).ready(function () { $(function () {
$.validator.setDefaults({ $.validator.setDefaults({
submitHandler: function () { submitHandler: function () {
alert( "Form successful submitted!" ); alert( "Form successful submitted!" );