Bug 295711 part 3 - Package inspector as a real extension (in <appdir>/extensions/inspector@mozilla.org/...) and consolidate all the silly app-specific forking/overriding done in browser/extensions/inspector and mail/extensions/inspector r=mconnor sr+a=shaver

This commit is contained in:
bsmedberg%covad.net 2005-06-03 18:05:06 +00:00
parent 18d772a9ec
commit 1269c28f94
32 changed files with 116 additions and 677 deletions

View File

@ -42,10 +42,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifneq (,$(findstring inspector,$(MOZ_EXTENSIONS)))
DIRS += inspector
endif
ifneq (,$(findstring layout-debug,$(MOZ_EXTENSIONS)))
DIRS += layout-debug
endif

View File

@ -1,46 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

View File

@ -1,53 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:inspector"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:inspector"
chrome:displayName="Document Inspector"
chrome:author="Joe Hewitt"
chrome:name="inspector"
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
chrome:skinVersion="1.5">
</RDF:Description>
<!-- overlay information -->
<RDF:Seq about="urn:mozilla:overlays">
<RDF:li resource="chrome://browser/content/browser.xul"/>
<RDF:li resource="chrome://browser/content/macBrowserOverlay.xul"/>
<RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
<RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
<RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
</RDF:Seq>
<!-- mozilla/browser Overlays -->
<RDF:Seq about="chrome://browser/content/browser.xul">
<RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
</RDF:Seq>
<RDF:Seq about="chrome://browser/content/macBrowserOverlay.xul">
<RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
</RDF:Seq>
<!-- Inspector Overlays -->
<RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
<RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
</RDF:Seq>
<RDF:Seq about="chrome://inspector/content/keysetOverlay.xul">
<RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
</RDF:Seq>
<RDF:Seq about="chrome://inspector/content/popupOverlay.xul">
<RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
</RDF:Seq>
</RDF:RDF>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

View File

@ -1,93 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is DOM Inspector.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 2003
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!DOCTYPE window [
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> %browserDTD;
]>
<?xul-overlay href="chrome://inspector/content/inspectorOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/toolboxOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/popupOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/commandOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/keysetOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/statusbarOverlay.xul"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
<?xml-stylesheet href="chrome://inspector/skin/inspectorWindow.css"?>
<window id="winInspectorMain" title="&Inspector.title;"
width="640" height="480"
persist="screenX screenY width height maximized"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<stringbundleset id="stringbundleset"/>
<popupset id="aTooltipSet"/>
<popupset id="ppsGlobalPopupset"/>
<popupset id="ppsViewerPopupset"/>
<keyset id="ksGlobalKeyset"/>
<commandset id="cmdsGlobalCommands"/>
<commandset id="tasksCommands">
<command id="cmd_quit"/>
</commandset>
<commandset id="baseMenuCommandSet"/>
<keyset id="tasksKeys">
<key id="key_closeInspector" key="&closeCmd.key;" command="cmdClose"
modifiers="accel"/>
</keyset>
<keyset id="baseMenuKeyset"/>
<toolbox id="tbxInsToolbox">
<menubar id="mbrInspectorMain"/>
<toolbar id="tbInspectorPrimary"/>
</toolbox>
<vbox id="bxInspectorMain" flex="1"/>
<!--
<statusbar id="status-bar"/>
-->
</window>

View File

