NoticeManager.bootstrap - refactor + modernize
This commit is contained in:
parent
ca68f59a28
commit
7cc5b6de5a
@ -2,27 +2,26 @@
|
||||
* NoticeManager class/module
|
||||
*
|
||||
*/
|
||||
var NoticeManager = (function ($, document) {
|
||||
let options = window.notice_manager_options
|
||||
const NoticeManager = function ($) {
|
||||
|
||||
let selectors_notice = [
|
||||
const selectors_notice = [
|
||||
"div.notice",
|
||||
"div.updated",
|
||||
]
|
||||
|
||||
let selectors_warning = [
|
||||
const selectors_warning = [
|
||||
"div.notice-warning",
|
||||
"div.update-nag",
|
||||
]
|
||||
|
||||
let selectors_error = [
|
||||
const selectors_error = [
|
||||
"div.error",
|
||||
"div.notice-error",
|
||||
]
|
||||
|
||||
let selectors_all = selectors_notice.concat(selectors_warning, selectors_error)
|
||||
const selectors_all = selectors_notice.concat(selectors_warning, selectors_error)
|
||||
|
||||
let selectors_skip = [
|
||||
const selectors_skip = [
|
||||
".inline",
|
||||
".below-h2",
|
||||
".theme-info .notice",
|
||||
@ -30,26 +29,40 @@ var NoticeManager = (function ($, document) {
|
||||
]
|
||||
|
||||
// wait function used with autoCollapse
|
||||
let wait = function (ms) {
|
||||
const wait = function (ms) {
|
||||
var dfd = $.Deferred()
|
||||
setTimeout(dfd.resolve, ms) //callback, timeout till callback
|
||||
return dfd.promise()
|
||||
}
|
||||
|
||||
const options = window.notice_manager_options
|
||||
|
||||
let notices
|
||||
|
||||
let button
|
||||
let panel
|
||||
let haveClosed // set to true on first close/collect
|
||||
let dismissNoticesButton
|
||||
|
||||
// bootstrap
|
||||
// some of these need to run BEFORE document.ready - don't know why really
|
||||
let haveClosed // set to true on first close/collect
|
||||
|
||||
return {
|
||||
bootstrap: () => {
|
||||
|
||||
// Init selectors
|
||||
button = $("#meta-link-notices")
|
||||
panel = $("#meta-link-notices-wrap")
|
||||
haveClosed = false
|
||||
dismissNoticesButton = $("#meta-link-notices-wrap button.notice-dismiss")
|
||||
|
||||
// bootstrap notices
|
||||
// get all notices that are not explicitly marked as `.inline` or `.below-h2`
|
||||
// we add .update-nag.inline for WordPress Update notice
|
||||
notices = $(selectors_all.join(', '))
|
||||
.not(selectors_skip.join(', '))
|
||||
.add("div.update-nag")
|
||||
|
||||
// Set state
|
||||
haveClosed = false
|
||||
|
||||
dismissNoticesButton.on("click", () => {
|
||||
screenMeta.close(panel, button)
|
||||
if (!haveClosed) {
|
||||
@ -83,21 +96,20 @@ var NoticeManager = (function ($, document) {
|
||||
}
|
||||
})
|
||||
|
||||
// prevent jumpy scrollRestoration on reload page
|
||||
// fixed below on 'beforeunload'
|
||||
// if (history.scrollRestoration) {
|
||||
// history.scrollRestoration = 'manual'
|
||||
//}
|
||||
/**
|
||||
* document.on.ready
|
||||
* Set history.scrollTop to prevent jump on page refresh when scrollRestoration = auto
|
||||
*/
|
||||
$(() => {
|
||||
|
||||
console.log("NoticeManager.on.ready")
|
||||
console.log("options")
|
||||
console.log(options)
|
||||
|
||||
// bootstrap notices
|
||||
// get all notices that are not explicitly marked as `.inline` or `.below-h2`
|
||||
// we add .update-nag.inline for WordPress Update notice
|
||||
notices = $( selectors_all.join(', ') )
|
||||
.not(selectors_skip.join(', '))
|
||||
.add("div.update-nag")
|
||||
$(window).on('beforeunload', () => history.pushState(
|
||||
{ scrollTop: document.body.scrollTop },
|
||||
document.title,
|
||||
document.location.pathname
|
||||
)
|
||||
)
|
||||
|
||||
/**
|
||||
* Remove panel if there are no notices on this page
|
||||
@ -141,25 +153,8 @@ var NoticeManager = (function ($, document) {
|
||||
NoticeManager.addCounterWhenClosed()
|
||||
}
|
||||
|
||||
}) // end document.on.ready
|
||||
},
|
||||
|
||||
// prevent jumpy scrollRestoration on reload page
|
||||
// fixed below on 'beforeunload'
|
||||
// if (history.scrollRestoration) {
|
||||
// history.scrollRestoration = 'manual'
|
||||
//}
|
||||
/**
|
||||
* Set history.scrollTop to prevent jump on page refresh when scrollRestoration = auto
|
||||
*/
|
||||
$(window).on("beforeunload", () => {
|
||||
history.pushState(
|
||||
{ scrollTop: document.body.scrollTop },
|
||||
document.title,
|
||||
document.location.pathname
|
||||
)
|
||||
})
|
||||
|
||||
return {
|
||||
getNotices: () => notices,
|
||||
|
||||
getNoticesTopPriority: () => {
|
||||
@ -262,4 +257,6 @@ var NoticeManager = (function ($, document) {
|
||||
notices.insertBefore(".wrap:first")
|
||||
},
|
||||
}
|
||||
}(jQuery,document) )
|
||||
}(jQuery);
|
||||
|
||||
jQuery(NoticeManager.bootstrap);
|
||||
Loading…
Reference in New Issue
Block a user