Skip to content

Commit

Permalink
Revert "fix #926 - blur not triggered in multiselect for IE"
Browse files Browse the repository at this point in the history
This reverts commit 5fe8638.
  • Loading branch information
jakub-g committed Jan 24, 2014
1 parent f999026 commit 847519d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 273 deletions.
6 changes: 2 additions & 4 deletions src/aria/popups/Popup.js
Expand Up @@ -847,10 +847,8 @@ Aria.classDefinition({
domEvent : domEvent
};
this.$raiseEvent(event);
if (!event.cancelClose) {
this.close(domEvent);
return true;
}
this.close(domEvent);
return true;
}
},

Expand Down
29 changes: 1 addition & 28 deletions src/aria/widgets/form/DropDownTrait.js
Expand Up @@ -49,7 +49,6 @@ Aria.classDefinition({
var onDescription = {
"onAfterOpen" : this._afterDropdownOpen,
"onAfterClose" : this._afterDropdownClose,
"onMouseClickClose" : this._dropDownMouseClickClose,
scope : this
};

Expand Down Expand Up @@ -144,36 +143,10 @@ Aria.classDefinition({
this._dropdownPopup.$dispose();
this._dropdownPopup = null;
aria.templates.Layout.$unregisterListeners(this);
if (!aria.core.Browser.isIE) {
this.focus(null, true);
}
this.focus(null, true);
this._keepFocus = false;
},

/**
* Callback for the event onMouseClickClose raised by the popup. <br>
* fix for PTR07002335: method used to fix IE bug (a click in a text input does not trigger the blur event on
* the previously selected multiselect input, so that the activeElement does not change properly)
* @protected
*/
_dropDownMouseClickClose : function (evt) {
if (aria.core.Browser.isIE) {
evt.cancelClose = true;
var self = this;
setTimeout(function () {
var activeElement = Aria.$window.document.activeElement;
self.focus(null, true);
self._keepFocus = false;
setTimeout(function () {
if (activeElement) {
activeElement.focus();
}
self._dropdownPopup.close();
}, 1);
}, 1);
}
},

/**
* Internal method called when the popup must be closed
* @protected
Expand Down
102 changes: 0 additions & 102 deletions test/aria/widgets/form/multiselect/focusIssue/MultiSelect.js

This file was deleted.

139 changes: 0 additions & 139 deletions test/aria/widgets/form/multiselect/focusIssue/MultiSelectTpl.tpl

This file was deleted.

0 comments on commit 847519d

Please sign in to comment.