[Pkg-mozext-commits] [firebug] 01/24: Issue 5859 (Delete "element.style" is broken) http://code.google.com/p/fbug/issues/detail?id=5859

[David Prévot]

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

taffit pushed a commit to tag firebug-1.10.4
in repository firebug.

commit 0e4b1351fb3668bcc442bd37c5981f6b439e28fd
Author: Sebastian Zartner <sebastianzartner at gmx.de>
Date:   Thu Aug 23 14:07:10 2012 +0200

    Issue 5859 (Delete "element.style" is broken)
    http://code.google.com/p/fbug/issues/detail?id=5859
---
 extension/content/firebug/css/cssModule.js  | 22 +++++++++++++++++-----
 extension/content/firebug/css/cssPanel.js   | 14 +++-----------
 extension/content/firebug/css/stylePanel.js | 17 +++++++++++++++++
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/extension/content/firebug/css/cssModule.js b/extension/content/firebug/css/cssModule.js
index ee157b5..047d2db 100644
--- a/extension/content/firebug/css/cssModule.js
+++ b/extension/content/firebug/css/cssModule.js
@@ -87,15 +87,27 @@ Firebug.CSSModule = Obj.extend(Obj.extend(Firebug.Module, Firebug.EditorSelector
         return insertIndex;
     },
 
-    deleteRule: function(styleSheet, ruleIndex)
+    deleteRule: function(src, ruleIndex)
     {
         if (FBTrace.DBG_CSS)
-            FBTrace.sysout("deleteRule: " + ruleIndex + " " + styleSheet.cssRules.length,
-                styleSheet.cssRules);
+        {
+            if (src instanceof window.Element)
+            {
+                FBTrace.sysout("deleteRule: " + ruleIndex + " " + src.cssRules.length,
+                    styleSheet.cssRules);
+            }
+            else
+            {
+                FBTrace.sysout("deleteRule: element.style", src);
+            }
+        }
 
-        Events.dispatch(this.fbListeners, "onCSSDeleteRule", [styleSheet, ruleIndex]);
+        Events.dispatch(this.fbListeners, "onCSSDeleteRule", [src, ruleIndex]);
 
-        styleSheet.deleteRule(ruleIndex);
+        if (src instanceof window.Element)
+            src.removeAttribute("style");
+        else
+            src.deleteRule(ruleIndex);
     },
 
     setProperty: function(rule, propName, propValue, propPriority)
diff --git a/extension/content/firebug/css/cssPanel.js b/extension/content/firebug/css/cssPanel.js
index 494a527..e1443e7 100644
--- a/extension/content/firebug/css/cssPanel.js
+++ b/extension/content/firebug/css/cssPanel.js
@@ -1578,17 +1578,9 @@ Firebug.CSSStyleSheetPanel.prototype = Obj.extend(Firebug.Panel,
 
         CSSModule.deleteRule(styleSheet, ruleIndex);
 
-        if (this.context.panelName == "stylesheet")
-        {
-            var rule = Dom.getAncestorByClass(cssSelector, "cssRule");
-            if (rule)
-                rule.parentNode.removeChild(rule);
-        }
-        else
-        {
-            var sidePanel = Firebug.chrome.getSelectedSidePanel();
-            sidePanel.refresh();
-        }
+        var rule = Dom.getAncestorByClass(cssSelector, "cssRule");
+        if (rule)
+            rule.parentNode.removeChild(rule);
     },
 
     copyStyleDeclaration: function(cssSelector)
diff --git a/extension/content/firebug/css/stylePanel.js b/extension/content/firebug/css/stylePanel.js
index f0c19f5..21e879c 100644
--- a/extension/content/firebug/css/stylePanel.js
+++ b/extension/content/firebug/css/stylePanel.js
@@ -683,6 +683,23 @@ CSSStylePanel.prototype = Obj.extend(CSSStyleSheetPanel.prototype,
         return CSSStyleSheetPanel.prototype.showInfoTip.call(this, infoTip, target, x, y, rangeParent, rangeOffset);
     },
 
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // Extends stylesheet (CSS Panel)
+
+    deleteRuleDeclaration: function(cssSelector)
+    {
+        var repObject = Firebug.getRepObject(cssSelector);
+
+        if (repObject instanceof window.Element)
+            CSSModule.deleteRule(repObject);
+        else
+            CSSStyleSheetPanel.prototype.deleteRuleDeclaration(cssSelector);
+
+        this.refresh();
+    },
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
     hasPseudoClassLock: function(pseudoClass)
     {
         if (Dom.domUtils.hasPseudoClassLock)

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