Bug 609874 - Combobox list doesn't appear after pressing the system Back button [r=vingtetun,mfinkle]

--HG--
extra : rebase_source : 99c4aeb7012b240101462b331379aa56305d1fdb
This commit is contained in:
Matt Brubeck 2010-11-10 07:57:55 -08:00
Родитель 400ec15a2a
Коммит 8a1b3ebc44
3 изменённых файлов: 14 добавлений и 7 удалений

Просмотреть файл

@ -1500,13 +1500,13 @@
<property name="isActive" onget="return !this._spacer.hidden;"/>
<field name="_model">null</field>
<field name="model">null</field>
<method name="show">
<parameter name="aModel" />
<body><![CDATA[
// call the hide callback of the current object if any
if (this._model && this._model.type != aModel.type)
this._model.hide();
if (this.model && this.model.type != aModel.type)
this.model.hide();
this.setAttribute("type", aModel.type);
this.setAttribute("next", aModel.commands.next);
@ -1519,7 +1519,7 @@
this._previousButton.disabled = document.getElementById(aModel.commands.previous).disabled;
this._nextButton.disabled = document.getElementById(aModel.commands.next).disabled;
this._model = aModel;
this.model = aModel;
this.contentHasChanged();
this._spacer.hidden = false;
]]></body>
@ -1533,7 +1533,7 @@
this.removeAttribute("close");
this.removeAttribute("type");
this._model = null;
this.model = null;
this._spacer.hidden = true;
]]></body>
</method>

Просмотреть файл

@ -781,7 +781,7 @@ var BrowserUI = {
// Check content helper
let contentHelper = document.getElementById("content-navigator");
if (contentHelper.isActive) {
contentHelper.hide();
contentHelper.model.hide();
return;
}
@ -1859,6 +1859,8 @@ var FormHelperUI = {
this._updateContainerForSelect(this._currentElement, null);
this._open = false;
Browser.selectedBrowser.messageManager.sendAsyncMessage("FormAssist:Closed", { });
},
handleEvent: function formHelperHandleEvent(aEvent) {
@ -2212,7 +2214,7 @@ var SelectHelperUI = {
this._container.addEventListener("click", this, false);
this._panel.addEventListener("overflow", this, true);
},
_showFilter: false,
get showFilter() {
return this._showFilter;

Просмотреть файл

@ -187,6 +187,11 @@ FormAssistant.prototype = {
currentElement.dispatchEvent(event);
break;
}
case "FormAssist:Closed":
currentElement.blur();
this._currentIndex = null;
break;
}
},