[Pkg-mozext-commits] [firebug] 11/28: Issue 5825 (Infotip for web fonts defined via data URLs broken) http://code.google.com/p/fbug/issues/detail?id=5825

[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 0bd0781950d4499ab04aab0f7570d305fc629709
Author: Sebastian Zartner <sebastianzartner at gmx.de>
Date:   Fri Aug 17 11:07:14 2012 +0200

    Issue 5825 (Infotip for web fonts defined via data URLs broken)
    http://code.google.com/p/fbug/issues/detail?id=5825
---
 extension/content/firebug/css/computedPanel.js |  3 +++
 extension/content/firebug/css/cssPanel.js      |  3 +++
 extension/content/firebug/lib/fonts.js         | 10 +++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/extension/content/firebug/css/computedPanel.js b/extension/content/firebug/css/computedPanel.js
index a992248..18302fb 100644
--- a/extension/content/firebug/css/computedPanel.js
+++ b/extension/content/firebug/css/computedPanel.js
@@ -670,6 +670,7 @@ CSSComputedPanel.prototype = Obj.extend(Firebug.Panel,
 
                         return CSSInfoTip.populateImageInfoTip(infoTip, absURL, repeat);
                     }
+                    break;
 
                 case "fontFamily":
                     return CSSInfoTip.populateFontFamilyInfoTip(infoTip, cssValue.value);
@@ -678,6 +679,8 @@ CSSComputedPanel.prototype = Obj.extend(Firebug.Panel,
             delete this.infoTipType;
             delete this.infoTipValue;
             delete this.infoTipObject;
+
+            return false;
         }
     },
 
diff --git a/extension/content/firebug/css/cssPanel.js b/extension/content/firebug/css/cssPanel.js
index 814f58f..494a527 100644
--- a/extension/content/firebug/css/cssPanel.js
+++ b/extension/content/firebug/css/cssPanel.js
@@ -1303,6 +1303,7 @@ Firebug.CSSStyleSheetPanel.prototype = Obj.extend(Firebug.Panel,
 
                         return CSSInfoTip.populateImageInfoTip(infoTip, absURL, repeat);
                     }
+                    break;
 
                 case "fontFamily":
                     return CSSInfoTip.populateFontFamilyInfoTip(infoTip, cssValue.value);
@@ -1311,6 +1312,8 @@ Firebug.CSSStyleSheetPanel.prototype = Obj.extend(Firebug.Panel,
             delete this.infoTipType;
             delete this.infoTipValue;
             delete this.infoTipObject;
+
+            return false;
         }
     },
 
diff --git a/extension/content/firebug/lib/fonts.js b/extension/content/firebug/lib/fonts.js
index cc43de1..fb8adb4 100644
--- a/extension/content/firebug/lib/fonts.js
+++ b/extension/content/firebug/lib/fonts.js
@@ -78,7 +78,7 @@ Fonts.getFontsUsedInContext = function(context)
  * Retrieves the information about a font
  * @context: Context of the font
  * @win: Window the font is used in
- * @identifier: Either a URL in case of a Fonts font or the font name
+ * @identifier: Either a URL in case of a web font or the font name
  * @return Object with information about the font
  */
 Fonts.getFontInfo = function(context, win, identifier)
@@ -94,15 +94,15 @@ Fonts.getFontInfo = function(context, win, identifier)
     }
 
     var fonts = Fonts.getFonts(doc.documentElement);
-    var url = Url.splitURLBase(identifier);
 
     if (FBTrace.DBG_FONTS)
-        FBTrace.sysout("Fonts.getFontInfo;", {fonts:fonts, url:url});
+        FBTrace.sysout("Fonts.getFontInfo;", {fonts:fonts, identifier: identifier});
 
     for (var i=0; i<fonts.length; i++)
     {
-        if ((fonts[i].rule && url && identifier == fonts[i].URI) ||
-            identifier == fonts[i].CSSFamilyName || identifier == fonts[i].name)
+        if ((identifier == fonts[i].URI) ||
+            identifier.toLowerCase() == fonts[i].CSSFamilyName.toLowerCase() ||
+            identifier.toLowerCase() == fonts[i].name.toLowerCase())
         {
             return fonts[i];
         }

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