@ -1,81 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
]>
<?xul-overlay href="chrome://inspector/content/editingOverlay.xul"?>
<overlay id="ovPopupsMain"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<popupset id="ppsGlobalPopupset">
<popup id="ppSearchResults">
<!--
<menuitem id="ppSearchResults-view" label="&cmdViewSearchItem.label;" observes="cmdViewSearchItem"/>
<menuitem id="ppSearchResults-edit" label="&cmdEditSearchItem.label;" observes="cmdEditSearchItem"/>
-->
<menuseparator id="ppSearchResults-insertion"/>
<menuitem id="ppSearchResults-copyLine" label="&cmdCopySearchItemLine.label;" observes="cmdCopySearchItemLine"/>
<menuitem id="ppSearchResults-copyAll" label="&cmdCopySearchItemAll.label;" observes="cmdCopySearchItemAll"/>
<menuitem id="ppSearchResults-save" label="&cmdSaveSearchItemText.label;" observes="cmdSaveSearchItemText"/>
<menuseparator/>
<menuitem id="ppSearchResults-clear" label="&cmdClearSearch.label;" observes="cmdClearSearch"/>
<menuitem id="ppSearchResults-hide" label="&cmdHideSearchItems.label;" observes="cmdToggleSearch"/>
</popup>
</popupset>
<menupopup id="menu_FilePopup">
<menu oncommand="inspector.goToWindow(event.target);"
id="mnWindowsFile" label="&mnWindows.label;" accesskey="&mnWindows.accesskey;"
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot">
<template>
<rule>
<menupopup>
<menuitem uri="rdf:*" label="&NC-rdf;KeyIndex &NC-rdf;Name" accesskey="&NC-rdf;KeyIndex"/>
</menupopup>
</rule>
</template>
</menu>
<menuitem label="&cmdShowOpenURLDialog.label;" accesskey="&cmdShowOpenURLDialog.accesskey;"
observes="cmdShowOpenURLDialog"/>
<menuseparator/>
<menuitem label="&cmdClose.label;" accesskey="&cmdClose.accesskey;"
observes="cmdClose" key="key_closeInspector"/>
</menupopup>
<menupopup id="mppEdit">
<menuitem id="mnEditUndo"/>
<menuitem id="mnEditRedo"/>
<menuseparator/>
<menuitem id="mnEditCut"/>
<menuitem id="mnEditCopy"/>
<menuitem id="mnEditPaste"/>
<menuseparator/>
<menuitem id="mnEditInsert"/>
<menuitem id="mnEditDelete"/>
</menupopup>
<menupopup id="mppSearch">
<!--
<menuseparator/>
<menu label="&mnSearchPlugins.label;" accesskey="&mnSearchPlugins.accesskey;">
<menupopup id="mppSearchPlugins">
<menuitem label="&cmdRunSearch.label;" accesskey="&cmdRunSearch.accesskey;" observes="cmdRunSearch"/>
</menupopup>
</menu>
-->
</menupopup>
<menupopup id="mppView" >
<menuitem class="menuitem-iconic" type="checkbox" label="&cmdToggleBrowser.label;" observes="cmdToggleBrowser"/>
<!--
<menuitem class="menuitem-iconic" type="checkbox" label="&cmdToggleSearch.label;" observes="cmdToggleSearch"/>
-->
<menuseparator/>
</menupopup>
<popupset id="ppsViewerPopupset"/>
</overlay>

View File

@ -1,65 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
]>
<overlay id="ovToolbox"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<popupset id="ppsGlobalPopupset"/>
<menubar id="mbrInspectorMain">
<menu id="mnFile" label="&mnFile.label;" accesskey="&mnFile.accesskey;">
<menupopup id="menu_FilePopup"/>
</menu>
<menu id="mnEdit" label="&mnEdit.label;" accesskey="&mnEdit.accesskey;">
<menupopup id="mppEdit"/>
</menu>
<menu id="mnSearch" label="&mnSearch.label;" accesskey="&mnSearch.accesskey;">
<menupopup id="mppSearch"/>
</menu>
<menu id="mnView" label="&mnView.label;" accesskey="&mnView.accesskey;">
<menupopup id="mppView"/>
</menu>
#ifdef XP_MACOSX
<menupopup id="menu_ToolsPopup"/>
<menu id="windowMenu"/>
#endif
<menu id="helpMenu"/>
</menubar>
<toolbar id="tbInspectorPrimary" class="chromeclass-toolbar">
<hbox id="bxURLBar" flex="1">
<toolbarbutton id="btnSelecting" type="checkbox" observes="cmd:selectByClick"
tooltiptext="&btnSelecting.tooltip;"/>
<toolbarbutton id="btnFind" observes="cmd:find"
tooltiptext="&btnFind.tooltip;"/>
<hbox id="bxURLBarContainer" flex="1">
<hbox align="center" flex="1">
<textbox id="tfURLBar" type="autocomplete" flex="1"
searchSessions="history" timeout="50" maxrows="6"
observes="cmdGotoURL">
<image id="imgURLBarIcon"/>
</textbox>
</hbox>
</hbox>
<toolbarbutton label="&btnInspect.label;" observes="cmdGotoURL"/>
</hbox>
</toolbar>
</overlay>

