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

Simplify the SimpleLinkService and use it to pass in a linkService instance in DefaultAnnotationsLayerFactory

Browse Source 
Considering that most methods of `SimpleLinkService` are complete stubs, or practically "useless" considering what they return, we can actually simplify it even more.

*Note:* This depends on the previous patch, that did a small amount of refactoring of `PDFViewer_scrollPageIntoView`, since `PDFViewer.linkService.page` is no longer accessed.

----------

Currently the `pageviewer` components example doesn't work correctly (an error is printed in the console), since no `linkService` is present when the `AnnotationsLayerBuilder` is created.

*Note:* Given that this uses the `SimpleLinkService`, clicking on e.g. internal links won't actually do anything. However, given that internal links (and similar features) are pretty much useless when only *one* page is loaded the `pageviewer` example, I don't think that really matters.
Also, using the complete `PDFLinkService` would require a `PDFViewer` instance. That would significantly complicate the example, thus making it both less clear and less self contained.
This commit is contained in:
Jonas Jenwald 2015-06-11 22:20:04 +02:00
parent ac3233bfa4
commit 4364b37e55
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/annotations_layer_builder.js
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/*globals PDFJS, CustomStyle, mozL10n */ /*globals PDFJS, CustomStyle, mozL10n, SimpleLinkService */
'use strict'; 'use strict';
@ -171,7 +171,8 @@ DefaultAnnotationsLayerFactory.prototype = {
createAnnotationsLayerBuilder: function (pageDiv, pdfPage) { createAnnotationsLayerBuilder: function (pageDiv, pdfPage) {
return new AnnotationsLayerBuilder({ return new AnnotationsLayerBuilder({
pageDiv: pageDiv, pageDiv: pageDiv,
pdfPage: pdfPage pdfPage: pdfPage,
linkService: new SimpleLinkService(),
}); });
} }
}; };

13
web/pdf_viewer.js
View File

@ -81,7 +81,7 @@ var PDFViewer = (function pdfViewer() {
function PDFViewer(options) { function PDFViewer(options) {
this.container = options.container; this.container = options.container;
this.viewer = options.viewer || options.container.firstElementChild; this.viewer = options.viewer || options.container.firstElementChild;
this.linkService = options.linkService || new SimpleLinkService(this); this.linkService = options.linkService || new SimpleLinkService();
this.removePageBorders = options.removePageBorders || false; this.removePageBorders = options.removePageBorders || false;
this.defaultRenderingQueue = !options.renderingQueue; this.defaultRenderingQueue = !options.renderingQueue;
@ -744,22 +744,19 @@ var PDFViewer = (function pdfViewer() {
})(); })();
var SimpleLinkService = (function SimpleLinkServiceClosure() { var SimpleLinkService = (function SimpleLinkServiceClosure() {
function SimpleLinkService(pdfViewer) { function SimpleLinkService() {}
this.pdfViewer = pdfViewer;
}
SimpleLinkService.prototype = { SimpleLinkService.prototype = {
/** /**
* @returns {number} * @returns {number}
*/ */
get page() { get page() {
return this.pdfViewer.currentPageNumber; return 0;
}, },
/** /**
* @param {number} value * @param {number} value
*/ */
set page(value) { set page(value) {},
this.pdfViewer.currentPageNumber = value;
},
/** /**
* @param dest - The PDF destination object. * @param dest - The PDF destination object.
*/ */