Fix bug #7402 (Focus not set to inline editor after creating new rule) - If

the client of the DropdownButton changes focus in respond to the "select"
event that closes it, leave focus in that new location. Only restore focus
to where it was before dropdown closed if no one has touched the focus while
closing.

Author: peterflynn

src/widgets/DropdownButton.js

@@ -188,10 +188,14 @@ define(function (require, exports, module) {
     DropdownButton.prototype._onDropdownClose = function () {
         window.document.body.removeEventListener("click", this._onClickOutside, true);
         $(PanelManager).off("editorAreaResize", this.closeDropdown);
+
+        // Restore focus to old pos, unless "select" handler changed it
+        if (window.document.activeElement === this.$dropdown[0]) {
+            this._lastFocus.focus();
+        }
+        
         this._dropdownEventHandler = null;
         this.$dropdown = null;  // already remvoed from DOM automatically by PopUpManager
-
-        this._lastFocus.focus();  // restore focus to old pos
     };
 
     /** Closes the dropdown if currently open */