[Pkg-mozext-commits] [firebug] 13/28: Issue 5826: Fonts are not displayed inside Style side panel

[David Prévot]

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

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

commit 8f0485aee2d530a7298cb94cf9ae284c4655fedb
Author: Simon Lindholm <simon.lindholm10 at gmail.com>
Date:   Fri Aug 17 12:06:59 2012 +0200

    Issue 5826: Fonts are not displayed inside Style side panel
    
    http://code.google.com/p/fbug/issues/detail?id=5826
---
 extension/content/firebug/css/stylePanel.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/extension/content/firebug/css/stylePanel.js b/extension/content/firebug/css/stylePanel.js
index 35a5d76..8cf722a 100644
--- a/extension/content/firebug/css/stylePanel.js
+++ b/extension/content/firebug/css/stylePanel.js
@@ -95,12 +95,12 @@ CSSStylePanel.prototype = Obj.extend(CSSStyleSheetPanel.prototype,
 
         getSeparator: function(part)
         {
-            if (part.type == "otherProps")
-                return " ";
-
             if (part.lastFont || part.type == "important")
                 return "";
 
+            if (part.type == "otherProps")
+                return " ";
+
             return ",";
         },
 
@@ -827,7 +827,11 @@ function getFontPropValueParts(element, value, propName)
         );
         var matches = rePreFont.exec(value);
         if (!matches)
-            return;
+        {
+            // Non-simple font value, like "inherit", "status-bar" or
+            // "-moz-calc(12px) Arial" - just return the whole text.
+            return [{type: "otherProps", value: value, lastFont: true}];
+        }
         var preProps = matches[0].slice(0, -1);
         parts.push({type: "otherProps", value: preProps});
         value = value.substr(matches[0].length);

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