Bug 894811 - First character gets dropped when typing into urlbar after opening a new tab.r=mbrubeck

2013-08-08 11:48:01 -07:00 · 2013-08-08 11:48:01 -07:00 · f332128f59
--- a/browser/metro/base/content/bindings/urlbar.xml
+++ b/browser/metro/base/content/bindings/urlbar.xml
@ -281,20 +281,22 @@
        <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>
@ -313,8 +315,9 @@
            if (this.focused)
              this.blur();

-            if (aShouldRevert)
+            if (aShouldRevert) {
              this.value = this._lastKnownGoodURL;
+            }
          ]]>
        </body>
      </method>
@ -445,6 +448,7 @@
      <handler event="click" phase="capturing">
        <![CDATA[
          this.beginEditing(true);
+          this.select();
        ]]>
      </handler>

--- a/browser/metro/base/content/browser-ui.js
+++ b/browser/metro/base/content/browser-ui.js
@ -1075,6 +1075,7 @@ var BrowserUI = {
      case "cmd_newTab":
        this.newTab(null, null, true);
        this._edit.beginEditing(false);
+        this._edit.select();
        break;
      case "cmd_closeTab":
        this.closeTab();