diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index a82e2b06..84f42542 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -298,14 +298,16 @@ Ox.load.UI = function(options, callback) { Ox.forEach(arguments[0], function(callback, event) { Ox.Message.bind(function(event_, data, oxid) { if (event_ == event && Ox.isUndefined(oxid)) { - callback(data); + callback(data || {}); } }); }); } else { callback = arguments[0]; Ox.Message.bind(function(event, data, oxid) { - Ox.isUndefined(oxid) && callback(event, data); + if (Ox.isUndefined(oxid)) { + callback(event, data || {}); + } }); } return this; diff --git a/source/Ox.UI/js/Core/Element.js b/source/Ox.UI/js/Core/Element.js index 9676ef65..e68d96b2 100644 --- a/source/Ox.UI/js/Core/Element.js +++ b/source/Ox.UI/js/Core/Element.js @@ -364,7 +364,7 @@ Ox.Element = function(options, self) { Ox.forEach(arguments[0], function(callback, event) { Ox.Message.bind(arguments[0], function(event_, data, oxid) { if (event_ == event && oxid == that.oxid) { - callback(data); + callback(data || {}); } }); }); @@ -372,7 +372,7 @@ Ox.Element = function(options, self) { callback = arguments[0]; Ox.Message.bind(function(event, data, oxid) { if (that.oxid == oxid) { - callback(event, data); + callback(event, data || {}); } }); }