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

merge backout

Browse Source
This commit is contained in:
Dão Gottwald 2012-01-25 14:50:36 +01:00
commit e8d936c4c9
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/browser-appmenu.inc
View File

@ -176,8 +176,7 @@
<menuseparator class="appmenu-menuseparator"/> <menuseparator class="appmenu-menuseparator"/>
<menu id="appmenu_webDeveloper" <menu id="appmenu_webDeveloper"
label="&appMenuWebDeveloper.label;"> label="&appMenuWebDeveloper.label;">
<menupopup id="appmenu_webDeveloper_popup" <menupopup id="appmenu_webDeveloper_popup">
onpopupshowing="onWebDeveloperMenuShowing();">
<menuitem id="appmenu_webConsole" <menuitem id="appmenu_webConsole"
label="&webConsoleCmd.label;" label="&webConsoleCmd.label;"
type="checkbox" type="checkbox"

3
browser/base/content/browser-menubar.inc
View File

@ -531,8 +531,7 @@
<menu id="webDeveloperMenu" <menu id="webDeveloperMenu"
label="&webDeveloperMenu.label;" label="&webDeveloperMenu.label;"
accesskey="&webDeveloperMenu.accesskey;"> accesskey="&webDeveloperMenu.accesskey;">
<menupopup id="menuWebDeveloperPopup" <menupopup id="menuWebDeveloperPopup">
onpopupshowing="onWebDeveloperMenuShowing();">
<menuitem id="webConsole" <menuitem id="webConsole"
type="checkbox" type="checkbox"
label="&webConsoleCmd.label;" label="&webConsoleCmd.label;"

6
browser/base/content/browser.js
View File

@ -9060,11 +9060,6 @@ var StyleEditor = {
} }
}; };
function onWebDeveloperMenuShowing() {
document.getElementById("Tools:WebConsole").setAttribute("checked", HUDConsoleUI.getOpenHUD() != null);
}
XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () { XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
#ifdef XP_WIN #ifdef XP_WIN
// Only show resizers on Windows 2000 and XP // Only show resizers on Windows 2000 and XP
@ -9139,7 +9134,6 @@ var MousePosTracker = {
} }
} }
}; };
function focusNextFrame(event) { function focusNextFrame(event) {
let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager); let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
let dir = event.shiftKey ? fm.MOVEFOCUS_BACKWARDDOC : fm.MOVEFOCUS_FORWARDDOC; let dir = event.shiftKey ? fm.MOVEFOCUS_BACKWARDDOC : fm.MOVEFOCUS_FORWARDDOC;

4
browser/devtools/webconsole/HUDService.jsm
View File

@ -1552,6 +1552,8 @@ HUD_SERVICE.prototype =
this.disableAnimation(hudId); this.disableAnimation(hudId);
} }
chromeDocument.getElementById("Tools:WebConsole").setAttribute("checked", "true");
// Create a processing instruction for GCLIs CSS stylesheet, but only if // Create a processing instruction for GCLIs CSS stylesheet, but only if
// we don't have one for this document. Also record the context we're // we don't have one for this document. Also record the context we're
// adding this for so we know when to remove it. // adding this for so we know when to remove it.
@ -1601,6 +1603,8 @@ HUD_SERVICE.prototype =
window.focus(); window.focus();
} }
chromeDocument.getElementById("Tools:WebConsole").setAttribute("checked", "false");
// Remove this context from the list of contexts that need the GCLI CSS // Remove this context from the list of contexts that need the GCLI CSS
// processing instruction and then remove the processing instruction if it // processing instruction and then remove the processing instruction if it
// isn't needed any more. // isn't needed any more.