tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

js: Use custom event `icinga-init` to trigger initial render events 

The `load` event is not really only fired *after all shared resources are loaded*.
Just Chromium ensures this event is fired only after `ready` and `DOMContentLoaded`.
FF, IE and Safari don't so we need our own post-init event: `icinga-init`
This commit is contained in:
Johannes Meyer 2019-11-26 16:00:21 +01:00
parent 48098a2830
commit cc065b949b
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/icinga.js
View File

@ -108,6 +108,9 @@
this.logger.info('Icinga is ready, running on jQuery ', $().jquery); this.logger.info('Icinga is ready, running on jQuery ', $().jquery);
this.initialized = true; this.initialized = true;
// Trigger our own post-init event, `onLoad` is not reliable enough
$(document).trigger('icinga-init');
}, },
/** /**

35
public/js/icinga/events.js
View File

@ -38,11 +38,22 @@
behavior.bind($(document)); behavior.bind($(document));
}); });
var _this = this;
$('.container').each(function () {
// Initialize module javascript (Applies only to module.js code)
var moduleName = $(this).data('icingaModule');
if (moduleName) {
if (_this.icinga.hasModule(moduleName) && ! _this.icinga.isLoadedModule(moduleName)) {
_this.icinga.loadModule(moduleName);
}
}
});
// We catch resize events // We catch resize events
$(window).on('resize', { self: this.icinga.ui }, this.icinga.ui.onWindowResize); $(window).on('resize', { self: this.icinga.ui }, this.icinga.ui.onWindowResize);
// Trigger 'rendered' event also on page loads // Trigger 'rendered' event also on page loads
$(window).on('load', { self: this }, this.onLoad); $(document).on('icinga-init', { self: this }, this.onInit);
// Destroy Icinga, clean up and interrupt pending requests on unload // Destroy Icinga, clean up and interrupt pending requests on unload
$( window ).on('unload', { self: this }, this.onUnload); $( window ).on('unload', { self: this }, this.onUnload);
@ -82,21 +93,6 @@
// $(document).on('change', 'form.auto select', this.submitForm); // $(document).on('change', 'form.auto select', this.submitForm);
}, },
/**
* Initialize module javascript (Applies only to module.js code)
*/
initializeModules: function () {
var _this = this;
$('.container').each(function () {
var moduleName = $(this).data('icingaModule');
if (moduleName) {
if (_this.icinga.hasModule(moduleName) && ! _this.icinga.isLoadedModule(moduleName)) {
_this.icinga.loadModule(moduleName);
}
}
});
},
treeNodeToggle: function () { treeNodeToggle: function () {
var $parent = $(this).closest('li'); var $parent = $(this).closest('li');
if ($parent.hasClass('collapsed')) { if ($parent.hasClass('collapsed')) {
@ -109,13 +105,10 @@
icinga.ui.fixControls($parent.closest('.container')); icinga.ui.fixControls($parent.closest('.container'));
}, },
onLoad: function (event) { onInit: function (event) {
$('body').removeClass('loading'); $('body').removeClass('loading');
// First initialize already included modules // Trigger the initial `rendered` events
event.data.self.initializeModules();
// Then trigger the initial `rendered` events
$('.container').trigger('rendered'); $('.container').trigger('rendered');
// Additionally trigger a `rendered` event on the layout, some behaviors may // Additionally trigger a `rendered` event on the layout, some behaviors may