View File

@ -1,9 +0,0 @@
inspector.jar:
*+ content/inspector/contents.rdf (content/contents.rdf)
+ content/inspector/inspector.xul (content/inspector.xul)
+ content/inspector/tasksOverlay.xul (content/tasksOverlay.xul)
*+ content/inspector/toolboxOverlay.xul (content/toolboxOverlay.xul)
+ content/inspector/popupOverlay.xul (content/popupOverlay.xul)
*+ locale/en-US/inspector/contents.rdf (locale/contents.rdf)
+ locale/en-US/inspector/tasksOverlay.dtd (locale/tasksOverlay.dtd)
+ icon.png (content/inspector.gif)

View File

@ -1,21 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the skins being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:en-US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:en-US">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:en-US:packages">
<RDF:li resource="urn:mozilla:locale:en-US:inspector"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
<RDF:Description about="urn:mozilla:locale:en-US:inspector"
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
</RDF:RDF>

View File

@ -1,3 +0,0 @@
<!ENTITY inspectorTaskCmd.label "DOM Inspector">
<!ENTITY inspectorTaskCmd.accesskey "n">
<!ENTITY inspectorTaskCmd.commandkey "i">

View File

@ -48,21 +48,31 @@ MODULE = inspector
DIRS=base build
ifdef MOZ_XUL_APP
XPI_NAME = inspector
USE_EXTENSION_MANIFEST = 1
NO_JAR_AUTO_REG = 1
INSTALL_EXTENSION_ID = inspector@mozilla.org
endif
PREF_JS_EXPORTS = $(srcdir)/resources/content/prefs/inspector.js
DIST_FILES = install.rdf
# We should really pull FIREFOX_VERSION and THUNDERBIRD_VERSION from
# browser/config/version.txt mail/config/version.txt but we can't be assured
# that we've even pulled those files. So we hardcode them.
XULAPP_DEFINES = \
-DFIREFOX_VERSION=1.0+ \
-DTHUNDERBIRD_VERSION=1.0+ \
-DMOZILLA_VERSION_U=$(MOZILLA_VERSION) \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs::
$(INSTALL) $(srcdir)/resources/content/res/viewer-registry.rdf $(DIST)/bin/res/inspector
$(INSTALL) $(srcdir)/resources/content/res/search-registry.rdf $(DIST)/bin/res/inspector
$(INSTALL) $(srcdir)/resources/content/prefs/inspector.js $(DIST)/bin/defaults/pref
export::
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) $(srcdir)/resources/content/res/winInspectorMain.ico $(DIST)/bin/chrome/icons/default
$(NSINSTALL) -D $(FINAL_TARGET)/chrome/icons/default
$(INSTALL) $(srcdir)/resources/content/res/winInspectorMain.ico $(FINAL_TARGET)/chrome/icons/default
endif
install::
$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/res/viewer-registry.rdf $(DESTDIR)$(mozappdir)/res/inspector
$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/res/search-registry.rdf $(DESTDIR)$(mozappdir)/res/inspector
$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/prefs/inspector.js $(DESTDIR)$(mozappdir)/defaults/pref
ifeq ($(OS_ARCH),WINNT)
$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/res/winInspectorMain.ico $(DESTDIR)$(mozappdir)/chrome/icons/default
endif

View File

@ -42,6 +42,10 @@ VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XUL_APP
XPI_NAME = inspector
endif
EXTRA_COMPONENTS=inspector-cmdline.js
include $(topsrcdir)/config/rules.mk

View File

@ -47,6 +47,10 @@ include $(DEPTH)/config/autoconf.mk
MODULE=inspector
XPIDL_MODULE=inspector
ifdef MOZ_XUL_APP
XPI_NAME = inspector
endif
XPIDLSRCS = inIDOMView.idl \
inIDeepTreeWalker.idl \
inIFlasher.idl \

View File

@ -46,6 +46,10 @@ MODULE=inspector
LIBRARY_NAME=inspector_s
MOZILLA_INTERNAL_API = 1
ifdef MOZ_XUL_APP
XPI_NAME = inspector
endif
REQUIRES = xpcom \
string \
dom \

View File

@ -45,14 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = inspector
LIBRARY_NAME = inspector
# Do not set EXPORT_LIBRARY as we do not want inspector in the static libs list
#EXPORT_LIBRARY = 1
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = inspectr
endif
MOZILLA_INTERNAL_API = 1
PACKAGE_FILE = inspector.pkg
ifdef MOZ_XUL_APP
XPI_NAME = inspector
endif
REQUIRES = xpcom \
string \
@ -64,8 +66,6 @@ REQUIRES = xpcom \
locale \
necko \
$(NULL)
IS_COMPONENT = 1
CPPSRCS = \
nsInspectorModule.cpp \
$(NULL)

View File

@ -0,0 +1,35 @@
<?xml version="1.0"?>
#filter substitution
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>inspector@mozilla.org</em:id>
<em:version>1.7+</em:version>
<em:targetApplication>
<!-- Firefox -->
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>@FIREFOX_VERSION@</em:minVersion>
<em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
</Description>
</em:targetApplication>
<em:targetApplication>
<!-- Thunderbird -->
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>@THUNDERBIRD_VERSION@</em:minVersion>
<em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
</Description>
</em:targetApplication>
<!-- front-end metadata -->
<em:name>DOM Inspector</em:name>
<em:description>Inspect the DOM of HTML, XUL, and XML pages, including the browser chrome.</em:description>
<em:creator>mozilla.org</em:creator>
<em:homepageURL>http://www.mozilla.org/projects/inspector/</em:homepageURL>
</Description>
</RDF>

View File

