diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2018-04-08 19:49:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 19:49:12 -0400 |
| commit | 20f5317e2708c4f3c0ca568fcdf8ef57a3758dd5 (patch) | |
| tree | eb60acd41760c770b9e274da02f9f72316851b32 /browser/base | |
| parent | 7156604f1c5866a7f0929a9bd0b3f8f1fc9b5eb9 (diff) | |
| parent | 53808c657809049262b79a14d78e793e95076306 (diff) | |
| download | UXP-20f5317e2708c4f3c0ca568fcdf8ef57a3758dd5.tar UXP-20f5317e2708c4f3c0ca568fcdf8ef57a3758dd5.tar.gz UXP-20f5317e2708c4f3c0ca568fcdf8ef57a3758dd5.tar.lz UXP-20f5317e2708c4f3c0ca568fcdf8ef57a3758dd5.tar.xz UXP-20f5317e2708c4f3c0ca568fcdf8ef57a3758dd5.zip | |
Merge pull request #108 from janekptacijarabaci/devtools_browser_cleanUp_followUp_3
[DevTools] Use preprocessing for: a global variable "gDevTools" and the context menu - a function "Inspect Element"
Diffstat (limited to 'browser/base')
| -rw-r--r-- | browser/base/content/browser-context.inc | 2 | ||||
| -rwxr-xr-x | browser/base/content/browser.js | 2 | ||||
| -rw-r--r-- | browser/base/jar.mn | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc index 51b14d152..3061cccdd 100644 --- a/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc @@ -456,12 +456,14 @@ oncommand="gContextMenu.openPasswordManager();"/> </menupopup> </menu> +#ifdef MOZ_DEVTOOLS <menuseparator id="inspect-separator" hidden="true"/> <menuitem id="context-inspect" hidden="true" label="&inspectContextMenu.label;" accesskey="&inspectContextMenu.accesskey;" oncommand="gContextMenu.inspectNode();"/> +#endif <menuseparator id="context-media-eme-separator" hidden="true"/> <menuitem id="context-media-eme-learnmore" class="menuitem-iconic" diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index daa3ebfb6..9cc5c54ab 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -53,8 +53,10 @@ Cu.import("resource://gre/modules/NotificationDB.jsm"); ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"], ["Weave", "resource://services-sync/main.js"], ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"], +#ifdef MOZ_DEVTOOLS // Note: Do not delete! It is used for: base/content/nsContextMenu.js ["gDevTools", "resource://devtools/client/framework/gDevTools.jsm"], +#endif ["webrtcUI", "resource:///modules/webrtcUI.jsm", ] ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource)); diff --git a/browser/base/jar.mn b/browser/base/jar.mn index a65c77338..9cbfe7c15 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -67,7 +67,7 @@ browser.jar: content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) * content/browser/browser.css (content/browser.css) - content/browser/browser.js (content/browser.js) +* content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) content/browser/browser-addons.js (content/browser-addons.js) content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |