diff --git a/source/Ox.UI/js/Core/Event.js b/source/Ox.UI/js/Core/Event.js index 2c6343d7..bd86f725 100644 --- a/source/Ox.UI/js/Core/Event.js +++ b/source/Ox.UI/js/Core/Event.js @@ -133,11 +133,13 @@ callbacks = options.callbacks, that = this; Ox.forEach(Ox.makeObject(args), function(data, originalEvent) { - var events = originalEvent.split('.'); + var events = originalEvent.split('.'), + triggerGlobally = !isKeyboardEvent(originalEvent) + || !Ox.Focus.focusedElementIsInput(); ['*'].concat(events.map(function(event, index) { return events.slice(0, index + 1).join('.'); })).forEach(function(event) { - (callbacks[0][event] || []) + (triggerGlobally ? callbacks[0][event] || [] : []) .concat(callbacks[1][event] || []) .forEach(function(callback) { callback.call(that, data, originalEvent, that);