зеркало из https://github.com/mozilla/gecko-dev.git
Bug 596428 - Stop button shouldn't be ghosted, since this adds N ms to page load time r=dao a=blocking-betaN
This commit is contained in:
Родитель
94775bddec
Коммит
fedb7c506b
|
@ -4437,19 +4437,26 @@ var CombinedStopReload = {
|
|||
if (!this._initialized)
|
||||
return;
|
||||
|
||||
this.reload.removeAttribute("displaystop");
|
||||
|
||||
if (!aDelay || this._stopClicked) {
|
||||
this._stopClicked = false;
|
||||
this._cancelTransition();
|
||||
this.reload.removeAttribute("displaystop");
|
||||
this.reload.disabled = XULBrowserWindow.reloadCommand
|
||||
.getAttribute("disabled") == "true";
|
||||
return;
|
||||
}
|
||||
|
||||
if (this._timer)
|
||||
return;
|
||||
|
||||
// Temporarily disable the reload button to prevent the user from
|
||||
// accidentally reloading the page when intending to click the stop button
|
||||
this.reload.disabled = true;
|
||||
this._timer = setTimeout(function (self) {
|
||||
self._timer = 0;
|
||||
self.reload.removeAttribute("displaystop");
|
||||
self.reload.disabled = XULBrowserWindow.reloadCommand
|
||||
.getAttribute("disabled") == "true";
|
||||
}, 650, this);
|
||||
},
|
||||
|
||||
|
|
|
@ -1244,7 +1244,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
border-bottom-right-radius: 2px;
|
||||
}
|
||||
|
||||
#urlbar > toolbarbutton:active:hover {
|
||||
#urlbar > toolbarbutton:not([disabled]):active:hover {
|
||||
padding-left: 4px;
|
||||
border-left: none;
|
||||
box-shadow: 0 0 6.5px rgba(0,0,0,.4) inset,
|
||||
|
@ -1266,7 +1266,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
-moz-image-region: rect(0px, 14px, 14px, 0px);
|
||||
}
|
||||
|
||||
#urlbar-reload-button:hover {
|
||||
#urlbar-reload-button:not([disabled]):hover {
|
||||
-moz-image-region: rect(0px, 28px, 14px, 14px);
|
||||
background-image: -moz-linear-gradient(rgb(137,183,233), rgb(79,130,195));
|
||||
box-shadow: 0 1px 0 rgba(0,0,0,.1) inset,
|
||||
|
@ -1284,11 +1284,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
background-image: -moz-linear-gradient(rgb(237,120,120), rgb(216,92,92));
|
||||
}
|
||||
|
||||
|
||||
#urlbar-stop-button[disabled="true"] > .toolbarbutton-icon {
|
||||
opacity: .5;
|
||||
}
|
||||
|
||||
/* Star button */
|
||||
#star-button {
|
||||
padding: 1px;
|
||||
|
|
|
@ -1002,7 +1002,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
border-bottom-right-radius: 2px;
|
||||
}
|
||||
|
||||
#urlbar > toolbarbutton:active:hover {
|
||||
#urlbar > toolbarbutton:not([disabled]):active:hover {
|
||||
box-shadow: @toolbarbuttonPressedInnerShadow@;
|
||||
padding-left: 4px;
|
||||
border-left: none;
|
||||
|
@ -1019,7 +1019,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
-moz-image-region: rect(0px, 14px, 14px, 0px);
|
||||
}
|
||||
|
||||
#urlbar-reload-button:hover {
|
||||
#urlbar-reload-button:not([disabled]):hover {
|
||||
-moz-image-region: rect(0px, 28px, 14px, 14px);
|
||||
background-image: -moz-linear-gradient(rgb(162,207,241), rgb(111,178,225) 49%, rgb(91,159,217) 51%, rgb(62,138,200));
|
||||
box-shadow: 0 1px 0 rgba(0,0,0,.1) inset,
|
||||
|
@ -1033,10 +1033,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
-1px -1px 1px rgba(255,255,255,.15) inset;
|
||||
}
|
||||
|
||||
#urlbar-stop-button[disabled="true"] > .toolbarbutton-icon {
|
||||
opacity: .4;
|
||||
}
|
||||
|
||||
/* STAR BUTTON */
|
||||
#star-button {
|
||||
padding: 1px;
|
||||
|
|
|
@ -1290,7 +1290,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
border-bottom-right-radius: 2px;
|
||||
}
|
||||
|
||||
#urlbar > toolbarbutton:active:hover {
|
||||
#urlbar > toolbarbutton:not([disabled]):active:hover {
|
||||
padding-left: 4px;
|
||||
border-left: none;
|
||||
box-shadow: 0 0 6.5px rgba(0,0,0,.4) inset,
|
||||
|
@ -1312,7 +1312,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
-moz-image-region: rect(0px, 14px, 14px, 0px);
|
||||
}
|
||||
|
||||
#urlbar-reload-button:hover {
|
||||
#urlbar-reload-button:not([disabled]):hover {
|
||||
-moz-image-region: rect(0px, 28px, 14px, 14px);
|
||||
background-image: -moz-linear-gradient(rgb(162,207,241), rgb(111,178,225) 49%, rgb(91,159,217) 51%, rgb(62,138,200));
|
||||
box-shadow: 0 1px 0 rgba(0,0,0,.1) inset,
|
||||
|
@ -1330,10 +1330,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
|||
background-image: -moz-linear-gradient(rgb(244,156,128), rgb(215,101,77) 49%, rgb(194,66,48) 51%, rgb(170,41,23));
|
||||
}
|
||||
|
||||
#urlbar-stop-button[disabled="true"] > .toolbarbutton-icon {
|
||||
opacity: .5;
|
||||
}
|
||||
|
||||
/* star button */
|
||||
|
||||
#star-button {
|
||||
|
|
Загрузка…
Ссылка в новой задаче