[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 367/483: Topic 9236 - Another attempt to fix XBL breakage in composer window

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus-element-hiding-helper.

commit e8d700611f65ff196f2613677135c0e17127aca3
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Jan 6 12:36:24 2012 +0100

    Topic 9236 - Another attempt to fix XBL breakage in composer window
---
 chrome/content/composer.js | 8 ++++++++
 chrome/skin/composer.css   | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/chrome/content/composer.js b/chrome/content/composer.js
index 8b26243..530624e 100644
--- a/chrome/content/composer.js
+++ b/chrome/content/composer.js
@@ -477,12 +477,16 @@ function fillAttributes(nodeData) {
   while(list.firstChild)
     list.removeChild(list.firstChild);
 
+  let xblBasic = "url(chrome://elemhidehelper/content/attribute.xml#attributeBasic)";
+  let xblAdvanced = "url(chrome://elemhidehelper/content/attribute.xml#attributeAdvanced)";
+
   // Add tag name entry
   var node = document.createElement("attribute");
   node.attr = nodeData.tagName;
   node.setAttribute("notextbox", "true");
   node.setAttribute("checked", nodeData.tagName.checked);
   node.setAttribute("label", list.getAttribute("_labeltagname") + " " + nodeData.tagName.value);
+  node.style.MozBinding = xblBasic;
   list.appendChild(node);
 
   // Add first/last child entries
@@ -492,6 +496,7 @@ function fillAttributes(nodeData) {
     node.setAttribute("notextbox", "true");
     node.setAttribute("checked", nodeData.firstChild.checked);
     node.setAttribute("label", list.getAttribute("_labelfirstchild"));
+    node.style.MozBinding = xblBasic;
     list.appendChild(node);
   }
   if (advancedMode && "lastChild" in nodeData) {
@@ -500,6 +505,7 @@ function fillAttributes(nodeData) {
     node.setAttribute("notextbox", "true");
     node.setAttribute("checked", nodeData.lastChild.checked);
     node.setAttribute("label", list.getAttribute("_labellastchild"));
+    node.style.MozBinding = xblBasic;
     list.appendChild(node);
   }
 
@@ -512,6 +518,7 @@ function fillAttributes(nodeData) {
     node.setAttribute("checked", attr.checked);
     node.setAttribute("label", attr.name + ": " + attr.value);
     node.setAttribute("value", attr.selected);
+    node.style.MozBinding = advancedMode ? xblAdvanced : xblBasic;
     list.appendChild(node);
   }
 
@@ -522,6 +529,7 @@ function fillAttributes(nodeData) {
     node.setAttribute("checked", nodeData.customCSS.checked);
     node.setAttribute("label", list.getAttribute("_labelcustom"));
     node.setAttribute("value", nodeData.customCSS.selected);
+    node.style.MozBinding = xblAdvanced;
     list.appendChild(node);
   }
 }
diff --git a/chrome/skin/composer.css b/chrome/skin/composer.css
index 5159a1d..bdeab87 100644
--- a/chrome/skin/composer.css
+++ b/chrome/skin/composer.css
@@ -33,7 +33,6 @@ treechildren::-moz-tree-row(anchor, selected-false)
 
 attribute
 {
-  -moz-binding: url(chrome://elemhidehelper/content/attribute.xml#attributeBasic);
   padding: 5px;
 }
 attribute vbox
@@ -44,10 +43,6 @@ attribute[selected="true"] vbox
 {
   border: 1px dotted ThreeDDarkShadow;
 }
-dialog[advancedMode=true] attribute:not([notextbox])
-{
-  -moz-binding: url(chrome://elemhidehelper/content/attribute.xml#attributeAdvanced);
-}
 dialog[advancedMode=true] attribute:not([notextbox]) .checkbox-label-box
 {
   display: none;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus-element-hiding-helper.git