Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs

This commit is contained in:
notmasteryet 2011-09-15 19:50:55 -05:00
commit 582b760a65
4 changed files with 5 additions and 1 deletions

4
fonts.js Executable file → Normal file
View File

@ -1293,6 +1293,10 @@ var Font = (function Font() {
window.btoa(data) + ');'); window.btoa(data) + ');');
var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}'; var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
var styleSheet = document.styleSheets[0]; var styleSheet = document.styleSheets[0];
if (!styleSheet) {
document.documentElement.firstChild.appendChild( document.createElement('style') );
styleSheet = document.styleSheets[0];
}
styleSheet.insertRule(rule, styleSheet.cssRules.length); styleSheet.insertRule(rule, styleSheet.cssRules.length);
return rule; return rule;

2
pdf.js
View File

@ -3379,7 +3379,7 @@ var Page = (function() {
} catch (e) { } catch (e) {
exc = e.toString(); exc = e.toString();
} }
continuation(exc); if (continuation) continuation(exc);
}); });
}; };

0
web/compatibility.js Executable file → Normal file
View File

0
web/viewer.css Executable file → Normal file
View File