Backed out changeset 7e0356305566 (bug 894811)

This commit is contained in:
Tim Taubert 2013-08-09 04:05:05 +02:00
parent e3a308396c
commit 43d046dd64
2 changed files with 5 additions and 10 deletions

View File

@ -281,22 +281,20 @@
<parameter name="aShouldDismiss"/>
<body>
<![CDATA[
if (this.isEditing) {
if (this.isEditing)
return;
}
Elements.urlbarState.setAttribute("mode", "edit");
this._lastKnownGoodURL = this.value;
if (!this.focused) {
if (!this.focused)
this.focus();
}
this._clearFormatting();
this.select();
if (aShouldDismiss) {
if (aShouldDismiss)
ContextUI.dismissTabs();
}
]]>
</body>
</method>
@ -315,9 +313,8 @@
if (this.focused)
this.blur();
if (aShouldRevert) {
if (aShouldRevert)
this.value = this._lastKnownGoodURL;
}
]]>
</body>
</method>
@ -448,7 +445,6 @@
<handler event="click" phase="capturing">
<![CDATA[
this.beginEditing(true);
this.select();
]]>
</handler>

View File

@ -1075,7 +1075,6 @@ var BrowserUI = {
case "cmd_newTab":
this.newTab(null, null, true);
this._edit.beginEditing(false);
this._edit.select();
break;
case "cmd_closeTab":
this.closeTab();