From 2aec28f1057421bb830fab3153b58a801349f7a4 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Fri, 26 Sep 2014 12:24:34 +0200
Subject: [PATCH] use OxKeyboardFocus class for input-like elements

---
 source/Ox.UI/js/Core/Focus.js           | 6 +-----
 source/Ox.UI/js/Form/Editable.js        | 5 ++++-
 source/Ox.UI/js/Form/EditableContent.js | 2 +-
 source/Ox.UI/js/Form/Input.js           | 8 ++++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/Ox.UI/js/Core/Focus.js b/source/Ox.UI/js/Core/Focus.js
index f08d16af..90fcf7b6 100644
--- a/source/Ox.UI/js/Core/Focus.js
+++ b/source/Ox.UI/js/Core/Focus.js
@@ -14,11 +14,7 @@ Ox.Focus = (function() {
             },
             focusedElementIsInput: function() {
                 var $element = that.focusedElement();
-                return $element && (
-                    $element.hasClass('OxInput')
-                    || $element.hasClass('OxEditableElement')
-                    || $element.hasClass('OxAutocompleteMenu')
-                );
+                return $element && $element.hasClass('OxKeyboardFocus');
             },
             gainFocus: function($element) {
                 var $focusedElement = that.focusedElement(),
diff --git a/source/Ox.UI/js/Form/Editable.js b/source/Ox.UI/js/Form/Editable.js
index 3bc2b0ee..71edaac7 100644
--- a/source/Ox.UI/js/Form/Editable.js
+++ b/source/Ox.UI/js/Form/Editable.js
@@ -67,7 +67,10 @@ Ox.Editable = function(options, self) {
                 self.$value.html(formatValue());
             }
         })
-        .addClass('OxEditableElement' + (self.options.editable ? ' OxEditable' : ''))
+        .addClass(
+            'OxEditableElement OxKeyboardFocus'
+            + (self.options.editable ? ' OxEditable' : '')
+        )
         .on({
             click: function(e) {
                 var $target = $(e.target);
diff --git a/source/Ox.UI/js/Form/EditableContent.js b/source/Ox.UI/js/Form/EditableContent.js
index cecd891c..b5766837 100644
--- a/source/Ox.UI/js/Form/EditableContent.js
+++ b/source/Ox.UI/js/Form/EditableContent.js
@@ -43,7 +43,7 @@ Ox.EditableContent = function(options, self) {
                 !self.options.editing && that.html(formatValue());
             }
         })
-        .addClass('OxEditableContent')
+        .addClass('OxEditableContent OxKeyboardFocus')
         .on({
             blur: self.options.submitOnBlur ? submit : blur,
             click: function(e) {
diff --git a/source/Ox.UI/js/Form/Input.js b/source/Ox.UI/js/Form/Input.js
index 64e00561..dff0eadb 100644
--- a/source/Ox.UI/js/Form/Input.js
+++ b/source/Ox.UI/js/Form/Input.js
@@ -154,7 +154,7 @@ Ox.Input = function(options, self) {
                 }
             })
             .addClass(
-                'OxInput OxMedium Ox' + Ox.toTitleCase(self.options.style)
+                'OxInput OxKeyboardFocus OxMedium Ox' + Ox.toTitleCase(self.options.style)
                 + (self.options.type == 'textarea' ? ' OxTextarea' : '') /*+ (
                     self.options.overlap != 'none' ?
                     ' OxOverlap' + Ox.toTitleCase(self.options.overlap) : ''
@@ -278,7 +278,7 @@ Ox.Input = function(options, self) {
     }
 
     self.$input = $(self.options.type == 'textarea' ? '<textarea>' : '<input>')
-        .addClass('OxInput OxMedium Ox' + Ox.toTitleCase(self.options.style))
+        .addClass('OxInput OxKeyboardFocus OxMedium Ox' + Ox.toTitleCase(self.options.style))
         .attr({
             disabled: self.options.disabled,
             type: self.options.type == 'password' ? 'password' : 'text'
@@ -345,7 +345,7 @@ Ox.Input = function(options, self) {
     if (self.hasPasswordPlaceholder) {
         self.$input.hide();
         self.$placeholder = $('<input>')
-            .addClass('OxInput OxMedium Ox' +
+            .addClass('OxInput OxKeyboardFocus OxMedium Ox' +
                 Ox.toTitleCase(self.options.style) +
                 ' OxPlaceholder')
             .attr({type: 'text'})
@@ -730,7 +730,7 @@ Ox.Input = function(options, self) {
                     top: 0
                 }
             })
-            .addClass('OxAutocompleteMenu')
+            .addClass('OxAutocompleteMenu OxKeyboardFocus')
             .bindEvent({
                 click: clickMenu,
                 key_enter: function() {