Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Issue 5826: Fonts are not displayed inside Style side panel

  • Loading branch information...
commit 8f0485aee2d530a7298cb94cf9ae284c4655fedb 1 parent 03b8fed
Simon Lindholm authored August 17, 2012
12  extension/content/firebug/css/stylePanel.js
@@ -95,12 +95,12 @@ CSSStylePanel.prototype = Obj.extend(CSSStyleSheetPanel.prototype,
95 95
 
96 96
         getSeparator: function(part)
97 97
         {
98  
-            if (part.type == "otherProps")
99  
-                return " ";
100  
-
101 98
             if (part.lastFont || part.type == "important")
102 99
                 return "";
103 100
 
  101
+            if (part.type == "otherProps")
  102
+                return " ";
  103
+
104 104
             return ",";
105 105
         },
106 106
 
@@ -827,7 +827,11 @@ function getFontPropValueParts(element, value, propName)
827 827
         );
828 828
         var matches = rePreFont.exec(value);
829 829
         if (!matches)
830  
-            return;
  830
+        {
  831
+            // Non-simple font value, like "inherit", "status-bar" or
  832
+            // "-moz-calc(12px) Arial" - just return the whole text.
  833
+            return [{type: "otherProps", value: value, lastFont: true}];
  834
+        }
831 835
         var preProps = matches[0].slice(0, -1);
832 836
         parts.push({type: "otherProps", value: preProps});
833 837
         value = value.substr(matches[0].length);

0 notes on commit 8f0485a

Please sign in to comment.
Something went wrong with that request. Please try again.