@ -1,4 +1,17 @@
inspector.jar:
% content inspector %content/inspector/
% overlay chrome://communicator/content/tasksOverlay.xul chrome://inspector/content/tasksOverlay.xul
% overlay chrome://communicator/content/pref/preftree.xul chrome://inspector/content/prefs/prefsOverlay.xul
% overlay chrome://browser/content/browser.xul chrome://inspector/content/tasksOverlay-ff.xul
% overlay chrome://browser/content/macBrowserOverlay.xul chrome://inspector/content/tasksOverlay-ff.xul
% overlay chrome://messenger/content/mailWindowOverlay.xul chrome://inspector/content/tasksOverlay-tb.xul
% overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/viewers/dom/commandOverlay.xul
% overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/viewers/styleRules/commandOverlay.xul
% overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/search/modules/commandOverlay.xul
% overlay chrome://inspector/content/keysetOverlay.xul chrome://inspector/content/viewers/dom/keysetOverlay.xul
% overlay chrome://inspector/content/popupOverlay.xul chrome://inspector/content/viewers/dom/popupOverlay.xul
% overlay chrome://inspector/content/popupOverlay.xul chrome://inspector/content/viewers/styleRules/popupOverlay.xul
% overlay chrome://inspector/content/popupOverlay.xul chrome://inspector/content/search/modules/popupOverlay.xul
* content/inspector/contents.rdf (resources/content/contents.rdf)
content/inspector/inspector.xul (resources/content/inspector.xul)
content/inspector/inspector.js (resources/content/inspector.js)
@ -15,6 +28,8 @@ inspector.jar:
content/inspector/popupOverlay.xul (resources/content/popupOverlay.xul)
content/inspector/statusbarOverlay.xul (resources/content/statusbarOverlay.xul)
content/inspector/tasksOverlay.xul (resources/content/tasksOverlay.xul)
content/inspector/tasksOverlay-ff.xul (resources/content/tasksOverlay-ff.xul)
content/inspector/tasksOverlay-tb.xul (resources/content/tasksOverlay-tb.xul)
content/inspector/editingOverlay.xul (resources/content/editingOverlay.xul)
content/inspector/utilWindow.xul (resources/content/utilWindow.xul)
content/inspector/Flasher.js (resources/content/Flasher.js)
@ -22,6 +37,7 @@ inspector.jar:
content/inspector/utils.js (resources/content/utils.js)
content/inspector/hooks.js (resources/content/hooks.js)
content/inspector/util.dtd (resources/content/util.dtd)
content/inspector/res/viewer-registry.rdf (resources/content/res/viewer-registry.rdf)
content/inspector/extensions/titledSplitter.css (resources/content/extensions/titledSplitter.css)
content/inspector/extensions/titledSplitter.xml (resources/content/extensions/titledSplitter.xml)
content/inspector/extensions/treeEditable.css (resources/content/extensions/treeEditable.css)
@ -88,6 +104,7 @@ inspector.jar:
content/inspector/viewers/stylesheets/stylesheets.xul (resources/content/viewers/stylesheets/stylesheets.xul)
content/inspector/viewers/xblBindings/xblBindings.js (resources/content/viewers/xblBindings/xblBindings.js)
content/inspector/viewers/xblBindings/xblBindings.xul (resources/content/viewers/xblBindings/xblBindings.xul)
% locale inspector en-US %locale/en-US/inspector/
* locale/en-US/inspector/contents.rdf (resources/locale/en-US/contents.rdf)
locale/en-US/inspector/inspector.dtd (resources/locale/en-US/inspector.dtd)
locale/en-US/inspector/prefs.dtd (resources/locale/en-US/prefs.dtd)
@ -104,6 +121,7 @@ inspector.jar:
locale/en-US/inspector/viewers/computedStyle.dtd (resources/locale/en-US/viewers/computedStyle.dtd)
locale/en-US/inspector/viewers/jsObject.dtd (resources/locale/en-US/viewers/jsObject.dtd)
locale/en-US/inspector/inspector.properties (resources/locale/en-US/inspector.properties)
% skin inspector classic/1.0 %skin/classic/inspector/
* skin/classic/inspector/contents.rdf (resources/skin/classic/contents.rdf)
skin/classic/inspector/btnFind.gif (resources/skin/classic/btnFind.gif)
skin/classic/inspector/btnFind-dis.gif (resources/skin/classic/btnFind-dis.gif)
@ -131,6 +149,7 @@ inspector.jar:
skin/classic/inspector/viewers/domNode/domNode.css (resources/skin/classic/viewers/domNode/domNode.css)
skin/classic/inspector/viewers/styleRules/styleRules.css (resources/skin/classic/viewers/styleRules/styleRules.css)
skin/classic/inspector/viewers/xblBindings/xblBindings.css (resources/skin/classic/viewers/xblBindings/xblBindings.css)
% skin inspector modern/1.0 %skin/modern/inspector/
* skin/modern/inspector/contents.rdf (resources/skin/modern/contents.rdf)
skin/modern/inspector/btnFind.gif (resources/skin/modern/btnFind.gif)
skin/modern/inspector/btnFind-dis.gif (resources/skin/modern/btnFind-dis.gif)

View File

@ -50,7 +50,7 @@
//////////// global constants ////////////////////
const kViewerURLPrefix = "chrome://inspector/content/viewers/";
const kViewerRegURL = "resource:///res/inspector/viewer-registry.rdf";
const kViewerRegURL = "chrome://inspector/content/res/viewer-registry.rdf";
////////////////////////////////////////////////////////////////////////////
//// class ViewerRegistry

View File

