зеркало из https://github.com/mozilla/gecko-dev.git
Bug 590779 - Virtual keyboard should not been showed on urlbar first tap [r=mfinkle]
This commit is contained in:
Vivien Nicolas
Родитель
9329480bef
Коммит
eb22cf2dfe
|
|
@ -300,6 +300,7 @@ let Elements = {};
|
|||
[
|
||||
["browserBundle", "bundle_browser"],
|
||||
["contentShowing", "bcast_contentShowing"],
|
||||
["urlbarState", "bcast_urlbarState"],
|
||||
["stack", "stack"],
|
||||
["panelUI", "panel-container"],
|
||||
["viewBuffer", "view-buffer"],
|
||||
|
|
|
|||
|
|
@ -16,13 +16,10 @@
|
|||
<method name="openPopup">
|
||||
<body><![CDATA[
|
||||
this.popup.openAutocompletePopup(this, null);
|
||||
this.setAttribute("open", "true");
|
||||
]]></body>
|
||||
</method>
|
||||
<method name="closePopup">
|
||||
<body><![CDATA[
|
||||
this.removeAttribute("open");
|
||||
|
||||
// hack! we want to revert to the "all results" popup when the
|
||||
// controller would otherwise close us because of an empty search
|
||||
// string.
|
||||
|
|
|
|||
|
|
@ -140,13 +140,12 @@ var BrowserUI = {
|
|||
},
|
||||
|
||||
_updateToolbar: function _updateToolbar() {
|
||||
let icons = document.getElementById("urlbar-icons");
|
||||
let mode = icons.getAttribute("mode");
|
||||
let mode = Elements.urlbarState.getAttribute("mode");
|
||||
if (Browser.selectedTab.isLoading() && mode != "loading") {
|
||||
icons.setAttribute("mode", "loading");
|
||||
Elements.urlbarState.setAttribute("mode", "loading");
|
||||
}
|
||||
else if (mode != "view") {
|
||||
icons.setAttribute("mode", "view");
|
||||
Elements.urlbarState.setAttribute("mode", "view");
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -196,21 +195,27 @@ var BrowserUI = {
|
|||
},
|
||||
|
||||
_editURI: function _editURI(aEdit) {
|
||||
var icons = document.getElementById("urlbar-icons");
|
||||
if (aEdit && icons.getAttribute("mode") != "edit") {
|
||||
icons.setAttribute("mode", "edit");
|
||||
this._edit.defaultValue = this._edit.value;
|
||||
if (aEdit) {
|
||||
let isOpened = this._edit.hasAttribute("open");
|
||||
if (!isOpened) {
|
||||
Elements.urlbarState.setAttribute("mode", "edit");
|
||||
this._edit.defaultValue = this._edit.value;
|
||||
}
|
||||
|
||||
// Replace the web page title by the url of the page
|
||||
let urlString = this.getDisplayURI(Browser.selectedBrowser);
|
||||
if (Util.isURLEmpty(urlString))
|
||||
urlString = "";
|
||||
this._edit.value = urlString;
|
||||
|
||||
// This is a workaround for bug 488420, needed to cycle focus for the
|
||||
// IME state to be set properly. Testing shows we only really need to
|
||||
// do this the first time.
|
||||
this._edit.blur();
|
||||
gFocusManager.setFocus(this._edit, Ci.nsIFocusManager.FLAG_NOSCROLL);
|
||||
if (!this._edit.readOnly) {
|
||||
// This is a workaround needed to cycle focus for the IME state
|
||||
// to be set properly (bug 488420)
|
||||
this._edit.blur();
|
||||
gFocusManager.setFocus(this._edit, Ci.nsIFocusManager.FLAG_NOSCROLL);
|
||||
}
|
||||
|
||||
this._edit.readOnly = !isOpened;
|
||||
}
|
||||
else if (!aEdit) {
|
||||
this._updateToolbar();
|
||||
|
|
@ -378,6 +383,10 @@ var BrowserUI = {
|
|||
this._edit.addEventListener("click", this, false);
|
||||
this._edit.addEventListener("mousedown", this, false);
|
||||
|
||||
let awesomePopup = document.getElementById("popup_autocomplete");
|
||||
awesomePopup.addEventListener("popupshown", this, false);
|
||||
awesomePopup.addEventListener("popuphidden", this, false);
|
||||
|
||||
document.getElementById("toolbar-main").ignoreDrag = true;
|
||||
|
||||
let tabs = document.getElementById("tabs");
|
||||
|
|
@ -442,12 +451,11 @@ var BrowserUI = {
|
|||
},
|
||||
|
||||
update: function(aState) {
|
||||
let icons = document.getElementById("urlbar-icons");
|
||||
let browser = Browser.selectedBrowser;
|
||||
|
||||
switch (aState) {
|
||||
case TOOLBARSTATE_LOADED:
|
||||
if (icons.getAttribute("mode") != "edit")
|
||||
if (Elements.urlbarState.getAttribute("mode") != "edit")
|
||||
this._updateToolbar();
|
||||
|
||||
this._updateIcon(browser.mIconURL);
|
||||
|
|
@ -455,7 +463,7 @@ var BrowserUI = {
|
|||
break;
|
||||
|
||||
case TOOLBARSTATE_LOADING:
|
||||
if (icons.getAttribute("mode") != "edit")
|
||||
if (Elements.urlbarState.getAttribute("mode") != "edit")
|
||||
this._updateToolbar();
|
||||
|
||||
browser.mIconURL = "";
|
||||
|
|
@ -774,6 +782,14 @@ var BrowserUI = {
|
|||
case "error":
|
||||
this._favicon.src = "";
|
||||
break;
|
||||
// Awesome popup event
|
||||
case "popupshown":
|
||||
this._edit.setAttribute("open", "true");
|
||||
break;
|
||||
case "popuphidden":
|
||||
this._edit.removeAttribute("open");
|
||||
this._edit.readOnly = true;
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@
|
|||
|
||||
<broadcasterset id="broadcasterset">
|
||||
<broadcaster id="bcast_contentShowing"/>
|
||||
<broadcaster id="bcast_urlbarState" mode="view"/>
|
||||
</broadcasterset>
|
||||
|
||||
<observerset id="observerset">
|
||||
|
|
@ -251,8 +252,9 @@
|
|||
emptytext="&urlbar.emptytext;"
|
||||
flex="1"
|
||||
ontextentered="BrowserUI.goToURI();"
|
||||
readonly="true"
|
||||
clickSelectsAll="true"/>
|
||||
<hbox id="urlbar-icons" mode="view">
|
||||
<hbox id="urlbar-icons" observes="bcast_urlbarState">
|
||||
<toolbarbutton id="tool-reload" class="urlbar-cap-button"
|
||||
oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
|
||||
<toolbarbutton id="tool-stop" class="urlbar-cap-button" command="cmd_stop"/>
|
||||
|
|
|
|||
|
|
@ -249,6 +249,10 @@ toolbarbutton.urlbar-cap-button {
|
|||
-moz-border-radius: 0;
|
||||
}
|
||||
|
||||
#urlbar-edit:not([open]):hover:active {
|
||||
background-color: #8db8d8;
|
||||
}
|
||||
|
||||
#urlbar-edit > hbox > .textbox-input-box {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
@ -258,10 +262,6 @@ toolbarbutton.urlbar-cap-button {
|
|||
text-indent: 3px;
|
||||
}
|
||||
|
||||
#urlbar-edit:not([open]):hover:active {
|
||||
background-color: #8db8d8;
|
||||
}
|
||||
|
||||
/* make sure this endcap matches the other endcap */
|
||||
#urlbar-icons {
|
||||
min-height: 64px;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче