From ae8ee195a13590bfafc3ace4f6abfbc7b28da678 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Thu, 25 Sep 2014 19:41:46 +0200
Subject: [PATCH] fix a bug in keyboard handler

---
 source/Ox.UI/js/Core/Event.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/Ox.UI/js/Core/Event.js b/source/Ox.UI/js/Core/Event.js
index 7042d9c6..a944d404 100644
--- a/source/Ox.UI/js/Core/Event.js
+++ b/source/Ox.UI/js/Core/Event.js
@@ -114,7 +114,10 @@
             resetTimeout = setTimeout(function() {
                 keys = '';
             }, 1000);
-            if (Ox.contains(keyboardCallbacks[0], event) || (
+            if ((
+                keyboardCallbacks[0]
+                && Ox.contains(keyboardCallbacks[0], event)
+            ) || (
                 $element && keyboardCallbacks[$element.oxid]
                 && Ox.contains(keyboardCallbacks[$element.oxid], event)
             )) {