mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Button widget annotations: improve unit tests, simplify code and remove labels

Browse source 
Modern browsers support styling radio buttons and checkboxes with CSS.
This makes the implementation much easier, and the fallback for older
browsers is still decent.
This commit is contained in:
Tim van der Meij 2016-12-15 23:49:46 +01:00
parent 77148c7880
commit a428899b3c
5 changed files with 88 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/annotation.js
View file

@ -773,17 +773,18 @@ var ButtonWidgetAnnotation = (function ButtonWidgetAnnotationClosure() {
function ButtonWidgetAnnotation(params) {
WidgetAnnotation.call(this, params);
this.data.pushbutton = this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON);
this.data.radio = !this.data.pushbutton &&
this.hasFieldFlag(AnnotationFieldFlag.RADIO);
if (isName(this.data.fieldValue)) {
this.data.checkBox = !this.hasFieldFlag(AnnotationFieldFlag.RADIO) &&
!this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON);
if (this.data.checkBox) {
if (!isName(this.data.fieldValue)) {
return;
}
this.data.fieldValue = this.data.fieldValue.name;
} else {
warn('Button widget annotation: field value is not a `Name` object.');
}
if (this.data.radio) {
this.data.radioButton = this.hasFieldFlag(AnnotationFieldFlag.RADIO) &&
!this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON);
if (this.data.radioButton) {
this.data.fieldValue = this.data.buttonValue = null;
// The parent field's `V` entry holds a `Name` object with the appearance
@ -831,7 +832,7 @@ var ButtonWidgetAnnotation = (function ButtonWidgetAnnotationClosure() {
if (this.appearance) {
return Annotation.prototype.getOperatorList.call(this, evaluator, task,
renderForms);
renderForms);
}
return Promise.resolve(operatorList);
}

33
src/display/annotation_layer.js
View file

@ -77,14 +77,12 @@ AnnotationElementFactory.prototype =
case 'Tx':
return new TextWidgetAnnotationElement(parameters);
case 'Btn':
if (!parameters.data.pushbutton) {
if (parameters.data.radio) {
return new RadioButtonWidgetAnnotationElement(parameters);
} else {
return new CheckboxWidgetAnnotationElement(parameters);
}
if (parameters.data.radioButton) {
return new RadioButtonWidgetAnnotationElement(parameters);
} else if (parameters.data.checkBox) {
return new CheckboxWidgetAnnotationElement(parameters);
} else {
warn('Unimplemented push button');
warn('Unimplemented button widget annotation: pushbutton');
}
break;
case 'Ch':
@ -152,7 +150,6 @@ var AnnotationElement = (function AnnotationElementClosure() {
var height = data.rect[3] - data.rect[1];
container.setAttribute('data-annotation-id', data.id);
container.setAttribute('data-annotation-name', data.fieldName);
// Do *not* modify `data.rect`, since that will corrupt the annotation
// position on subsequent calls to `_createContainer` (see issue 6804).
@ -568,15 +565,11 @@ var CheckboxWidgetAnnotationElement =
var element = document.createElement('input');
element.disabled = this.data.readOnly;
element.type = 'checkbox';
element.id = this.data.fieldName;
if (this.data.fieldValue && this.data.fieldValue !== 'Off') {
element.checked = true;
element.setAttribute('checked', true);
}
this.container.appendChild(element);
element = document.createElement('label');
element.htmlFor = this.data.fieldName;
this.container.appendChild(element);
this.container.appendChild(element);
return this.container;
}
});
@ -608,22 +601,16 @@ var RadioButtonWidgetAnnotationElement =
this.container.className = 'buttonWidgetAnnotation radioButton';
var element = document.createElement('input');
var id = this.data.fieldName + '.' + this.data.buttonValue;
element.disabled = this.data.readOnly;
element.type = 'radio';
element.id = id;
element.name = this.data.fieldName;
element.value = this.data.buttonValue;
if (this.data.fieldValue === this.data.buttonValue) {
element.checked = true;
element.setAttribute('checked', true);
}
this.container.appendChild(element);
element = document.createElement('label');
element.htmlFor = id;
this.container.appendChild(element);
this.container.appendChild(element);
return this.container;
},
}
});
return RadioButtonWidgetAnnotationElement;