akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PDF.js version 1.0.1019

master v1.0.1019
Pdf Bot 10 years ago
parent
7f3e5189b9
commit
45af31e826
5 changed files with 103 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 82
      build/pdf.combined.js
  3. 58
      build/pdf.js
  4. 30
      build/pdf.worker.js
  5. 2
      package.json

2
bower.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "1.0.1017", "version": "1.0.1019",
"main": [ "main": [
"build/pdf.js", "build/pdf.js",
"build/pdf.worker.js" "build/pdf.worker.js"

82
build/pdf.combined.js
Unescape View File

@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {}; (typeof window !== 'undefined' ? window : this).PDFJS = {};
} }
PDFJS.version = '1.0.1017'; PDFJS.version = '1.0.1019';
PDFJS.build = 'a17735d'; PDFJS.build = '6e994b1';
(function pdfjsWrapper() { (function pdfjsWrapper() {
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
@ -6361,26 +6361,27 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
style.fontFamily = fontFamily + fallbackName; style.fontFamily = fontFamily + fallbackName;
} }
// TODO(mack): Remove this, it's not really that helpful. function initContainer(item, drawBorder) {
function getEmptyContainer(tagName, rect, borderWidth) { var container = document.createElement('section');
var bWidth = borderWidth || 0; var cstyle = container.style;
var element = document.createElement(tagName); var width = item.rect[2] - item.rect[0];
element.style.borderWidth = bWidth + 'px'; var height = item.rect[3] - item.rect[1];
var width = rect[2] - rect[0] - 2 * bWidth;
var height = rect[3] - rect[1] - 2 * bWidth;
element.style.width = width + 'px';
element.style.height = height + 'px';
return element;
}
function initContainer(item) {
var container = getEmptyContainer('section', item.rect, item.borderWidth);
container.style.backgroundColor = item.color;
var color = item.color; var bWidth = item.borderWidth || 0;
item.colorCssRgb = Util.makeCssRgb(Math.round(color[0] * 255), if (bWidth) {
Math.round(color[1] * 255), width = width - 2 * bWidth;
Math.round(color[2] * 255)); height = height - 2 * bWidth;
cstyle.borderWidth = bWidth + 'px';
var color = item.color;
if (drawBorder && color) {
cstyle.borderStyle = 'solid';
cstyle.borderColor = Util.makeCssRgb(Math.round(color[0] * 255),
Math.round(color[1] * 255),
Math.round(color[2] * 255));
}
}
cstyle.width = width + 'px';
cstyle.height = height + 'px';
var highlight = document.createElement('div'); var highlight = document.createElement('div');
highlight.className = 'annotationHighlight'; highlight.className = 'annotationHighlight';
@ -6395,7 +6396,11 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
} }
function getHtmlElementForTextWidgetAnnotation(item, commonObjs) { function getHtmlElementForTextWidgetAnnotation(item, commonObjs) {
var element = getEmptyContainer('div', item.rect, 0); var element = document.createElement('div');
var width = item.rect[2] - item.rect[0];
var height = item.rect[3] - item.rect[1];
element.style.width = width + 'px';
element.style.height = height + 'px';
element.style.display = 'table'; element.style.display = 'table';
var content = document.createElement('div'); var content = document.createElement('div');
@ -6425,7 +6430,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
rect[2] = rect[0] + (rect[3] - rect[1]); // make it square rect[2] = rect[0] + (rect[3] - rect[1]); // make it square
} }
var container = initContainer(item); var container = initContainer(item, false);
container.className = 'annotText'; container.className = 'annotText';
var image = document.createElement('img'); var image = document.createElement('img');
@ -6534,12 +6539,9 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
} }
function getHtmlElementForLinkAnnotation(item) { function getHtmlElementForLinkAnnotation(item) {
var container = initContainer(item); var container = initContainer(item, true);
container.className = 'annotLink'; container.className = 'annotLink';
container.style.borderColor = item.colorCssRgb;
container.style.borderStyle = 'solid';
var link = document.createElement('a'); var link = document.createElement('a');
link.href = link.title = item.url || ''; link.href = link.title = item.url || '';
@ -11063,12 +11065,26 @@ var Annotation = (function AnnotationClosure() {
data.annotationFlags = dict.get('F'); data.annotationFlags = dict.get('F');
var color = dict.get('C'); var color = dict.get('C');
if (isArray(color) && color.length === 3) { if (!color) {
// TODO(mack): currently only supporting rgb; need support different // The PDF spec does not mention how a missing color array is interpreted.
// colorspaces // Adobe Reader seems to default to black in this case.
data.color = color;
} else {
data.color = [0, 0, 0]; data.color = [0, 0, 0];
} else if (isArray(color)) {
switch (color.length) {
case 0:
// Empty array denotes transparent border.
data.color = null;
break;
case 1:
// TODO: implement DeviceGray
break;
case 3:
data.color = color;
break;
case 4:
// TODO: implement DeviceCMYK
break;
}
} }
// Some types of annotations have border style dict which has more // Some types of annotations have border style dict which has more
@ -11085,7 +11101,7 @@ var Annotation = (function AnnotationClosure() {
if (data.borderWidth > 0 && dashArray) { if (data.borderWidth > 0 && dashArray) {
if (!isArray(dashArray)) { if (!isArray(dashArray)) {
// Ignore the border if dashArray is not actually an array, // Ignore the border if dashArray is not actually an array,
// this is consistent with the behaviour in Adobe Reader. // this is consistent with the behaviour in Adobe Reader.
data.borderWidth = 0; data.borderWidth = 0;
} else { } else {
var dashArrayLength = dashArray.length; var dashArrayLength = dashArray.length;

58
build/pdf.js
Unescape View File

@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {}; (typeof window !== 'undefined' ? window : this).PDFJS = {};
} }
PDFJS.version = '1.0.1017'; PDFJS.version = '1.0.1019';
PDFJS.build = 'a17735d'; PDFJS.build = '6e994b1';
(function pdfjsWrapper() { (function pdfjsWrapper() {
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
@ -6405,26 +6405,27 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
style.fontFamily = fontFamily + fallbackName; style.fontFamily = fontFamily + fallbackName;
} }
// TODO(mack): Remove this, it's not really that helpful. function initContainer(item, drawBorder) {
function getEmptyContainer(tagName, rect, borderWidth) { var container = document.createElement('section');
var bWidth = borderWidth || 0; var cstyle = container.style;
var element = document.createElement(tagName); var width = item.rect[2] - item.rect[0];
element.style.borderWidth = bWidth + 'px'; var height = item.rect[3] - item.rect[1];
var width = rect[2] - rect[0] - 2 * bWidth;
var height = rect[3] - rect[1] - 2 * bWidth; var bWidth = item.borderWidth || 0;
element.style.width = width + 'px'; if (bWidth) {
element.style.height = height + 'px'; width = width - 2 * bWidth;
return element; height = height - 2 * bWidth;
} cstyle.borderWidth = bWidth + 'px';
var color = item.color;
function initContainer(item) { if (drawBorder && color) {
var container = getEmptyContainer('section', item.rect, item.borderWidth); cstyle.borderStyle = 'solid';
container.style.backgroundColor = item.color; cstyle.borderColor = Util.makeCssRgb(Math.round(color[0] * 255),
Math.round(color[1] * 255),
var color = item.color; Math.round(color[2] * 255));
item.colorCssRgb = Util.makeCssRgb(Math.round(color[0] * 255), }
Math.round(color[1] * 255), }
Math.round(color[2] * 255)); cstyle.width = width + 'px';
cstyle.height = height + 'px';
var highlight = document.createElement('div'); var highlight = document.createElement('div');
highlight.className = 'annotationHighlight'; highlight.className = 'annotationHighlight';
@ -6439,7 +6440,11 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
} }
function getHtmlElementForTextWidgetAnnotation(item, commonObjs) { function getHtmlElementForTextWidgetAnnotation(item, commonObjs) {
var element = getEmptyContainer('div', item.rect, 0); var element = document.createElement('div');
var width = item.rect[2] - item.rect[0];
var height = item.rect[3] - item.rect[1];
element.style.width = width + 'px';
element.style.height = height + 'px';
element.style.display = 'table'; element.style.display = 'table';
var content = document.createElement('div'); var content = document.createElement('div');
@ -6469,7 +6474,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
rect[2] = rect[0] + (rect[3] - rect[1]); // make it square rect[2] = rect[0] + (rect[3] - rect[1]); // make it square
} }
var container = initContainer(item); var container = initContainer(item, false);
container.className = 'annotText'; container.className = 'annotText';
var image = document.createElement('img'); var image = document.createElement('img');
@ -6578,12 +6583,9 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
} }
function getHtmlElementForLinkAnnotation(item) { function getHtmlElementForLinkAnnotation(item) {
var container = initContainer(item); var container = initContainer(item, true);
container.className = 'annotLink'; container.className = 'annotLink';
container.style.borderColor = item.colorCssRgb;
container.style.borderStyle = 'solid';
var link = document.createElement('a'); var link = document.createElement('a');
link.href = link.title = item.url || ''; link.href = link.title = item.url || '';

30
build/pdf.worker.js vendored
Unescape View File

@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {}; (typeof window !== 'undefined' ? window : this).PDFJS = {};
} }
PDFJS.version = '1.0.1017'; PDFJS.version = '1.0.1019';
PDFJS.build = 'a17735d'; PDFJS.build = '6e994b1';
(function pdfjsWrapper() { (function pdfjsWrapper() {
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
@ -4935,12 +4935,26 @@ var Annotation = (function AnnotationClosure() {
data.annotationFlags = dict.get('F'); data.annotationFlags = dict.get('F');
var color = dict.get('C'); var color = dict.get('C');
if (isArray(color) && color.length === 3) { if (!color) {
// TODO(mack): currently only supporting rgb; need support different // The PDF spec does not mention how a missing color array is interpreted.
// colorspaces // Adobe Reader seems to default to black in this case.
data.color = color;
} else {
data.color = [0, 0, 0]; data.color = [0, 0, 0];
} else if (isArray(color)) {
switch (color.length) {
case 0:
// Empty array denotes transparent border.
data.color = null;
break;
case 1:
// TODO: implement DeviceGray
break;
case 3:
data.color = color;
break;
case 4:
// TODO: implement DeviceCMYK
break;
}
} }
// Some types of annotations have border style dict which has more // Some types of annotations have border style dict which has more
@ -4957,7 +4971,7 @@ var Annotation = (function AnnotationClosure() {
if (data.borderWidth > 0 && dashArray) { if (data.borderWidth > 0 && dashArray) {
if (!isArray(dashArray)) { if (!isArray(dashArray)) {
// Ignore the border if dashArray is not actually an array, // Ignore the border if dashArray is not actually an array,
// this is consistent with the behaviour in Adobe Reader. // this is consistent with the behaviour in Adobe Reader.
data.borderWidth = 0; data.borderWidth = 0;
} else { } else {
var dashArrayLength = dashArray.length; var dashArrayLength = dashArray.length;

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "1.0.1017", "version": "1.0.1019",
"description": "Generic build of Mozilla's PDF.js library.", "description": "Generic build of Mozilla's PDF.js library.",
"keywords": [ "keywords": [
"Mozilla", "Mozilla",

Write Preview
Loading…
Cancel
Save