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

PDF.js version 1.5.274 - See mozilla/pdf.js@c55541f1f375e6bcfe18ab0a023de6610d5c83d7

master v1.5.274
Pdf Bot 9 years ago
parent
6198feb36c
commit
d0e9b3007c
5 changed files with 94 additions and 46 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. 66
      build/pdf.combined.js
  3. 4
      build/pdf.js
  4. 66
      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.5.272", "version": "1.5.274",
"main": [ "main": [
"build/pdf.js", "build/pdf.js",
"build/pdf.worker.js" "build/pdf.worker.js"

66
build/pdf.combined.js
Unescape View File

@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {}));
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
'use strict'; 'use strict';
var pdfjsVersion = '1.5.272'; var pdfjsVersion = '1.5.274';
var pdfjsBuild = '47b929b'; var pdfjsBuild = 'c55541f';
var pdfjsFilePath = var pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ? typeof document !== 'undefined' && document.currentScript ?
@ -48513,28 +48513,49 @@ var Annotation = (function AnnotationClosure() {
} }
Annotation.prototype = { Annotation.prototype = {
/**
* @private
*/
_hasFlag: function Annotation_hasFlag(flags, flag) {
return !!(flags & flag);
},
/**
* @private
*/
_isViewable: function Annotation_isViewable(flags) {
return !this._hasFlag(flags, AnnotationFlag.INVISIBLE) &&
!this._hasFlag(flags, AnnotationFlag.HIDDEN) &&
!this._hasFlag(flags, AnnotationFlag.NOVIEW);
},
/**
* @private
*/
_isPrintable: function AnnotationFlag_isPrintable(flags) {
return this._hasFlag(flags, AnnotationFlag.PRINT) &&
!this._hasFlag(flags, AnnotationFlag.INVISIBLE) &&
!this._hasFlag(flags, AnnotationFlag.HIDDEN);
},
/** /**
* @return {boolean} * @return {boolean}
*/ */
get viewable() { get viewable() {
if (this.flags) { if (this.flags === 0) {
return !this.hasFlag(AnnotationFlag.INVISIBLE) &&
!this.hasFlag(AnnotationFlag.HIDDEN) &&
!this.hasFlag(AnnotationFlag.NOVIEW);
}
return true; return true;
}
return this._isViewable(this.flags);
}, },
/** /**
* @return {boolean} * @return {boolean}
*/ */
get printable() { get printable() {
if (this.flags) { if (this.flags === 0) {
return this.hasFlag(AnnotationFlag.PRINT) &&
!this.hasFlag(AnnotationFlag.INVISIBLE) &&
!this.hasFlag(AnnotationFlag.HIDDEN);
}
return false; return false;
}
return this._isPrintable(this.flags);
}, },
/** /**
@ -48547,11 +48568,7 @@ var Annotation = (function AnnotationClosure() {
* @see {@link shared/util.js} * @see {@link shared/util.js}
*/ */
setFlags: function Annotation_setFlags(flags) { setFlags: function Annotation_setFlags(flags) {
if (isInt(flags)) { this.flags = (isInt(flags) && flags > 0) ? flags : 0;
this.flags = flags;
} else {
this.flags = 0;
}
}, },
/** /**
@ -48565,10 +48582,7 @@ var Annotation = (function AnnotationClosure() {
* @see {@link shared/util.js} * @see {@link shared/util.js}
*/ */
hasFlag: function Annotation_hasFlag(flag) { hasFlag: function Annotation_hasFlag(flag) {
if (this.flags) { return this._hasFlag(this.flags, flag);
return (this.flags & flag) > 0;
}
return false;
}, },
/** /**
@ -49146,6 +49160,16 @@ var PopupAnnotation = (function PopupAnnotationClosure() {
this.setColor(parentItem.getArray('C')); this.setColor(parentItem.getArray('C'));
this.data.color = this.color; this.data.color = this.color;
} }
// If the Popup annotation is not viewable, but the parent annotation is,
// that is most likely a bug. Fallback to inherit the flags from the parent
// annotation (this is consistent with the behaviour in Adobe Reader).
if (!this.viewable) {
var parentFlags = parentItem.get('F');
if (this._isViewable(parentFlags)) {
this.setFlags(parentFlags);
}
}
} }
Util.inherit(PopupAnnotation, Annotation, {}); Util.inherit(PopupAnnotation, Annotation, {});

4
build/pdf.js
Unescape View File

@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdf = {}));
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
'use strict'; 'use strict';
var pdfjsVersion = '1.5.272'; var pdfjsVersion = '1.5.274';
var pdfjsBuild = '47b929b'; var pdfjsBuild = 'c55541f';
var pdfjsFilePath = var pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ? typeof document !== 'undefined' && document.currentScript ?

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

@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfWorker = {}));
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
'use strict'; 'use strict';
var pdfjsVersion = '1.5.272'; var pdfjsVersion = '1.5.274';
var pdfjsBuild = '47b929b'; var pdfjsBuild = 'c55541f';
var pdfjsFilePath = var pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ? typeof document !== 'undefined' && document.currentScript ?
@ -40172,28 +40172,49 @@ var Annotation = (function AnnotationClosure() {
} }
Annotation.prototype = { Annotation.prototype = {
/**
* @private
*/
_hasFlag: function Annotation_hasFlag(flags, flag) {
return !!(flags & flag);
},
/**
* @private
*/
_isViewable: function Annotation_isViewable(flags) {
return !this._hasFlag(flags, AnnotationFlag.INVISIBLE) &&
!this._hasFlag(flags, AnnotationFlag.HIDDEN) &&
!this._hasFlag(flags, AnnotationFlag.NOVIEW);
},
/**
* @private
*/
_isPrintable: function AnnotationFlag_isPrintable(flags) {
return this._hasFlag(flags, AnnotationFlag.PRINT) &&
!this._hasFlag(flags, AnnotationFlag.INVISIBLE) &&
!this._hasFlag(flags, AnnotationFlag.HIDDEN);
},
/** /**
* @return {boolean} * @return {boolean}
*/ */
get viewable() { get viewable() {
if (this.flags) { if (this.flags === 0) {
return !this.hasFlag(AnnotationFlag.INVISIBLE) &&
!this.hasFlag(AnnotationFlag.HIDDEN) &&
!this.hasFlag(AnnotationFlag.NOVIEW);
}
return true; return true;
}
return this._isViewable(this.flags);
}, },
/** /**
* @return {boolean} * @return {boolean}
*/ */
get printable() { get printable() {
if (this.flags) { if (this.flags === 0) {
return this.hasFlag(AnnotationFlag.PRINT) &&
!this.hasFlag(AnnotationFlag.INVISIBLE) &&
!this.hasFlag(AnnotationFlag.HIDDEN);
}
return false; return false;
}
return this._isPrintable(this.flags);
}, },
/** /**
@ -40206,11 +40227,7 @@ var Annotation = (function AnnotationClosure() {
* @see {@link shared/util.js} * @see {@link shared/util.js}
*/ */
setFlags: function Annotation_setFlags(flags) { setFlags: function Annotation_setFlags(flags) {
if (isInt(flags)) { this.flags = (isInt(flags) && flags > 0) ? flags : 0;
this.flags = flags;
} else {
this.flags = 0;
}
}, },
/** /**
@ -40224,10 +40241,7 @@ var Annotation = (function AnnotationClosure() {
* @see {@link shared/util.js} * @see {@link shared/util.js}
*/ */
hasFlag: function Annotation_hasFlag(flag) { hasFlag: function Annotation_hasFlag(flag) {
if (this.flags) { return this._hasFlag(this.flags, flag);
return (this.flags & flag) > 0;
}
return false;
}, },
/** /**
@ -40805,6 +40819,16 @@ var PopupAnnotation = (function PopupAnnotationClosure() {
this.setColor(parentItem.getArray('C')); this.setColor(parentItem.getArray('C'));
this.data.color = this.color; this.data.color = this.color;
} }
// If the Popup annotation is not viewable, but the parent annotation is,
// that is most likely a bug. Fallback to inherit the flags from the parent
// annotation (this is consistent with the behaviour in Adobe Reader).
if (!this.viewable) {
var parentFlags = parentItem.get('F');
if (this._isViewable(parentFlags)) {
this.setFlags(parentFlags);
}
}
} }
Util.inherit(PopupAnnotation, Annotation, {}); Util.inherit(PopupAnnotation, Annotation, {});

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "1.5.272", "version": "1.5.274",
"main": "build/pdf.js", "main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.", "description": "Generic build of Mozilla's PDF.js library.",
"keywords": [ "keywords": [

Write Preview
Loading…
Cancel
Save