[Pkg-mozext-commits] [firexpath] 03/18: Changed the version in the install.rdf and change a few thing to make sure it is compatible with Firefox 3.6

Sat Mar 26 19:35:46 UTC 2016

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag FirePath-0.9.5
in repository firexpath.

commit 5a455d8b672acb0786ebfcb97c4c49d8e749afea
Author: pierre.tholence <pierre.tholence at dfa30af4-1965-11df-8728-136f2c2ca76e>
Date:   Sun Feb 14 15:42:42 2010 +0000

    Changed the version in the install.rdf and change a few thing to make sure it is compatible with Firefox 3.6
---
 content/XPathPanel.js | 15 ++++++++++++---
 content/bindings.xml  | 14 ++++++++++++--
 install.rdf           |  2 +-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/content/XPathPanel.js b/content/XPathPanel.js
index 7f094e3..6818ee9 100644
--- a/content/XPathPanel.js
+++ b/content/XPathPanel.js
@@ -123,6 +123,7 @@ Firebug.XPathPanel.prototype = extend(Firebug.Panel,
 		this.addStyleSheet(this.document);
 		this.location = this.getDefaultLocation(this.context);
 		this.xPathBar = (this.context.chrome?this.context.chrome.$("FireXPathBar"): $("FireXPathBar"));
+		this.xPathBar.initialize();
 		this.xPathStatusBar = (this.context.chrome?this.context.chrome.$("FireXPathStatusBar"): $("FireXPathStatusBar"));
 		
 		this.ioBoxContainer = this.document.createElement("div");
@@ -195,6 +196,7 @@ Firebug.XPathPanel.prototype = extend(Firebug.Panel,
 			this.xPathBar.persiste(this.context);
 		}
 		this.xPathBar = newChrome.$("FireXPathBar");
+		this.xPathBar.initialize();
 		this.xPathStatusBar = newChrome.$("FireXPathStatusBar");
 		if(this.context == FirebugContext) {
 			this.xPathBar.restore(this.context);
@@ -750,7 +752,7 @@ Firebug.XPathPanel.Element = domplate(FirebugReps.Element,
 			DIV({"class": "nodeCloseLabel"},
 				SPAN({"class": "nodeCloseLabelBox repTarget"},
 					"</",
-					SPAN({"class": "nodeTag"}, "$object.localName|toLowerCase"),
+					SPAN({"class": "nodeTag"}, "$object|getTagName"),
 					">"
 				)
 			 )
@@ -769,7 +771,7 @@ Firebug.XPathPanel.TextElement = domplate(FirebugReps.Element,
 					SPAN({"class": "nodeBracket insertBefore"}, ">"),
 					SPAN({"class": "nodeText", _repObject: "$object.firstChild"}, "$object.firstChild.nodeValue"),
 					"</",
-					SPAN({"class": "nodeTag"}, "$object.localName|toLowerCase"),
+					SPAN({"class": "nodeTag"}, "$object|getTagName"),
 					">"
 				)
 			)
@@ -961,7 +963,14 @@ FBL.getTagName = function(node) {
 		prefix = getPrefixFromNS(ns);
 	}
 	
-	return (prefix?prefix + ":":"") + node.localName.toLowerCase();	
+	var name = node.localName;
+	if (node.ownerDocument instanceof HTMLDocument) {
+		//lower case only for HTML document
+		name = name.toLowerCase();
+	}
+	
+	// In firefox 3.6 the ns for html and xhtml nodes is http://www.w3.org/1999/xhtml we don't need to add a prefix for them
+	return (prefix && prefix != 'xhtml'? prefix + ":":"") + name;	
 }
 
 FBL.getPrefixFromNS = function(ns) {
diff --git a/content/bindings.xml b/content/bindings.xml
index e8f0cca..d703a0f 100644
--- a/content/bindings.xml
+++ b/content/bindings.xml
@@ -190,13 +190,21 @@
 			-->
 			
 			<constructor><![CDATA[
-				this.xPathContextToolbar.collapsed = !Firebug.getPref(Firebug.prefDomain, "xpath.showXPathContext");
+				this.initialize()
 			]]></constructor>
 			
 			<!--******************************************************************************************************
 				State management method
 			-->
 			
+			<method name="initialize">
+				<body><![CDATA[
+					if(Firebug) {
+						this.xPathContextToolbar.collapsed = !Firebug.getPref(Firebug.prefDomain, "xpath.showXPathContext");
+					}
+				]]></body>
+			</method>
+			
 			<method name="init">
 				<parameter name="context"/>
 				<body><![CDATA[
@@ -244,7 +252,9 @@
 			<method name="restore">
 				<parameter name="state"/>
 				<body><![CDATA[
-					this.copyState(state.xPathBarState, this)
+					if(state.xPathBarState) {
+						this.copyState(state.xPathBarState, this)
+					}
 				]]></body>
 			</method>
 			
diff --git a/install.rdf b/install.rdf
index 42401fe..4dff1d7 100644
--- a/install.rdf
+++ b/install.rdf
@@ -3,7 +3,7 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>FireXPath at pierre.tholence.com</em:id>
-    <em:version>0.9.1</em:version>
+    <em:version>0.9.2</em:version>
     
     <!-- Firefox -->
     <em:targetApplication>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firexpath.git

