handle font names with comments (fix fix of hack hack)
This commit is contained in:
parent
85c961f02d
commit
fe09c1852c
9
fonts.js
9
fonts.js
@ -218,12 +218,7 @@ var FontLoader = {
|
|||||||
window.addEventListener(
|
window.addEventListener(
|
||||||
"message",
|
"message",
|
||||||
function(e) {
|
function(e) {
|
||||||
var fontNames = e.data;
|
var fontNames = JSON.parse(e.data);
|
||||||
// Firefox 5 doesn't parse the JSON here. Welcome to the
|
|
||||||
// Wonderful Web World.
|
|
||||||
if ("string" == typeof(fontNames)) {
|
|
||||||
fontNames = fontNames.split(",");
|
|
||||||
}
|
|
||||||
for (var i = 0; i < fontNames.length; ++i) {
|
for (var i = 0; i < fontNames.length; ++i) {
|
||||||
var font = Fonts.lookup(fontNames[i]);
|
var font = Fonts.lookup(fontNames[i]);
|
||||||
font.loading = false;
|
font.loading = false;
|
||||||
@ -251,7 +246,7 @@ var FontLoader = {
|
|||||||
}
|
}
|
||||||
src += ' var fontNames=['+ fontNamesArray +'];\n';
|
src += ' var fontNames=['+ fontNamesArray +'];\n';
|
||||||
src += ' window.onload = function () {\n'
|
src += ' window.onload = function () {\n'
|
||||||
src += ' top.postMessage(fontNames, "*");\n';
|
src += ' top.postMessage(JSON.stringify(fontNames), "*");\n';
|
||||||
src += ' }';
|
src += ' }';
|
||||||
src += '</script></head><body>';
|
src += '</script></head><body>';
|
||||||
for (var i = 0; i < names.length; ++i) {
|
for (var i = 0; i < names.length; ++i) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user