Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace unnecessary bind(this) and var self = this statements with arrow functions in remaining src/ files #8370

Merged
merged 1 commit into from
May 3, 2017
Merged

Replace unnecessary bind(this) and var self = this statements with arrow functions in remaining src/ files #8370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/display/annotation_layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,11 @@ var LinkAnnotationElement = (function LinkAnnotationElementClosure() {
* @param {Object} destination
* @memberof LinkAnnotationElement
*/
_bindLink: function LinkAnnotationElement_bindLink(link, destination) {
var self = this;

_bindLink(link, destination) {
link.href = this.linkService.getDestinationHash(destination);
link.onclick = function() {
link.onclick = () => {
if (destination) {
self.linkService.navigateTo(destination);
this.linkService.navigateTo(destination);
}
return false;
};
Expand All @@ -335,13 +333,10 @@ var LinkAnnotationElement = (function LinkAnnotationElementClosure() {
* @param {Object} action
* @memberof LinkAnnotationElement
*/
_bindNamedAction:
function LinkAnnotationElement_bindNamedAction(link, action) {
var self = this;

_bindNamedAction(link, action) {
link.href = this.linkService.getAnchorUrl('');
link.onclick = function() {
self.linkService.executeNamedAction(action);
link.onclick = () => {
this.linkService.executeNamedAction(action);
return false;
};
link.className = 'internalLink';
Expand Down
136 changes: 63 additions & 73 deletions src/display/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,13 @@ var PDFDocumentLoadingTask = (function PDFDocumentLoadingTaskClosure() {

var transportDestroyed = !this._transport ? Promise.resolve() :
this._transport.destroy();
return transportDestroyed.then(function () {
return transportDestroyed.then(() => {
this._transport = null;
if (this._worker) {
this._worker.destroy();
this._worker = null;
}
}.bind(this));
});
},

/**
Expand Down Expand Up @@ -436,22 +436,22 @@ var PDFDataRangeTransport = (function pdfDataRangeTransportClosure() {
},

onDataProgress: function PDFDataRangeTransport_onDataProgress(loaded) {
this._readyCapability.promise.then(function () {
this._readyCapability.promise.then(() => {
var listeners = this._progressListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](loaded);
}
}.bind(this));
});
},

onDataProgressiveRead:
function PDFDataRangeTransport_onDataProgress(chunk) {
this._readyCapability.promise.then(function () {
this._readyCapability.promise.then(() => {
var listeners = this._progressiveReadListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](chunk);
}
}.bind(this));
});
},

transportReady: function PDFDataRangeTransport_transportReady() {
Expand Down Expand Up @@ -822,6 +822,26 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
});
}

var complete = (error) => {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}

if (this.cleanupAfterRender) {
this.pendingCleanup = true;
}
this._tryCleanup();

if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
};

var internalRenderTask = new InternalRenderTask(complete, params,
this.objs,
this.commonObjs,
Expand All @@ -841,41 +861,15 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
renderTask.onContinue = params.continueCallback;
}

var self = this;
intentState.displayReadyCapability.promise.then(
function pageDisplayReadyPromise(transparency) {
if (self.pendingCleanup) {
complete();
return;
}
stats.time('Rendering');
internalRenderTask.initializeGraphics(transparency);
internalRenderTask.operatorListChanged();
},
function pageDisplayReadPromiseError(reason) {
complete(reason);
}
);

function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}

if (self.cleanupAfterRender) {
self.pendingCleanup = true;
}
self._tryCleanup();

if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
intentState.displayReadyCapability.promise.then((transparency) => {
if (this.pendingCleanup) {
complete();
return;
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
}
stats.time('Rendering');
internalRenderTask.initializeGraphics(transparency);
internalRenderTask.operatorListChanged();
}, complete);

return renderTask;
},
Expand Down Expand Up @@ -1106,11 +1100,11 @@ class LoopbackPort {

var cloned = new WeakMap();
var e = {data: cloneValue(obj)};
this._deferred.then(function () {
this._deferred.then(() => {
this._listeners.forEach(function (listener) {
listener.call(this, e);
}, this);
}.bind(this));
});
}

addEventListener(name, listener) {
Expand Down Expand Up @@ -1267,7 +1261,7 @@ var PDFWorker = (function PDFWorkerClosure() {
// https://bugzilla.mozilla.org/show_bug.cgi?id=683280
var worker = new Worker(workerSrc);
var messageHandler = new MessageHandler('main', 'worker', worker);
var terminateEarly = function() {
var terminateEarly = () => {
worker.removeEventListener('error', onWorkerError);
messageHandler.destroy();
worker.terminate();
Expand All @@ -1278,18 +1272,18 @@ var PDFWorker = (function PDFWorkerClosure() {
// error (e.g. NetworkError / SecurityError).
this._setupFakeWorker();
}
}.bind(this);
};

var onWorkerError = function(event) {
var onWorkerError = () => {
if (!this._webWorker) {
// Worker failed to initialize due to an error. Clean up and fall
// back to the fake worker.
terminateEarly();
}
}.bind(this);
};
worker.addEventListener('error', onWorkerError);

messageHandler.on('test', function PDFWorker_test(data) {
messageHandler.on('test', (data) => {
worker.removeEventListener('error', onWorkerError);
if (this.destroyed) {
terminateEarly();
Expand All @@ -1313,7 +1307,7 @@ var PDFWorker = (function PDFWorkerClosure() {
messageHandler.destroy();
worker.terminate();
}
}.bind(this));
});

messageHandler.on('console_log', function (data) {
console.log.apply(console, data);
Expand All @@ -1322,7 +1316,7 @@ var PDFWorker = (function PDFWorkerClosure() {
console.error.apply(console, data);
});

messageHandler.on('ready', function (data) {
messageHandler.on('ready', (data) => {
worker.removeEventListener('error', onWorkerError);
if (this.destroyed) {
terminateEarly();
Expand All @@ -1334,7 +1328,7 @@ var PDFWorker = (function PDFWorkerClosure() {
// We need fallback to a faked worker.
this._setupFakeWorker();
}
}.bind(this));
});

var sendTest = function () {
var postMessageTransfers =
Expand Down Expand Up @@ -1373,7 +1367,7 @@ var PDFWorker = (function PDFWorkerClosure() {
isWorkerDisabled = true;
}

setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
setupFakeWorkerGlobal().then((WorkerMessageHandler) => {
if (this.destroyed) {
this._readyCapability.reject(new Error('Worker was destroyed'));
return;
Expand All @@ -1397,7 +1391,7 @@ var PDFWorker = (function PDFWorkerClosure() {
var messageHandler = new MessageHandler(id, id + '_worker', port);
this._messageHandler = messageHandler;
this._readyCapability.resolve();
}.bind(this));
});
},

/**
Expand Down Expand Up @@ -1472,21 +1466,20 @@ var WorkerTransport = (function WorkerTransportClosure() {
});
this.pageCache = [];
this.pagePromises = [];
var self = this;
// We also need to wait for the worker to finish its long running tasks.
var terminated = this.messageHandler.sendWithPromise('Terminate', null);
waitOn.push(terminated);
Promise.all(waitOn).then(function () {
self.fontLoader.clear();
if (self.pdfDataRangeTransport) {
self.pdfDataRangeTransport.abort();
self.pdfDataRangeTransport = null;
Promise.all(waitOn).then(() => {
this.fontLoader.clear();
if (this.pdfDataRangeTransport) {
this.pdfDataRangeTransport.abort();
this.pdfDataRangeTransport = null;
}
if (self.messageHandler) {
self.messageHandler.destroy();
self.messageHandler = null;
if (this.messageHandler) {
this.messageHandler.destroy();
this.messageHandler = null;
}
self.destroyCapability.resolve();
this.destroyCapability.resolve();
}, this.destroyCapability.reject);
return this.destroyCapability.promise;
},
Expand Down Expand Up @@ -1641,13 +1634,11 @@ var WorkerTransport = (function WorkerTransportClosure() {
disableFontFace: getDefaultSetting('disableFontFace'),
fontRegistry,
});
var fontReady = (fontObjs) => {
this.commonObjs.resolve(id, font);
};

this.fontLoader.bind(
[font],
function fontReady(fontObjs) {
this.commonObjs.resolve(id, font);
}.bind(this)
);
this.fontLoader.bind([font], fontReady);
break;
case 'FontPath':
this.commonObjs.resolve(id, data[2]);
Expand Down Expand Up @@ -1821,14 +1812,14 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
var promise = this.messageHandler.sendWithPromise('GetPage', {
pageIndex,
}).then(function (pageInfo) {
}).then((pageInfo) => {
if (this.destroyed) {
throw new Error('Transport destroyed');
}
var page = new PDFPageProxy(pageIndex, pageInfo, this);
this.pageCache[pageIndex] = page;
return page;
}.bind(this));
});
this.pagePromises[pageIndex] = promise;
return promise;
},
Expand Down Expand Up @@ -1889,8 +1880,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
},

startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).
then(function endCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).then(() => {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i];
if (page) {
Expand All @@ -1899,7 +1889,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
this.commonObjs.clear();
this.fontLoader.clear();
}.bind(this));
});
}
};
return WorkerTransport;
Expand Down
8 changes: 4 additions & 4 deletions src/display/dom_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
if (!name) {
return Promise.reject(new Error('CMap name must be specified.'));
}
return new Promise(function (resolve, reject) {
return new Promise((resolve, reject) => {
var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');

var request = new XMLHttpRequest();
Expand All @@ -73,7 +73,7 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
if (this.isCompressed) {
request.responseType = 'arraybuffer';
}
request.onreadystatechange = function () {
request.onreadystatechange = () => {
if (request.readyState !== XMLHttpRequest.DONE) {
return;
}
Expand All @@ -96,10 +96,10 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
reject(new Error('Unable to load ' +
(this.isCompressed ? 'binary ' : '') +
'CMap at: ' + url));
}.bind(this);
};

request.send(null);
}.bind(this));
});
},
};

Expand Down
Loading