wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 902924 - Remove the dependency on FullZoom_onLocationChange from the zoom controls. r=mikedeboer

Browse Source
This commit is contained in:
Jared Wein 2013-08-08 14:10:36 -04:00
parent 06a0d9465d
commit 943694fdff
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
browser/components/customizableui/src/CustomizableWidgets.jsm
View File

@ -276,6 +276,7 @@ const CustomizableWidgets = [{
defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
onBuild: function(aDocument) {
const kPanelId = "PanelUI-popup";
let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
let noautoclose = inPanel ? "true" : null;
let flex = inPanel ? "1" : null;
@ -341,11 +342,13 @@ const CustomizableWidgets = [{
// Register ourselves with the service so we know when the zoom prefs change.
Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomChange", false);
Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomReset", false);
Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:locationChange", false);
updateZoomResetButton();
if (!inPanel)
if (inPanel) {
let panel = aDocument.getElementById(kPanelId);
panel.addEventListener("popupshowing", updateZoomResetButton);
} else {
zoomResetButton.setAttribute("hidden", "true");
}
function updateWidgetStyle(aInPanel) {
let attrs = {
@ -373,6 +376,11 @@ const CustomizableWidgets = [{
return;
updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
if (aArea == CustomizableUI.AREA_PANEL) {
zoomResetButton.removeAttribute("hidden");
let panel = aDocument.getElementById(kPanelId);
panel.addEventListener("popupshowing", updateZoomResetButton);
}
}.bind(this),
onWidgetRemoved: function(aWidgetId, aPrevArea) {
@ -383,6 +391,11 @@ const CustomizableWidgets = [{
if (aWidgetId != this.id)
return;
if (aPrevArea == CustomizableUI.AREA_PANEL) {
let panel = aDocument.getElementById(kPanelId);
panel.removeEventListener("popupshowing", updateZoomResetButton);
}
// When a widget is demoted to the palette ('removed'), it's visual
// style should change.
updateWidgetStyle(false);
@ -412,7 +425,8 @@ const CustomizableWidgets = [{
CustomizableUI.removeListener(listener);
Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomChange");
Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomReset");
Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:locationChange");
let panel = aDoc.getElementById(kPanelId);
panel.removeEventListener("popupshowing", updateZoomResetButton);
}.bind(this)
};
CustomizableUI.addListener(listener);