Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 22:05:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 05d3282d1e7a due to orange. a=bustage

Browse Source
This commit is contained in:
Drew Willcoxon 2010-09-16 15:04:00 -07:00
parent 5e344c17ad
commit 665c6cb918
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser/base/content/browser.css
View File

@ -156,19 +156,11 @@ html|*.urlbar-input {
/* over-link in location bar */
/* Delay transitions on mouseout. (Mouseover transitions are delayed by a
timeout in urlbarBindings.xml.) */
.urlbar-textbox-container:not([overlinkstate]),
.urlbar-over-link-layer:not([overlinkstate]),
.urlbar-textbox-container-children:not([overlinkstate]),
.urlbar-over-link-box:not([overlinkstate]) {
-moz-transition-delay: 100ms;
}
.urlbar-over-link-layer[overlinkstate="fade-in"],
.urlbar-textbox-container:not([overlinkstate]) {
-moz-transition-property: color;
-moz-transition-duration: 150ms;
-moz-transition-delay: 50ms;
-moz-transition-timing-function: cubic-bezier(0.0, 0.6, 1.0, 1.0);
}
@ -176,6 +168,7 @@ html|*.urlbar-input {
.urlbar-over-link-layer:not([overlinkstate]) {
-moz-transition-property: color;
-moz-transition-duration: 150ms;
-moz-transition-delay: 50ms;
-moz-transition-timing-function: linear;
color: transparent;
}
@ -184,6 +177,8 @@ html|*.urlbar-input {
.urlbar-textbox-container-children:not([overlinkstate]) {
-moz-transition-property: opacity;
-moz-transition-duration: 150ms;
-moz-transition-delay: 50ms;
-moz-transition-timing-function: cubic-bezier(0.0, 0.6, 1.0, 1.0);
opacity: 1;
}
@ -191,6 +186,8 @@ html|*.urlbar-input {
.urlbar-over-link-box:not([overlinkstate]) {
-moz-transition-property: opacity;
-moz-transition-duration: 150ms;
-moz-transition-delay: 50ms;
-moz-transition-timing-function: linear;
opacity: 0;
}

24
browser/base/content/urlbarBindings.xml
View File

@ -596,26 +596,12 @@
"textbox-container");
]]></field>
<field name="_overLinkDelay" readonly="true"><![CDATA[
100
]]></field>
<field name="_overLinkDelayTimer"><![CDATA[
undefined
]]></field>
<method name="setOverLink">
<parameter name="aURL"/>
<body><![CDATA[
// Hide the over-link if aURL is falsey or if the URL bar is focused.
if (!aURL || this.focused) {
if (this._overLinkDelayTimer) {
// Over-link is scheduled to appear. Cancel the timer.
clearTimeout(this._overLinkDelayTimer);
delete this._overLinkDelayTimer;
}
else if (this.hasAttribute("overlinkstate")) {
// Over-link is fading in or showing. Fade out.
if (this.hasAttribute("overlinkstate")) {
this.removeAttribute("overlinkstate");
this._overLinkTransitioning = true;
}
@ -670,12 +656,8 @@
if (this._overLinkTransitioning)
this.setAttribute("overlinkstate", "showing");
else {
this._overLinkDelayTimer =
setTimeout(function overLinkDelayTimer(self) {
delete self._overLinkDelayTimer;
self.setAttribute("overlinkstate", "fade-in");
self._overLinkTransitioning = true;
}, this._overLinkDelay, this);
this.setAttribute("overlinkstate", "fade-in");
this._overLinkTransitioning = true;
}
]]></body>
</method>