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

Refactor and ES6-ify PDFLinkService.navigateTo

Browse Source 
This patch replaces a `var self = this;` statement with arrow functions, and `var` with `let` in `PDFLinkService.navigateTo`.

Furthermore, when I started looking at this method, it quickly became clear that its code is somewhat of a mess. Since I'm one of the persons that have touched this code over the years, I figured that it'd be a good idea to try and clean it up a bit.
This commit is contained in:
Jonas Jenwald 2017-05-16 13:20:30 +02:00
parent e9cbfbccb4
commit 972eca56a1
1 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
web/pdf_link_service.js
View File

@ -85,71 +85,76 @@ var PDFLinkService = (function PDFLinkServiceClosure() {
}, },
/** /**
* @param dest - The PDF destination object. * @param {string|Array} dest - The named, or explicit, PDF destination.
*/ */
navigateTo: function PDFLinkService_navigateTo(dest) { navigateTo(dest) {
var destString = ''; let goToDestination = ({ namedDest, explicitDest, }) => {
var self = this; // Dest array looks like that: <page-ref> </XYZ|/FitXXX> <args..>
let destRef = explicitDest[0], pageNumber;
var goToDestination = function(destRef) {
// dest array looks like that: <page-ref> </XYZ|/FitXXX> <args..>
var pageNumber;
if (destRef instanceof Object) { if (destRef instanceof Object) {
pageNumber = self._cachedPageNumber(destRef); pageNumber = this._cachedPageNumber(destRef);
if (pageNumber === null) {
// Fetch the page reference if it's not yet available. This could
// only occur during loading, before all pages have been resolved.
this.pdfDocument.getPageIndex(destRef).then((pageIndex) => {
this.cachePageRef(pageIndex + 1, destRef);
goToDestination({ namedDest, explicitDest, });
}).catch(() => {
console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` +
`a valid page reference, for dest="${dest}".`);
});
return;
}
} else if ((destRef | 0) === destRef) { // Integer } else if ((destRef | 0) === destRef) { // Integer
pageNumber = destRef + 1; pageNumber = destRef + 1;
} else { } else {
console.error('PDFLinkService_navigateTo: "' + destRef + console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` +
'" is not a valid destination reference.'); `a valid destination reference, for dest="${dest}".`);
return;
}
if (!pageNumber || pageNumber < 1 || pageNumber > this.pagesCount) {
console.error(`PDFLinkService.navigateTo: "${pageNumber}" is not ` +
`a valid page number, for dest="${dest}".`);
return; return;
} }
if (pageNumber) { this.pdfViewer.scrollPageIntoView({
if (pageNumber < 1 || pageNumber > self.pagesCount) { pageNumber,
console.error('PDFLinkService_navigateTo: "' + pageNumber + destArray: explicitDest,
'" is a non-existent page number.'); });
return;
}
self.pdfViewer.scrollPageIntoView({
pageNumber,
destArray: dest,
});
if (self.pdfHistory) { if (this.pdfHistory) { // Update the browsing history, if enabled.
// Update the browsing history. this.pdfHistory.push({
self.pdfHistory.push({ dest: explicitDest,
dest, hash: namedDest,
hash: destString, page: pageNumber,
page: pageNumber
});
}
} else {
self.pdfDocument.getPageIndex(destRef).then(function (pageIndex) {
self.cachePageRef(pageIndex + 1, destRef);
goToDestination(destRef);
}).catch(function () {
console.error('PDFLinkService_navigateTo: "' + destRef +
'" is not a valid page reference.');
return;
}); });
} }
}; };
var destinationPromise; new Promise((resolve, reject) => {
if (typeof dest === 'string') { if (typeof dest === 'string') {
destString = dest; this.pdfDocument.getDestination(dest).then((destArray) => {
destinationPromise = this.pdfDocument.getDestination(dest); resolve({
} else { namedDest: dest,
destinationPromise = Promise.resolve(dest); explicitDest: destArray,
} });
destinationPromise.then(function(destination) { });
dest = destination;
if (!(destination instanceof Array)) {
console.error('PDFLinkService_navigateTo: "' + destination +
'" is not a valid destination array.');
return; return;
} }
goToDestination(destination[0]); resolve({
namedDest: '',
explicitDest: dest,
});
}).then((data) => {
if (!(data.explicitDest instanceof Array)) {
console.error(`PDFLinkService.navigateTo: "${data.explicitDest}" is` +
` not a valid destination array, for dest="${dest}".`);
return;
}
goToDestination(data);
}); });
}, },