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

Merge pull request #6178 from timvandermeij/remove-interactive-annotation

Browse Source 
Remove InteractiveAnnotation abstraction
This commit is contained in:
Jonas Jenwald 2015-07-06 16:29:09 +02:00
commit 9e08737f4e
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/annotation.js
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
/* globals PDFJS, Util, isDict, isName, stringToPDFString, warn, Dict, Stream, /* globals PDFJS, Util, isDict, isName, stringToPDFString, warn, Dict, Stream,
stringToBytes, assert, Promise, isArray, ObjectLoader, OperatorList, stringToBytes, Promise, isArray, ObjectLoader, OperatorList,
isValidUrl, OPS, createPromiseCapability, AnnotationType, isValidUrl, OPS, createPromiseCapability, AnnotationType,
stringToUTF8String, AnnotationBorderStyleType */ stringToUTF8String, AnnotationBorderStyleType */
@ -570,21 +570,9 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() {
return TextWidgetAnnotation; return TextWidgetAnnotation;
})(); })();
var InteractiveAnnotation = (function InteractiveAnnotationClosure() {
function InteractiveAnnotation(params) {
Annotation.call(this, params);
this.data.hasHtml = true;
}
Util.inherit(InteractiveAnnotation, Annotation, { });
return InteractiveAnnotation;
})();
var TextAnnotation = (function TextAnnotationClosure() { var TextAnnotation = (function TextAnnotationClosure() {
function TextAnnotation(params) { function TextAnnotation(params) {
InteractiveAnnotation.call(this, params); Annotation.call(this, params);
var dict = params.dict; var dict = params.dict;
var data = this.data; var data = this.data;
@ -594,6 +582,7 @@ var TextAnnotation = (function TextAnnotationClosure() {
data.annotationType = AnnotationType.TEXT; data.annotationType = AnnotationType.TEXT;
data.content = stringToPDFString(content || ''); data.content = stringToPDFString(content || '');
data.title = stringToPDFString(title || ''); data.title = stringToPDFString(title || '');
data.hasHtml = true;
if (data.hasAppearance) { if (data.hasAppearance) {
data.name = 'NoIcon'; data.name = 'NoIcon';
@ -608,18 +597,19 @@ var TextAnnotation = (function TextAnnotationClosure() {
} }
} }
Util.inherit(TextAnnotation, InteractiveAnnotation, { }); Util.inherit(TextAnnotation, Annotation, { });
return TextAnnotation; return TextAnnotation;
})(); })();
var LinkAnnotation = (function LinkAnnotationClosure() { var LinkAnnotation = (function LinkAnnotationClosure() {
function LinkAnnotation(params) { function LinkAnnotation(params) {
InteractiveAnnotation.call(this, params); Annotation.call(this, params);
var dict = params.dict; var dict = params.dict;
var data = this.data; var data = this.data;
data.annotationType = AnnotationType.LINK; data.annotationType = AnnotationType.LINK;
data.hasHtml = true;
var action = dict.get('A'); var action = dict.get('A');
if (action && isDict(action)) { if (action && isDict(action)) {
@ -683,7 +673,7 @@ var LinkAnnotation = (function LinkAnnotationClosure() {
return url; return url;
} }
Util.inherit(LinkAnnotation, InteractiveAnnotation, { }); Util.inherit(LinkAnnotation, Annotation, { });
return LinkAnnotation; return LinkAnnotation;
})(); })();