| author | Dão Gottwald <dao@mozilla.com> |
| Wed, 05 Sep 2012 17:43:19 +0200 | |
| changeset 104306 | 8225a33d71450deeeb129c198587757deb4910d9 |
| parent 104305 | 6dfafdd2f6316b2e5f1ca998a81afb7d3e29004a |
| child 104307 | 4d0c323f748fe8e1a7b3b53dc215e2650c1dad8d |
| push id | 23417 |
| push user | ryanvm@gmail.com |
| push date | Thu, 06 Sep 2012 02:27:31 +0000 |
| treeherder | mozilla-central@501f4e46a88c [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | Unfocused |
| bugs | 787275 |
| milestone | 18.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| browser/base/content/browser.xul | file | annotate | diff | comparison | revisions | |
| browser/base/content/urlbarBindings.xml | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -394,20 +394,16 @@ label="&identity.moreInfoLinkText;" onblur="gIdentityHandler.hideIdentityPopup();" oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> </hbox> </vbox> </hbox> </panel> - <tooltip id="urlTooltip"> - <label crop="center" flex="1" class="tooltip-label"/> - </tooltip> - <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> <hbox> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/>
--- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -53,18 +53,16 @@ this._prefs.addObserver("", this, false); this.clickSelectsAll = this._prefs.getBoolPref("clickSelectsAll"); this.doubleClickSelectsAll = this._prefs.getBoolPref("doubleClickSelectsAll"); this.completeDefaultIndex = this._prefs.getBoolPref("autoFill"); this.timeout = this._prefs.getIntPref("delay"); this._formattingEnabled = this._prefs.getBoolPref("formatting.enabled"); this._mayTrimURLs = this._prefs.getBoolPref("trimURLs"); - this._urlTooltip = document.getElementById("urlTooltip"); - this.inputField.controllers.insertControllerAt(0, this._copyCutController); this.inputField.addEventListener("mousedown", this, false); this.inputField.addEventListener("mousemove", this, false); this.inputField.addEventListener("mouseout", this, false); this.inputField.addEventListener("overflow", this, false); this.inputField.addEventListener("underflow", this, false); const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; @@ -405,36 +403,23 @@ </method> <field name="_contentIsCropped">false</field> <method name="_initURLTooltip"> <body><![CDATA[ if (this.focused || !this._contentIsCropped) return; - if (this._tooltipTimer) - clearTimeout(this._tooltipTimer); - this._tooltipTimer = setTimeout(function (self) { - self._tooltipTimer = 0; - var label = self._urlTooltip.firstChild; - label.value = self.value; - var bO = self.boxObject; - self._urlTooltip.maxWidth = bO.width; - self._urlTooltip.showPopup(self, bO.screenX, bO.screenY + bO.height, "tooltip"); - }, 700, this); + this.inputField.setAttribute("tooltiptext", this.value); ]]></body> </method> <method name="_hideURLTooltip"> <body><![CDATA[ - if (this._tooltipTimer) { - clearTimeout(this._tooltipTimer); - this._tooltipTimer = 0; - } - this._urlTooltip.hidePopup(); + this.inputField.removeAttribute("tooltiptext"); ]]></body> </method> <method name="onDragOver"> <parameter name="aEvent"/> <body> var types = aEvent.dataTransfer.types; if (types.contains("application/x-moz-file") ||