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

Extend module event handler capabilities, allow for easier use 

* introduce 'rendered' event for modules
* use this.module.on() instead of registerEventHandlers()
* no CSS filter creates event handlers on module containers
This commit is contained in:
Thomas Gelf 2014-03-31 08:38:00 +00:00
parent f67b83fb75
commit d0fd25d4ef
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/js/icinga/loader.js
View File

@ -435,6 +435,7 @@
if (active) {
$('[href="' + active + '"]', req.$target).addClass('active');
}
req.$target.trigger('rendered');
},
/**

41
public/js/icinga/module.js
View File

@ -10,10 +10,11 @@
// The Icinga instance
this.icinga = icinga;
// Event handlers registered by this module
// Applied event handlers
this.handlers = [];
this.registeredHandlers = {};
// Event handlers registered by this module
this.registeredHandlers = [];
// The module name
this.name = name;
@ -44,7 +45,7 @@
// The constructor of the modules prototype must be prepared to get an
// instance of Icinga.Module
this.object = new this.prototyp(this);
this.applyRegisteredEventHandlers();
this.applyHandlers();
} catch(e) {
this.icinga.logger.error(
'Failed to load module ' + this.name + ': ',
@ -63,28 +64,28 @@
},
/**
* Globally register this modules event handlers
* Register this modules event handlers
*/
registerEventHandlers: function (handlers) {
this.registeredHandlers = handlers;
return this;
on: function (event, filter, handler) {
if (typeof handler === 'undefined') {
handler = filter;
filter = '.module-' + this.name;
} else {
filter = '.module-' + this.name + ' ' + filter;
}
this.registeredHandlers.push({event: event, filter: filter, handler: handler});
},
applyRegisteredEventHandlers: function () {
applyHandlers: function () {
var self = this;
$.each(this.registeredHandlers, function (filter, events) {
$.each(events, function (event, handler) {
// TODO: if (event[1] === 'each') {
// $(event[0], $(el)).each(event[2]);
self.bindEventHandler(
event,
'.module-' + self.name + ' ' + filter,
handler
);
});
$.each(this.registeredHandlers, function (key, on) {
self.bindEventHandler(
on.event,
on.filter,
on.handler
);
});
self = null;