Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Issue 5825 (Infotip for web fonts defined via data URLs broken)

  • Loading branch information...
commit 0bd0781950d4499ab04aab0f7570d305fc629709 1 parent a3ef9a0
Sebastian Zartner SebastianZ authored
3  extension/content/firebug/css/computedPanel.js
View
@@ -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;
}
},
3  extension/content/firebug/css/cssPanel.js
View
@@ -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;
}
},
10 extension/content/firebug/lib/fonts.js
View
@@ -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];
}
Please sign in to comment.
Something went wrong with that request. Please try again.