Apply behaviors correctly on startup

Icinga · Sep 10, 2014 · 5d2e849 · 5d2e849
1 parent d99d50b
commit 5d2e849
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/public/js/icinga.js b/public/js/icinga.js
@@ -97,7 +97,7 @@
             this.history    = new Icinga.History(this);
             var self = this;
             $.each(Icinga.Behaviors, function(name, Behavior) {
-                self.behaviors[name.toLowerCase()] = new Behavior();
+                self.behaviors[name.toLowerCase()] = new Behavior(self);
             });
 
             this.timezone.initialize();

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
@@ -32,26 +32,17 @@
         initialize: function () {
             this.applyGlobalDefaults();
             this.applyHandlers($('#layout'));
-            var self = this;
-
-            // define global site behavior
-            $.each(self.icinga.behaviors, function (name, behavior) {
-                behavior.bind();
-            });
-
-            // prepare container html
             $('.container').each(function(idx, el) {
-                // apply event handlers
                 icinga.events.applyHandlers($(el));
                 icinga.ui.initializeControls($(el));
-                $.each(self.icinga.behaviors, function (name, behavior) {
-                    behavior.apply(el);
-                });
             });
         },
 
         // TODO: What's this?
         applyHandlers: function (el) {
+            $.each(this.icinga.behaviors, function (name, behavior) {
+                behavior.apply(el);
+            });
 
             var icinga = this.icinga;
 
@@ -152,6 +143,10 @@
          * Global default event handlers
          */
         applyGlobalDefaults: function () {
+            $.each(self.icinga.behaviors, function (name, behavior) {
+                behavior.bind();
+            });
+
             // We catch resize events
             $(window).on('resize', { self: this.icinga.ui }, this.icinga.ui.onWindowResize);
 
@@ -673,6 +668,9 @@
     */
 
         unbindGlobalHandlers: function () {
+            $.each(self.icinga.behaviors, function (name, behavior) {
+                behavior.unbind();
+            });
             $(window).off('resize', this.onWindowResize);
             $(window).off('load', this.onLoad);
             $(window).off('unload', this.onUnload);