Fix button focus issues

This change introduces derived classes for ComboButton, DropDownButton
and Select that make sure that buttons do not remain focused after their
menus are closed. This allows using hotkeys after closing them.

3 files changed, 32 insertions, 0 deletions

diff --git a/js/form/ComboButton.js b/js/form/ComboButton.js
new file mode 100755
index 000000000..1084cda9c
--- /dev/null
+++ b/js/form/ComboButton.js
@@ -0,0 +1,12 @@
+/* global dijit */
+define(["dojo/_base/declare", "dijit/form/ComboButton"], function (declare) {
+	return declare("fox.form.ComboButton", dijit.form.ComboButton, {
+		startup: function() {
+			this.inherited(arguments);
+			this.dropDown.autoFocus = true; // Allow dropdown menu to be focused on click
+		},
+		focus: function() {
+			return; // Stop dijit.form.ComboButton from keeping focus after closing the menu
+		},
+	});
+});
diff --git a/js/form/DropDownButton.js b/js/form/DropDownButton.js
new file mode 100755
index 000000000..0c182772a
--- /dev/null
+++ b/js/form/DropDownButton.js
@@ -0,0 +1,12 @@
+/* global dijit */
+define(["dojo/_base/declare", "dijit/form/DropDownButton"], function (declare) {
+	return declare("fox.form.DropDownButton", dijit.form.DropDownButton, {
+		startup: function() {
+			this.inherited(arguments);
+			this.dropDown.autoFocus = true; // Allow dropdown menu to be focused on click
+		},
+		focus: function() {
+			return; // Stop dijit.form.DropDownButton from keeping focus after closing the menu
+		},
+	});
+});
diff --git a/js/form/Select.js b/js/form/Select.js
new file mode 100755
index 000000000..c62db1821
--- /dev/null
+++ b/js/form/Select.js
@@ -0,0 +1,8 @@
+/* global dijit */
+define(["dojo/_base/declare", "dijit/form/Select"], function (declare) {
+	return declare("fox.form.Select", dijit.form.Select, {
+		focus: function() {
+			return; // Stop dijit.form.Select from keeping focus after closing the menu
+		},
+	});
+});