fix #313 Instant search not working in dropdowns

Orckestra · Feb 2, 2017 · 809f86b · 809f86b
1 parent 78e263b
commit 809f86b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js b/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js
@@ -381,7 +381,9 @@ SelectorBinding.prototype.buildPopup = function () {
 	popupBinding.addActionListener ( PopupBinding.ACTION_SHOW, this );
 	popupBinding.addActionListener ( MenuItemBinding.ACTION_COMMAND, this );
 	popupBinding.addActionListener ( PopupBinding.ACTION_HIDE, this );
-	this._buttonBinding.setPopup ( popupBinding );
+	this._buttonBinding.setPopup(popupBinding);
+
+	this._popupBinding.isManaged = true;
 }
 
 /**

diff --git a/Website/Composite/scripts/source/top/ui/bindings/popups/PopupBinding.js b/Website/Composite/scripts/source/top/ui/bindings/popups/PopupBinding.js
@@ -159,6 +159,12 @@ function PopupBinding () {
 	 */
 	this.hasImages = true;
 
+	/**
+	 * @type {boolean}
+	 */
+	this.isManaged = false;
+
+
 	/*
 	 * Returnable.
 	 */
@@ -468,9 +474,12 @@ PopupBinding.prototype.show = function () {
 
 		if ( this._bodyBinding instanceof MenuBodyBinding ) {
 			this._bodyBinding.refreshMenuGroups();
-			this._bodyBinding.grabKeyboard();
-			this._bodyBinding.bindingElement.tabIndex = "-1";
-			this._bodyBinding.bindingElement.focus();
+
+			if (!this.isManaged) {
+				this._bodyBinding.grabKeyboard();
+				this._bodyBinding.bindingElement.tabIndex = "-1";
+				this._bodyBinding.bindingElement.focus();
+			}
 		}
 
 		/**