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

Merge pull request #6215 from timvandermeij/annotation-border-fixes

Browse Source 
More cleanup regarding annotation border styles
This commit is contained in:
Jonas Jenwald 2015-07-17 22:42:10 +02:00
commit 7065c1b8e9
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/annotation.js
View File

@ -160,7 +160,6 @@ var Annotation = (function AnnotationClosure() {
this.borderStyle.setHorizontalCornerRadius(array[0]); this.borderStyle.setHorizontalCornerRadius(array[0]);
this.borderStyle.setVerticalCornerRadius(array[1]); this.borderStyle.setVerticalCornerRadius(array[1]);
this.borderStyle.setWidth(array[2]); this.borderStyle.setWidth(array[2]);
this.borderStyle.setStyle('S');
if (array.length === 4) { // Dash array available if (array.length === 4) { // Dash array available
this.borderStyle.setDashArray(array[3]); this.borderStyle.setDashArray(array[3]);

6
src/display/annotation_helper.js
View File

@ -45,7 +45,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
style.fontFamily = fontFamily + fallbackName; style.fontFamily = fontFamily + fallbackName;
} }
function initContainer(item, drawBorder) { function initContainer(item) {
var container = document.createElement('section'); var container = document.createElement('section');
var cstyle = container.style; var cstyle = container.style;
var width = item.rect[2] - item.rect[0]; var width = item.rect[2] - item.rect[0];
@ -149,7 +149,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, false); var container = initContainer(item);
container.className = 'annotText'; container.className = 'annotText';
var image = document.createElement('img'); var image = document.createElement('img');
@ -256,7 +256,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
} }
function getHtmlElementForLinkAnnotation(item) { function getHtmlElementForLinkAnnotation(item) {
var container = initContainer(item, true); var container = initContainer(item);
container.className = 'annotLink'; container.className = 'annotLink';
var link = document.createElement('a'); var link = document.createElement('a');

6
test/unit/annotation_layer_spec.js
View File

@ -1,6 +1,6 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
/* globals expect, it, describe, Dict, Annotation, AnnotationBorderStyle, /* globals expect, it, describe, Dict, Name, Annotation, AnnotationBorderStyle,
AnnotationBorderStyleType */ AnnotationBorderStyleType */
'use strict'; 'use strict';
@ -79,9 +79,7 @@ describe('Annotation layer', function() {
it('should set and get a valid style', function() { it('should set and get a valid style', function() {
var borderStyle = new AnnotationBorderStyle(); var borderStyle = new AnnotationBorderStyle();
var dict = new Dict(); borderStyle.setStyle(Name.get('D'));
dict.name = 'D';
borderStyle.setStyle(dict);
expect(borderStyle.style).toEqual(AnnotationBorderStyleType.DASHED); expect(borderStyle.style).toEqual(AnnotationBorderStyleType.DASHED);
}); });