[Pkg-mozext-commits] [firebug] 63/68: Check whether CSSMozDocumentRule exists before using it

[David Prévot]

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

taffit pushed a commit to tag fbtest-1.11.4
in repository firebug.

commit 806fda918568d205b2539609e2fcc129ceeca960
Author: Sebastian Zartner <sebastianzartner at gmail.com>
Date:   Thu May 23 09:26:26 2013 +0200

    Check whether CSSMozDocumentRule exists before using it
    
    Conflicts:
    	extension/content/firebug/chrome/reps.js
---
 extension/content/firebug/chrome/reps.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/content/firebug/chrome/reps.js b/extension/content/firebug/chrome/reps.js
index 4ae7da1..0fc6fbc 100644
--- a/extension/content/firebug/chrome/reps.js
+++ b/extension/content/firebug/chrome/reps.js
@@ -1625,12 +1625,12 @@ FirebugReps.CSSRule = domplate(Firebug.Rep,
         {
             return "CSSStyleRule";
         }
-        else if (rule instanceof window.CSSSupportsRule)
+        else if (window.CSSSupportsRule && rule instanceof window.CSSSupportsRule)
         {
             return "CSSSupportsRule";
         }
-        else if ((window.CSSMozDocumentRule && rule instanceof window.CSSMozDocumentRule) ||
-            rule instanceof window.CSSDocumentRule)
+        else if ((window.CSSDocumentRule && rule instanceof window.CSSDocumentRule) ||
+            (window.CSSMozDocumentRule && rule instanceof window.CSSMozDocumentRule))
         {
             return "CSSDocumentRule";
         }
@@ -1678,12 +1678,12 @@ FirebugReps.CSSRule = domplate(Firebug.Rep,
         {
             return rule.selectorText;
         }
-        else if (rule instanceof window.CSSSupportsRule)
+        else if (window.CSSSupportsRule && rule instanceof window.CSSSupportsRule)
         {
             return rule.conditionText;
         }
-        else if ((window.CSSMozDocumentRule && rule instanceof window.CSSMozDocumentRule) ||
-            rule instanceof window.CSSDocumentRule)
+        else if ((window.CSSDocumentRule && rule instanceof window.CSSDocumentRule) ||
+            (window.CSSMozDocumentRule && rule instanceof window.CSSMozDocumentRule))
         {
             return rule.conditionText;
         }

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