Merge pull request #3454 from Rob--W/configurable-images-directory
Configurable IMAGE_DIR for annotations to get svg images to show up in Chromium extension
This commit is contained in:
commit
940415b32c
@ -108,9 +108,9 @@ function renderPDF(url) {
|
|||||||
var script = document.createElement('script');
|
var script = document.createElement('script');
|
||||||
script.textContent =
|
script.textContent =
|
||||||
'(function(args) {' +
|
'(function(args) {' +
|
||||||
|
' PDFJS.imageResourcesPath = args.BASE_URL + PDFJS.imageResourcesPath;' +
|
||||||
' PDFJS.workerSrc = args.BASE_URL + PDFJS.workerSrc;' +
|
' PDFJS.workerSrc = args.BASE_URL + PDFJS.workerSrc;' +
|
||||||
' window.DEFAULT_URL = args.pdf_url;' +
|
' window.DEFAULT_URL = args.pdf_url;' +
|
||||||
' window.IMAGE_DIR = args.BASE_URL + window.IMAGE_DIR;' +
|
|
||||||
'})(' + JSON.stringify(args) + ');';
|
'})(' + JSON.stringify(args) + ');';
|
||||||
document.head.appendChild(script);
|
document.head.appendChild(script);
|
||||||
|
|
||||||
|
@ -552,7 +552,6 @@ var TextAnnotation = (function TextAnnotationClosure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var ANNOT_MIN_SIZE = 10;
|
var ANNOT_MIN_SIZE = 10;
|
||||||
var IMAGE_DIR = './images/';
|
|
||||||
|
|
||||||
Util.inherit(TextAnnotation, Annotation, {
|
Util.inherit(TextAnnotation, Annotation, {
|
||||||
|
|
||||||
@ -593,7 +592,7 @@ var TextAnnotation = (function TextAnnotationClosure() {
|
|||||||
image.style.width = container.style.width;
|
image.style.width = container.style.width;
|
||||||
image.style.height = container.style.height;
|
image.style.height = container.style.height;
|
||||||
var iconName = item.name;
|
var iconName = item.name;
|
||||||
image.src = IMAGE_DIR + 'annotation-' +
|
image.src = PDFJS.imageResourcesPath + 'annotation-' +
|
||||||
iconName.toLowerCase() + '.svg';
|
iconName.toLowerCase() + '.svg';
|
||||||
image.alt = '[{{type}} Annotation]';
|
image.alt = '[{{type}} Annotation]';
|
||||||
image.dataset.l10nId = 'text_annotation_type';
|
image.dataset.l10nId = 'text_annotation_type';
|
||||||
|
@ -46,6 +46,7 @@ var FindStates = {
|
|||||||
FIND_PENDING: 3
|
FIND_PENDING: 3
|
||||||
};
|
};
|
||||||
|
|
||||||
|
PDFJS.imageResourcesPath = './images/';
|
||||||
//#if (FIREFOX || MOZCENTRAL || B2G || GENERIC || CHROME)
|
//#if (FIREFOX || MOZCENTRAL || B2G || GENERIC || CHROME)
|
||||||
//PDFJS.workerSrc = '../build/pdf.js';
|
//PDFJS.workerSrc = '../build/pdf.js';
|
||||||
//#endif
|
//#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user