@ -66,7 +66,7 @@ function InspectorApp_initialize()
// If passed via a command line handler, it will be a uri string.
// If passed via navigator hooks, it will be a dom node to inspect.
var initNode, initURI;
if (window.arguments.length) {
if (window.arguments && window.arguments.length) {
if (typeof window.arguments[0] == "string") {
initURI = window.arguments[0];
}

View File

@ -38,9 +38,10 @@
<!DOCTYPE window [
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
<!ENTITY % dtd3 SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd"> %dtd3;
]>
<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/inspectorOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/toolboxOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/popupOverlay.xul"?>
@ -59,6 +60,7 @@
persist="screenX screenY width height maximized"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<stringbundleset id="stringbundleset"/>
<popupset id="aTooltipSet"/>
<popupset id="ppsGlobalPopupset"/>
@ -70,23 +72,21 @@
<commandset id="tasksCommands">
<command id="cmd_quit"/>
</commandset>
<commandset id="baseMenuCommandSet"/>
<keyset id="tasksKeys">
<key id="key_closeInspector" key="&closeCmd.key;" command="cmdClose"
modifiers="accel"/>
<key id="key_quit"/>
</keyset>
<keyset id="baseMenuKeyset"/>
<toolbox id="tbxInsToolbox">
<menubar id="mbrInspectorMain"/>
<toolbar id="tbInspectorPrimary"/>
</toolbox>
<vbox id="bxInspectorMain" flex="1"/>
<!--
<statusbar id="status-bar"/>
-->
</window>

View File

@ -55,8 +55,6 @@
<menuseparator/>
<menuitem id="mnEditInsert"/>
<menuitem id="mnEditDelete"/>
<menuseparator/>
<menuitem id="menu_preferences" observes="cmdShowPrefsDialog"/>
</menupopup>
<menupopup id="mppSearch">

View File

@ -6,14 +6,13 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://inspector/content/hooks.js"/>
<script type="application/x-javascript">
<![CDATA[
function inspectorWindowLoad()
{
setTimeout(initWindowMediator, 0);
}
function initWindowMediator()
{
// Load the Window DataSource so that browser windows opened subsequent to DOM
@ -21,9 +20,8 @@
var windowDS = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
.getService(Components.interfaces.nsIWindowDataSource);
}
window.addEventListener("load", inspectorWindowLoad, false);
]]>
</script>
@ -35,11 +33,11 @@
<keyset id="mainKeyset">
<key id="key_inspectPage" key="&inspectorTaskCmd.commandkey;" modifiers="accel,shift" command="Tasks:InspectPage"/>
</keyset>
<menupopup id="menu_ToolsPopup">
<menuitem id="menu_inspector" label="&inspectorTaskCmd.label;"
insertafter="javascriptConsole" key="key_inspectPage"
accesskey="&inspectorTaskCmd.accesskey;" command="Tasks:InspectPage"/>
accesskey="&inspectorTaskCmd.accesskey.ff;" command="Tasks:Inspector"/>
</menupopup>
</overlay>

View File

@ -33,7 +33,7 @@
</commandset>
<keyset id="tasksKeys">
<key id="key_inspectPage" key="i" modifiers="accel,shift" command="Tasks:InspectPage"/>
<key id="key_inspectPage" key="&inspectorTaskCmd.commandkey;" modifiers="accel,shift" command="Tasks:InspectPage"/>
</keyset>
<menupopup id="taskPopup">

View File

@ -28,9 +28,10 @@
<menupopup id="mppView"/>
</menu>
<menu id="tasksMenu"/>
<menu id="windowMenu"/>
<menu id="menu_Help"/>
<menu id="tasksMenu"/> <!-- Seamonkey -->
<menu id="windowMenu"/> <!-- Firefox-mac -->
<menu id="menu_Help"/> <!-- Seamonkey -->
<menu id="helpMenu"/> <!-- Firefox -->
</menubar>

View File

@ -59,3 +59,5 @@
<!ENTITY browserPanel.label "Browser">
<!ENTITY inspectNewWindow.label "Inspect in New Window">
<!ENTITY closeCmd.key "W">

View File

@ -1,8 +1,7 @@
<!ENTITY inspectorTaskCmd.label "DOM Inspector">
<!ENTITY inspectorTaskCmd.commandkey "i">
<!ENTITY inspectorTaskCmd.accesskey.ff "n">
<!ENTITY inspectorTaskCmd.accesskey "I">
<!ENTITY inspectPageTaskCmd.label "Inspect Page">
<!ENTITY inspectPageTaskCmd.accesskey "i">

View File

@ -52,10 +52,5 @@ ifdef BUILD_SMIME
DIRS += smime
endif
ifneq (,$(findstring inspector,$(MOZ_EXTENSIONS)))
DIRS += inspector
endif
include $(topsrcdir)/config/rules.mk

View File

@ -1,45 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

View File

@ -1,56 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:inspector"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:inspector"
chrome:displayName="Document Inspector"
chrome:author="Joe Hewitt"
chrome:name="inspector"
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
#expand chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
</RDF:Description>
<!-- overlay information -->
<RDF:Seq about="urn:mozilla:overlays">
<RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
<RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
<RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
<RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
<RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
</RDF:Seq>
<!-- mozilla/mail Overlays -->
<RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
<RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
</RDF:Seq>
<RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
<RDF:li>chrome://inspector/content/prefs/prefsOverlay.xul</RDF:li>
</RDF:Seq>
<!-- Inspector Overlays -->
<RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
<RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
</RDF:Seq>
<RDF:Seq about="chrome://inspector/content/keysetOverlay.xul">
<RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
</RDF:Seq>
<RDF:Seq about="chrome://inspector/content/popupOverlay.xul">
<RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
<RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
</RDF:Seq>
</RDF:RDF>

View File

@ -1,90 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is DOM Inspector.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 2003
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!DOCTYPE window [
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
<!ENTITY % dtd3 SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd"> %dtd3;
]>
<?xul-overlay href="chrome://inspector/content/inspectorOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/toolboxOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/popupOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/commandOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/keysetOverlay.xul"?>
<?xul-overlay href="chrome://inspector/content/statusbarOverlay.xul"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xml-stylesheet href="chrome://inspector/skin/inspectorWindow.css"?>
<window id="winInspectorMain" title="&Inspector.title;"
width="640" height="480"
persist="screenX screenY width height maximized"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<popupset id="aTooltipSet"/>
<popupset id="ppsGlobalPopupset"/>
<popupset id="ppsViewerPopupset"/>
<keyset id="ksGlobalKeyset"/>
<commandset id="cmdsGlobalCommands"/>
<commandset id="tasksCommands">
<command id="cmd_quit"/>
</commandset>
<keyset id="tasksKeys">
<key id="key_closeInspector" key="&closeCmd.key;" command="cmdClose"
modifiers="accel"/>
<key id="key_quit"/>
</keyset>
<toolbox id="tbxInsToolbox">
<menubar id="mbrInspectorMain"/>
<toolbar id="tbInspectorPrimary"/>
</toolbox>
<vbox id="bxInspectorMain" flex="1"/>
<!--
<statusbar id="status-bar"/>
-->
</window>

View File

@ -1,59 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
]>
<overlay id="ovToolbox"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<popupset id="ppsGlobalPopupset"/>
<menubar id="mbrInspectorMain">
<menu id="mnFile" label="&mnFile.label;" accesskey="&mnFile.accesskey;">
<menupopup id="menu_FilePopup"/>
</menu>
<menu id="mnEdit" label="&mnEdit.label;" accesskey="&mnEdit.accesskey;">
<menupopup id="mppEdit"/>
</menu>
<menu id="mnSearch" label="&mnSearch.label;" accesskey="&mnSearch.accesskey;">
<menupopup id="mppSearch"/>
</menu>
<menu id="mnView" label="&mnView.label;" accesskey="&mnView.accesskey;">
<menupopup id="mppView"/>
</menu>
</menubar>
<toolbar id="tbInspectorPrimary" class="chromeclass-toolbar">
<hbox id="bxURLBar" flex="1">
<toolbarbutton id="btnSelecting" type="checkbox" observes="cmd:selectByClick"
tooltiptext="&btnSelecting.tooltip;"/>
<toolbarbutton id="btnFind" observes="cmd:find"
tooltiptext="&btnFind.tooltip;"/>
<hbox id="bxURLBarContainer" flex="1">
<hbox align="center" flex="1">
<textbox id="tfURLBar" type="autocomplete" flex="1"
searchSessions="history" timeout="50" maxrows="6"
observes="cmdGotoURL">
<image id="imgURLBarIcon"/>
</textbox>
</hbox>
</hbox>
<toolbarbutton label="&btnInspect.label;" observes="cmdGotoURL"/>
</hbox>
</toolbar>
</overlay>

View File

@ -1,5 +0,0 @@
inspector.jar:
*+ content/inspector/contents.rdf (content/contents.rdf)
+ content/inspector/tasksOverlay.xul (content/tasksOverlay.xul)
+ content/inspector/toolboxOverlay.xul (content/toolboxOverlay.xul)
+ content/inspector/inspector.xul (content/inspector.xul)