diff --git a/mozilla/extensions/inspector/jar.mn b/mozilla/extensions/inspector/jar.mn
index f322b49b1fa..70d2950e233 100644
--- a/mozilla/extensions/inspector/jar.mn
+++ b/mozilla/extensions/inspector/jar.mn
@@ -76,6 +76,8 @@ inspector.jar:
content/inspector/viewers/accessibleRelations/accessibleRelations.xul (resources/content/viewers/accessibleRelations/accessibleRelations.xul)
content/inspector/viewers/accessibleTree/accessibleTree.js (resources/content/viewers/accessibleTree/accessibleTree.js)
content/inspector/viewers/accessibleTree/accessibleTree.xul (resources/content/viewers/accessibleTree/accessibleTree.xul)
+ content/inspector/viewers/accessibleTree/evalJSDialog.js (resources/content/viewers/accessibleTree/evalJSDialog.js)
+ content/inspector/viewers/accessibleTree/evalJSDialog.xul (resources/content/viewers/accessibleTree/evalJSDialog.xul)
content/inspector/viewers/computedStyle/computedStyle.js (resources/content/viewers/computedStyle/computedStyle.js)
content/inspector/viewers/computedStyle/computedStyle.xul (resources/content/viewers/computedStyle/computedStyle.xul)
content/inspector/viewers/dom/FindDialog.js (resources/content/viewers/dom/FindDialog.js)
diff --git a/mozilla/extensions/inspector/resources/Makefile.in b/mozilla/extensions/inspector/resources/Makefile.in
index 78b0200e4c6..24d68e8cf7f 100644
--- a/mozilla/extensions/inspector/resources/Makefile.in
+++ b/mozilla/extensions/inspector/resources/Makefile.in
@@ -45,14 +45,7 @@ VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
ALL_LOCALES = \
- cs \
- de \
en-US \
- fr \
- pl \
- ru \
- sk \
- sv-SE \
$(NULL)
include $(topsrcdir)/config/config.mk
diff --git a/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.js b/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.js
index 931e3e99a63..60093ba1b5a 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.js
+++ b/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.js
@@ -136,6 +136,23 @@ AccessibleTreeViewer.prototype =
this.mObsMan.removeObserver(aEvent, aObserver);
},
+ // UI commands
+ cmdEvalJS: function cmdEvalJS()
+ {
+ var sel = this.getSelectedAccessible();
+ if (sel) {
+ var win = openDialog("chrome://inspector/content/viewers/accessibleTree/evalJSDialog.xul",
+ "_blank", "chrome,resizable=yes", sel);
+ }
+ },
+
+ cmdInspectInNewView: function cmdInspectInNewView()
+ {
+ var sel = this.getSelectedAccessible();
+ if (sel)
+ inspectObject(sel);
+ },
+
// stuff
onItemSelected: function onItemSelected()
@@ -144,7 +161,13 @@ AccessibleTreeViewer.prototype =
this.mSelection = this.mView.getDOMNode(idx);
this.mObsMan.dispatchEvent("selectionChange",
{ selection: this.mSelection } );
- }
+ },
+
+ getSelectedAccessible: function getSelectedAccessible()
+ {
+ var idx = this.mTree.currentIndex;
+ return this.mView.getAccessible(idx);
+}
};
///////////////////////////////////////////////////////////////////////////////
@@ -410,6 +433,23 @@ function getDOMNode(aRow)
return this.getDOMNodeFor(node.accessible);
}
+/**
+ * Return accessible of the tree node pointed by the given
+ * row index.
+ *
+ * @param aRow The row index to get the accessible from.
+ * @returns The accessible for the given index.
+ */
+inAccTreeView.prototype.getAccessible =
+function getAccessible(aRow)
+{
+ var node = this.mNodes[aRow];
+ if (!node)
+ return null;
+
+ return node.accessible;
+}
+
///////////////////////////////////////////////////////////////////////////////
//// inAccTreeViewNode
diff --git a/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.xul b/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.xul
index ebcb2367b3b..39666ba455a 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/accessibleTree.xul
@@ -57,8 +57,21 @@
+
+
+
+
+
+
+
+ onselect="viewer.onItemSelected()"
+ context="popupContext">
(original author)
+ *
+ * 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 ***** */
+
+var gAcc = window.arguments[0];
+
+var gInputArea = null;
+var gOutputArea = null;
+
+function load()
+{
+ gInputArea = document.getElementById("JSInputArea");
+ gOutputArea = document.getElementById("JSOutputArea");
+}
+
+function execute()
+{
+ if (!gAcc)
+ return;
+
+ gOutputArea.value = "";
+
+ var expr = gInputArea.value;
+ try {
+ var f = Function("accessible", expr);
+ var result = f(gAcc);
+ } catch (ex) {
+ output(ex);
+ }
+}
+
+function output(aValue)
+{
+ gOutputArea.value += aValue;
+}
diff --git a/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/evalJSDialog.xul b/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/evalJSDialog.xul
new file mode 100644
index 00000000000..99332e40864
--- /dev/null
+++ b/mozilla/extensions/inspector/resources/content/viewers/accessibleTree/evalJSDialog.xul
@@ -0,0 +1,75 @@
+
+
+
+
+ %dtd1;
+]>
+
+
+
+
diff --git a/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTree.dtd b/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTree.dtd
index 10d820f4527..9071804c18a 100644
--- a/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTree.dtd
+++ b/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTree.dtd
@@ -41,3 +41,5 @@
+
+
diff --git a/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTreeEvalJSDialog.dtd b/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTreeEvalJSDialog.dtd
new file mode 100644
index 00000000000..aaac8eaf64b
--- /dev/null
+++ b/mozilla/extensions/inspector/resources/locale/en-US/viewers/accessibleTreeEvalJSDialog.dtd
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mozilla/extensions/inspector/resources/locale/jar.mn b/mozilla/extensions/inspector/resources/locale/jar.mn
index d6322191407..8ec7b93ef65 100644
--- a/mozilla/extensions/inspector/resources/locale/jar.mn
+++ b/mozilla/extensions/inspector/resources/locale/jar.mn
@@ -2,22 +2,23 @@
inspector.jar:
% locale inspector @AB_CD@ %locale/@AB_CD@/inspector/
-* locale/@AB_CD@/inspector/contents.rdf (contents.rdf)
- locale/@AB_CD@/inspector/inspector.dtd (@AB_CD@/inspector.dtd)
- locale/@AB_CD@/inspector/prefs.dtd (@AB_CD@/prefs.dtd)
- locale/@AB_CD@/inspector/editing.dtd (@AB_CD@/editing.dtd)
- locale/@AB_CD@/inspector/tasksOverlay.dtd (@AB_CD@/tasksOverlay.dtd)
-* locale/@AB_CD@/inspector/viewers/accessibleEvent.dtd (@AB_CD@/viewers/accessibleEvent.dtd)
-* locale/@AB_CD@/inspector/viewers/accessibleEvents.dtd (@AB_CD@/viewers/accessibleEvents.dtd)
-* locale/@AB_CD@/inspector/viewers/accessibleProps.dtd (@AB_CD@/viewers/accessibleProps.dtd)
-* locale/@AB_CD@/inspector/viewers/accessibleRelations.dtd (@AB_CD@/viewers/accessibleRelations.dtd)
-* locale/@AB_CD@/inspector/viewers/accessibleTree.dtd (@AB_CD@/viewers/accessibleTree.dtd)
-* locale/@AB_CD@/inspector/viewers/dom.dtd (@AB_CD@/viewers/dom.dtd)
-* locale/@AB_CD@/inspector/viewers/domNode.dtd (@AB_CD@/viewers/domNode.dtd)
-* locale/@AB_CD@/inspector/viewers/styleRules.dtd (@AB_CD@/viewers/styleRules.dtd)
-* locale/@AB_CD@/inspector/viewers/stylesheets.dtd (@AB_CD@/viewers/stylesheets.dtd)
-* locale/@AB_CD@/inspector/viewers/xblBindings.dtd (@AB_CD@/viewers/xblBindings.dtd)
-* locale/@AB_CD@/inspector/viewers/boxModel.dtd (@AB_CD@/viewers/boxModel.dtd)
-* locale/@AB_CD@/inspector/viewers/computedStyle.dtd (@AB_CD@/viewers/computedStyle.dtd)
-* locale/@AB_CD@/inspector/viewers/jsObject.dtd (@AB_CD@/viewers/jsObject.dtd)
-* locale/@AB_CD@/inspector/inspector.properties (@AB_CD@/inspector.properties)
+* locale/@AB_CD@/inspector/contents.rdf (contents.rdf)
+ locale/@AB_CD@/inspector/inspector.dtd (@AB_CD@/inspector.dtd)
+ locale/@AB_CD@/inspector/prefs.dtd (@AB_CD@/prefs.dtd)
+ locale/@AB_CD@/inspector/editing.dtd (@AB_CD@/editing.dtd)
+ locale/@AB_CD@/inspector/tasksOverlay.dtd (@AB_CD@/tasksOverlay.dtd)
+* locale/@AB_CD@/inspector/viewers/accessibleEvent.dtd (@AB_CD@/viewers/accessibleEvent.dtd)
+* locale/@AB_CD@/inspector/viewers/accessibleEvents.dtd (@AB_CD@/viewers/accessibleEvents.dtd)
+* locale/@AB_CD@/inspector/viewers/accessibleProps.dtd (@AB_CD@/viewers/accessibleProps.dtd)
+* locale/@AB_CD@/inspector/viewers/accessibleRelations.dtd (@AB_CD@/viewers/accessibleRelations.dtd)
+* locale/@AB_CD@/inspector/viewers/accessibleTree.dtd (@AB_CD@/viewers/accessibleTree.dtd)
+* locale/@AB_CD@/inspector/viewers/accessibleTreeEvalJSDialog.dtd (@AB_CD@/viewers/accessibleTreeEvalJSDialog.dtd)
+* locale/@AB_CD@/inspector/viewers/dom.dtd (@AB_CD@/viewers/dom.dtd)
+* locale/@AB_CD@/inspector/viewers/domNode.dtd (@AB_CD@/viewers/domNode.dtd)
+* locale/@AB_CD@/inspector/viewers/styleRules.dtd (@AB_CD@/viewers/styleRules.dtd)
+* locale/@AB_CD@/inspector/viewers/stylesheets.dtd (@AB_CD@/viewers/stylesheets.dtd)
+* locale/@AB_CD@/inspector/viewers/xblBindings.dtd (@AB_CD@/viewers/xblBindings.dtd)
+* locale/@AB_CD@/inspector/viewers/boxModel.dtd (@AB_CD@/viewers/boxModel.dtd)
+* locale/@AB_CD@/inspector/viewers/computedStyle.dtd (@AB_CD@/viewers/computedStyle.dtd)
+* locale/@AB_CD@/inspector/viewers/jsObject.dtd (@AB_CD@/viewers/jsObject.dtd)
+* locale/@AB_CD@/inspector/inspector.properties (@AB_CD@/inspector.properties)