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

Convert the DOMCMapReaderFactory to an ES6 class

Browse Source 
Given that we only create *one* instance of this class per `getDocument` call, this shouldn't matter performance wise.
This commit is contained in:
Jonas Jenwald 2017-05-05 17:55:02 +02:00
parent 15425d5b9b
commit 32baa6af7a
2 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/display/dom_utils.js
View File

@ -52,59 +52,54 @@ DOMCanvasFactory.prototype = {
} }
}; };
var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() { class DOMCMapReaderFactory {
function DOMCMapReaderFactory(params) { constructor({ baseUrl = null, isCompressed = false, }) {
this.baseUrl = params.baseUrl || null; this.baseUrl = baseUrl;
this.isCompressed = params.isCompressed || false; this.isCompressed = isCompressed;
} }
DOMCMapReaderFactory.prototype = { fetch({ name, }) {
fetch(params) { if (!name) {
var name = params.name; return Promise.reject(new Error('CMap name must be specified.'));
if (!name) { }
return Promise.reject(new Error('CMap name must be specified.')); return new Promise((resolve, reject) => {
let url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');
let request = new XMLHttpRequest();
request.open('GET', url, true);
if (this.isCompressed) {
request.responseType = 'arraybuffer';
} }
return new Promise((resolve, reject) => { request.onreadystatechange = () => {
var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : ''); if (request.readyState !== XMLHttpRequest.DONE) {
return;
var request = new XMLHttpRequest();
request.open('GET', url, true);
if (this.isCompressed) {
request.responseType = 'arraybuffer';
} }
request.onreadystatechange = () => { if (request.status === 200 || request.status === 0) {
if (request.readyState !== XMLHttpRequest.DONE) { let data;
if (this.isCompressed && request.response) {
data = new Uint8Array(request.response);
} else if (!this.isCompressed && request.responseText) {
data = stringToBytes(request.responseText);
}
if (data) {
resolve({
cMapData: data,
compressionType: this.isCompressed ?
CMapCompressionType.BINARY : CMapCompressionType.NONE,
});
return; return;
} }
if (request.status === 200 || request.status === 0) { }
var data; reject(new Error('Unable to load ' +
if (this.isCompressed && request.response) { (this.isCompressed ? 'binary ' : '') +
data = new Uint8Array(request.response); 'CMap at: ' + url));
} else if (!this.isCompressed && request.responseText) { };
data = stringToBytes(request.responseText);
}
if (data) {
resolve({
cMapData: data,
compressionType: this.isCompressed ?
CMapCompressionType.BINARY : CMapCompressionType.NONE,
});
return;
}
}
reject(new Error('Unable to load ' +
(this.isCompressed ? 'binary ' : '') +
'CMap at: ' + url));
};
request.send(null); request.send(null);
}); });
}, }
}; }
return DOMCMapReaderFactory;
})();
/** /**
* Optimised CSS custom property getter/setter. * Optimised CSS custom property getter/setter.

13
test/unit/test_utils.js
View File

@ -16,20 +16,19 @@
import { CMapCompressionType } from '../../src/shared/util'; import { CMapCompressionType } from '../../src/shared/util';
class NodeCMapReaderFactory { class NodeCMapReaderFactory {
constructor(params) { constructor({ baseUrl = null, isCompressed = false, }) {
this.baseUrl = params.baseUrl || null; this.baseUrl = baseUrl;
this.isCompressed = params.isCompressed || false; this.isCompressed = isCompressed;
} }
fetch(params) { fetch({ name, }) {
var name = params.name;
if (!name) { if (!name) {
return Promise.reject(new Error('CMap name must be specified.')); return Promise.reject(new Error('CMap name must be specified.'));
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : ''); let url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');
var fs = require('fs'); let fs = require('fs');
fs.readFile(url, (error, data) => { fs.readFile(url, (error, data) => {
if (error || !data) { if (error || !data) {
reject(new Error('Unable to load ' + reject(new Error('Unable to load ' +