Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7237 from Snuffleupagus/issue-7232

Browse Source 
Prevent accidentally overriding the `error` function in the `commonobj` messageHandler in api.js (issue 7232)
This commit is contained in:
Yury Delendik 2016-04-22 12:49:01 -05:00
commit f13119f237
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/display/api.js
View File

@ -1486,28 +1486,26 @@ var WorkerTransport = (function WorkerTransportClosure() {
case 'Font': case 'Font':
var exportedData = data[2]; var exportedData = data[2];
var font;
if ('error' in exportedData) { if ('error' in exportedData) {
var error = exportedData.error; var exportedError = exportedData.error;
warn('Error during font loading: ' + error); warn('Error during font loading: ' + exportedError);
this.commonObjs.resolve(id, error); this.commonObjs.resolve(id, exportedError);
break; break;
} else {
var fontRegistry = null;
if (getDefaultSetting('pdfBug') && globalScope.FontInspector &&
globalScope['FontInspector'].enabled) {
fontRegistry = {
registerFont: function (font, url) {
globalScope['FontInspector'].fontAdded(font, url);
}
};
}
font = new FontFaceObject(exportedData, {
isEvalSuported: getDefaultSetting('isEvalSupported'),
disableFontFace: getDefaultSetting('disableFontFace'),
fontRegistry: fontRegistry
});
} }
var fontRegistry = null;
if (getDefaultSetting('pdfBug') && globalScope.FontInspector &&
globalScope['FontInspector'].enabled) {
fontRegistry = {
registerFont: function (font, url) {
globalScope['FontInspector'].fontAdded(font, url);
}
};
}
var font = new FontFaceObject(exportedData, {
isEvalSuported: getDefaultSetting('isEvalSupported'),
disableFontFace: getDefaultSetting('disableFontFace'),
fontRegistry: fontRegistry
});
this.fontLoader.bind( this.fontLoader.bind(
[font], [font],