diff --git a/browser/extensions/pdfjs/content/web/viewer.js b/browser/extensions/pdfjs/content/web/viewer.js
index d079c20871c..e53bda088a5 100644
--- a/browser/extensions/pdfjs/content/web/viewer.js
+++ b/browser/extensions/pdfjs/content/web/viewer.js
@@ -520,6 +520,18 @@ var DownloadManager = (function DownloadManagerClosure() {
});
},
+ downloadData: function DownloadManager_downloadData(data, filename,
+ contentType) {
+ var blobUrl = PDFJS.createObjectURL(data, contentType);
+
+ FirefoxCom.request('download', {
+ blobUrl: blobUrl,
+ originalUrl: blobUrl,
+ filename: filename,
+ isAttachment: true
+ });
+ },
+
download: function DownloadManager_download(blob, url, filename) {
var blobUrl = window.URL.createObjectURL(blob);
@@ -2829,6 +2841,9 @@ var PDFView = {
},
close: function pdfViewClose() {
+ var errorWrapper = document.getElementById('errorWrapper');
+ errorWrapper.setAttribute('hidden', 'true');
+
if (!this.pdfDocument) {
return;
}
@@ -2836,9 +2851,6 @@ var PDFView = {
this.pdfDocument.destroy();
this.pdfDocument = null;
- var errorWrapper = document.getElementById('errorWrapper');
- errorWrapper.setAttribute('hidden', 'true');
-
var thumbsView = document.getElementById('thumbnailView');
while (thumbsView.hasChildNodes()) {
thumbsView.removeChild(thumbsView.lastChild);
@@ -2862,11 +2874,10 @@ var PDFView = {
open: function pdfViewOpen(url, scale, password,
pdfDataRangeTransport, args) {
if (this.pdfDocument) {
- this.close();
-
// Reload the preferences if a document was previously opened.
Preferences.reload();
}
+ this.close();
var parameters = {password: password};
if (typeof url === 'string') { // URL
@@ -3307,6 +3318,10 @@ var PDFView = {
});
}
});
+ pdfDocument.getAttachments().then(function(attachments) {
+ self.attachments = new DocumentAttachmentsView(attachments);
+ document.getElementById('viewAttachments').disabled = !attachments;
+ });
});
pdfDocument.getMetadata().then(function(data) {
@@ -3548,12 +3563,14 @@ var PDFView = {
}
if ('pagemode' in params) {
var toggle = document.getElementById('sidebarToggle');
- if (params.pagemode === 'thumbs' || params.pagemode === 'bookmarks') {
+ if (params.pagemode === 'thumbs' || params.pagemode === 'bookmarks' ||
+ params.pagemode === 'attachments') {
if (!this.sidebarOpen) {
toggle.click();
}
- this.switchSidebarView(params.pagemode === 'thumbs' ?
- 'thumbs' : 'outline');
+ this.switchSidebarView(params.pagemode === 'bookmarks' ?
+ 'outline' :
+ params.pagemode);
} else if (params.pagemode === 'none' && this.sidebarOpen) {
toggle.click();
}
@@ -3569,24 +3586,28 @@ var PDFView = {
switchSidebarView: function pdfViewSwitchSidebarView(view) {
var thumbsView = document.getElementById('thumbnailView');
var outlineView = document.getElementById('outlineView');
+ var attachmentsView = document.getElementById('attachmentsView');
var thumbsButton = document.getElementById('viewThumbnail');
var outlineButton = document.getElementById('viewOutline');
+ var attachmentsButton = document.getElementById('viewAttachments');
switch (view) {
case 'thumbs':
- var wasOutlineViewVisible = thumbsView.classList.contains('hidden');
+ var wasAnotherViewVisible = thumbsView.classList.contains('hidden');
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
+ attachmentsButton.classList.remove('toggled');
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
+ attachmentsView.classList.add('hidden');
PDFView.renderHighestPriority();
- if (wasOutlineViewVisible) {
+ if (wasAnotherViewVisible) {
// Ensure that the thumbnail of the current page is visible
- // when switching from the outline view.
+ // when switching from another view.
scrollIntoView(document.getElementById('thumbnailContainer' +
this.page));
}
@@ -3595,13 +3616,28 @@ var PDFView = {
case 'outline':
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
+ attachmentsButton.classList.remove('toggled');
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
+ attachmentsView.classList.add('hidden');
if (outlineButton.getAttribute('disabled')) {
return;
}
break;
+
+ case 'attachments':
+ thumbsButton.classList.remove('toggled');
+ outlineButton.classList.remove('toggled');
+ attachmentsButton.classList.add('toggled');
+ thumbsView.classList.add('hidden');
+ outlineView.classList.add('hidden');
+ attachmentsView.classList.remove('hidden');
+
+ if (attachmentsButton.getAttribute('disabled')) {
+ return;
+ }
+ break;
}
},
@@ -3673,7 +3709,7 @@ var PDFView = {
parseQueryString: function pdfViewParseQueryString(query) {
var parts = query.split('&');
var params = {};
- for (var i = 0, ii = parts.length; i < parts.length; ++i) {
+ for (var i = 0, ii = parts.length; i < ii; ++i) {
var param = parts[i].split('=');
var key = param[0];
var value = param.length > 1 ? param[1] : null;
@@ -3864,7 +3900,7 @@ var PageView = function pageView(container, id, scale,
}
};
- this.reset = function pageViewReset() {
+ this.reset = function pageViewReset(keepAnnotations) {
if (this.renderTask) {
this.renderTask.cancel();
}
@@ -3877,14 +3913,23 @@ var PageView = function pageView(container, id, scale,
var childNodes = div.childNodes;
for (var i = div.childNodes.length - 1; i >= 0; i--) {
var node = childNodes[i];
- if (this.zoomLayer && this.zoomLayer === node) {
+ if ((this.zoomLayer && this.zoomLayer === node) ||
+ (keepAnnotations && this.annotationLayer === node)) {
continue;
}
div.removeChild(node);
}
div.removeAttribute('data-loaded');
- this.annotationLayer = null;
+ if (keepAnnotations) {
+ if (this.annotationLayer) {
+ // Hide annotationLayer until all elements are resized
+ // so they are not displayed on the already-resized page
+ this.annotationLayer.setAttribute('hidden', 'true');
+ }
+ } else {
+ this.annotationLayer = null;
+ }
delete this.canvas;
@@ -3916,7 +3961,7 @@ var PageView = function pageView(container, id, scale,
if (this.zoomLayer) {
this.cssTransform(this.zoomLayer.firstChild);
}
- this.reset();
+ this.reset(true);
};
this.cssTransform = function pageCssTransform(canvas) {
@@ -4065,60 +4110,73 @@ var PageView = function pageView(container, id, scale,
}
pdfPage.getAnnotations().then(function(annotationsData) {
- if (self.annotationLayer) {
- // If an annotationLayer already exists, delete it to avoid creating
- // duplicate annotations when rapidly re-zooming the document.
- pageDiv.removeChild(self.annotationLayer);
- self.annotationLayer = null;
- }
viewport = viewport.clone({ dontFlip: true });
- for (var i = 0; i < annotationsData.length; i++) {
- var data = annotationsData[i];
- var annotation = PDFJS.Annotation.fromData(data);
- if (!annotation || !annotation.hasHtml()) {
- continue;
- }
+ var transform = viewport.transform;
+ var transformStr = 'matrix(' + transform.join(',') + ')';
+ var data, element, i, ii;
- var element = annotation.getHtmlElement(pdfPage.commonObjs);
- mozL10n.translate(element);
-
- data = annotation.getData();
- var rect = data.rect;
- var view = pdfPage.view;
- rect = PDFJS.Util.normalizeRect([
- rect[0],
- view[3] - rect[1] + view[1],
- rect[2],
- view[3] - rect[3] + view[1]
- ]);
- element.style.left = rect[0] + 'px';
- element.style.top = rect[1] + 'px';
- element.style.position = 'absolute';
-
- var transform = viewport.transform;
- var transformStr = 'matrix(' + transform.join(',') + ')';
- CustomStyle.setProp('transform', element, transformStr);
- var transformOriginStr = -rect[0] + 'px ' + -rect[1] + 'px';
- CustomStyle.setProp('transformOrigin', element, transformOriginStr);
-
- if (data.subtype === 'Link' && !data.url) {
- var link = element.getElementsByTagName('a')[0];
- if (link) {
- if (data.action) {
- bindNamedAction(link, data.action);
- } else {
- bindLink(link, ('dest' in data) ? data.dest : null);
- }
+ if (self.annotationLayer) {
+ // If an annotationLayer already exists, refresh its children's
+ // transformation matrices
+ for (i = 0, ii = annotationsData.length; i < ii; i++) {
+ data = annotationsData[i];
+ element = self.annotationLayer.querySelector(
+ '[data-annotation-id="' + data.id + '"]');
+ if (element) {
+ CustomStyle.setProp('transform', element, transformStr);
}
}
+ // See this.reset()
+ self.annotationLayer.removeAttribute('hidden');
+ } else {
+ for (i = 0, ii = annotationsData.length; i < ii; i++) {
+ data = annotationsData[i];
+ var annotation = PDFJS.Annotation.fromData(data);
+ if (!annotation || !annotation.hasHtml()) {
+ continue;
+ }
- if (!self.annotationLayer) {
- var annotationLayerDiv = document.createElement('div');
- annotationLayerDiv.className = 'annotationLayer';
- pageDiv.appendChild(annotationLayerDiv);
- self.annotationLayer = annotationLayerDiv;
+ element = annotation.getHtmlElement(pdfPage.commonObjs);
+ element.setAttribute('data-annotation-id', data.id);
+ mozL10n.translate(element);
+
+ data = annotation.getData();
+ var rect = data.rect;
+ var view = pdfPage.view;
+ rect = PDFJS.Util.normalizeRect([
+ rect[0],
+ view[3] - rect[1] + view[1],
+ rect[2],
+ view[3] - rect[3] + view[1]
+ ]);
+ element.style.left = rect[0] + 'px';
+ element.style.top = rect[1] + 'px';
+ element.style.position = 'absolute';
+
+ CustomStyle.setProp('transform', element, transformStr);
+ var transformOriginStr = -rect[0] + 'px ' + -rect[1] + 'px';
+ CustomStyle.setProp('transformOrigin', element, transformOriginStr);
+
+ if (data.subtype === 'Link' && !data.url) {
+ var link = element.getElementsByTagName('a')[0];
+ if (link) {
+ if (data.action) {
+ bindNamedAction(link, data.action);
+ } else {
+ bindLink(link, ('dest' in data) ? data.dest : null);
+ }
+ }
+ }
+
+ if (!self.annotationLayer) {
+ var annotationLayerDiv = document.createElement('div');
+ annotationLayerDiv.className = 'annotationLayer';
+ pageDiv.appendChild(annotationLayerDiv);
+ self.annotationLayer = annotationLayerDiv;
+ }
+
+ self.annotationLayer.appendChild(element);
}
- self.annotationLayer.appendChild(element);
}
});
}
@@ -4254,10 +4312,14 @@ var PageView = function pageView(container, id, scale,
var canvas = document.createElement('canvas');
canvas.id = 'page' + this.id;
canvasWrapper.appendChild(canvas);
- div.appendChild(canvasWrapper);
+ if (this.annotationLayer) {
+ // annotationLayer needs to stay on top
+ div.insertBefore(canvasWrapper, this.annotationLayer);
+ } else {
+ div.appendChild(canvasWrapper);
+ }
this.canvas = canvas;
- var scale = this.scale;
var ctx = canvas.getContext('2d');
var outputScale = getOutputScale(ctx);
@@ -4283,7 +4345,12 @@ var PageView = function pageView(container, id, scale,
textLayerDiv.className = 'textLayer';
textLayerDiv.style.width = canvas.style.width;
textLayerDiv.style.height = canvas.style.height;
- div.appendChild(textLayerDiv);
+ if (this.annotationLayer) {
+ // annotationLayer needs to stay on top
+ div.insertBefore(textLayerDiv, this.annotationLayer);
+ } else {
+ div.appendChild(textLayerDiv);
+ }
}
var textLayer = this.textLayer =
textLayerDiv ? new TextLayerBuilder({
@@ -4425,7 +4492,6 @@ var PageView = function pageView(container, id, scale,
canvasWrapper.appendChild(canvas);
printContainer.appendChild(canvasWrapper);
- var self = this;
canvas.mozPrintCallback = function(obj) {
var ctx = obj.context;
@@ -4794,9 +4860,6 @@ var TextLayerBuilder = function textLayerBuilder(options) {
var queryLen = (PDFFindController === null ?
0 : PDFFindController.state.query.length);
- var lastDivIdx = -1;
- var pos;
-
var ret = [];
// Loop over all the matches.
@@ -4987,7 +5050,6 @@ var TextLayerBuilder = function textLayerBuilder(options) {
var DocumentOutlineView = function documentOutlineView(outline) {
var outlineView = document.getElementById('outlineView');
- var outlineButton = document.getElementById('viewOutline');
while (outlineView.firstChild) {
outlineView.removeChild(outlineView.firstChild);
}
@@ -5033,6 +5095,44 @@ var DocumentOutlineView = function documentOutlineView(outline) {
}
};
+var DocumentAttachmentsView = function documentAttachmentsView(attachments) {
+ var attachmentsView = document.getElementById('attachmentsView');
+ while (attachmentsView.firstChild) {
+ attachmentsView.removeChild(attachmentsView.firstChild);
+ }
+
+ if (!attachments) {
+ if (!attachmentsView.classList.contains('hidden')) {
+ PDFView.switchSidebarView('thumbs');
+ }
+ return;
+ }
+
+ function bindItemLink(domObj, item) {
+ domObj.href = '#';
+ domObj.onclick = function documentAttachmentsViewOnclick(e) {
+ var downloadManager = new DownloadManager();
+ downloadManager.downloadData(item.content, getFileName(item.filename),
+ '');
+ return false;
+ };
+ }
+
+ var names = Object.keys(attachments).sort(function(a,b) {
+ return a.toLowerCase().localeCompare(b.toLowerCase());
+ });
+ for (var i = 0, ii = names.length; i < ii; i++) {
+ var item = attachments[names[i]];
+ var div = document.createElement('div');
+ div.className = 'attachmentsItem';
+ var a = document.createElement('a');
+ bindItemLink(a, item);
+ a.textContent = getFileName(item.filename);
+ div.appendChild(a);
+ attachmentsView.appendChild(div);
+ }
+};
+
function webViewerLoad(evt) {
PDFView.initialize().then(webViewerInitialized);
@@ -5166,6 +5266,11 @@ function webViewerInitialized() {
PDFView.switchSidebarView('outline');
});
+ document.getElementById('viewAttachments').addEventListener('click',
+ function() {
+ PDFView.switchSidebarView('attachments');
+ });
+
document.getElementById('previous').addEventListener('click',
function() {
PDFView.page--;
diff --git a/browser/locales/en-US/pdfviewer/viewer.properties b/browser/locales/en-US/pdfviewer/viewer.properties
index a10bb8f2275..dadfe414316 100644
--- a/browser/locales/en-US/pdfviewer/viewer.properties
+++ b/browser/locales/en-US/pdfviewer/viewer.properties
@@ -89,6 +89,8 @@ toggle_sidebar.title=Toggle Sidebar
toggle_sidebar_label=Toggle Sidebar
outline.title=Show Document Outline
outline_label=Document Outline
+attachments.title=Show Attachments
+attachments_label=Attachments
thumbs.title=Show Thumbnails
thumbs_label=Thumbnails
findbar.title=Find in Document