]> git.parisson.com Git - pdf.js.git/commitdiff
handle font names with comments (fix fix of hack hack)
authorChris Jones <jones.chris.g@gmail.com>
Mon, 4 Jul 2011 22:21:13 +0000 (18:21 -0400)
committerChris Jones <jones.chris.g@gmail.com>
Mon, 4 Jul 2011 22:21:13 +0000 (18:21 -0400)
fonts.js

index 12d7ce82ea3fa759d2f597112ffc379285cc66b7..735213f5bff89565c0134c672a618c9657594fbb 100644 (file)
--- a/fonts.js
+++ b/fonts.js
@@ -218,12 +218,7 @@ var FontLoader = {
         window.addEventListener(
           "message",
           function(e) {
-            var fontNames = e.data;
-            // Firefox 5 doesn't parse the JSON here.  Welcome to the
-            // Wonderful Web World.
-            if ("string" == typeof(fontNames)) {
-              fontNames = fontNames.split(",");
-            }
+            var fontNames = JSON.parse(e.data);
             for (var i = 0; i < fontNames.length; ++i) {
               var font = Fonts.lookup(fontNames[i]);
               font.loading = false;
@@ -251,7 +246,7 @@ var FontLoader = {
       }
       src += '  var fontNames=['+ fontNamesArray +'];\n';
       src += '  window.onload = function () {\n'
-      src += '    top.postMessage(fontNames, "*");\n';
+      src += '    top.postMessage(JSON.stringify(fontNames), "*");\n';
       src += '  }';
       src += '</script></head><body>';
       for (var i = 0; i < names.length; ++i) {