From 812e95d740c093d8843988df43a2a3f9e9e10c53 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Fri, 6 Dec 2013 20:56:33 +0100
Subject: [PATCH] cosmetic changes

---
 source/Ox.UI/js/Core/Element.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/Ox.UI/js/Core/Element.js b/source/Ox.UI/js/Core/Element.js
index dace5d0a..7554b965 100644
--- a/source/Ox.UI/js/Core/Element.js
+++ b/source/Ox.UI/js/Core/Element.js
@@ -93,16 +93,14 @@ Ox.Element = function(options, self) {
     // create public object
     var that = new Ox.JQueryElement($(self.options.element || '<div>'))
         .addClass('OxElement')
-        .on({
+        .on(Ox.extend({
             mousedown: mousedown,
             mousewheel: mousewheel
-        });
-
-    if (self.options.element == '<iframe>') {
-        that.on('load', function() {
-            Ox.Message.post(that, 'init', {id: that.oxid});
-        });
-    }
+        }, self.options.element == '<iframe>' ? {
+            load: function() {
+                Ox.Message.post(that, 'init', {id: that.oxid});
+            }
+        } : {}));
 
     setTooltip();