From 9e227de3c5a7586e09509ac118dcda28656afb88 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Thu, 30 Jan 2025 13:38:57 +0100 Subject: [PATCH] Use fewer `hasFieldFlag` calls in the `src/core/annotation.js` file We lookup a number of field-flags multiple times, which seems unnecessary. --- src/core/annotation.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/core/annotation.js b/src/core/annotation.js index 75d8b5c1a..f34dc4896 100644 --- a/src/core/annotation.js +++ b/src/core/annotation.js @@ -2774,8 +2774,8 @@ class TextWidgetAnnotation extends WidgetAnnotation { this.data.multiLine = this.hasFieldFlag(AnnotationFieldFlag.MULTILINE); this.data.comb = this.hasFieldFlag(AnnotationFieldFlag.COMB) && - !this.hasFieldFlag(AnnotationFieldFlag.MULTILINE) && - !this.hasFieldFlag(AnnotationFieldFlag.PASSWORD) && + !this.data.multiLine && + !this.data.password && !this.hasFieldFlag(AnnotationFieldFlag.FILESELECT) && this.data.maxLen !== 0; this.data.doNotScroll = this.hasFieldFlag(AnnotationFieldFlag.DONOTSCROLL); @@ -2986,13 +2986,12 @@ class ButtonWidgetAnnotation extends WidgetAnnotation { this.checkedAppearance = null; this.uncheckedAppearance = null; - this.data.checkBox = - !this.hasFieldFlag(AnnotationFieldFlag.RADIO) && - !this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON); - this.data.radioButton = - this.hasFieldFlag(AnnotationFieldFlag.RADIO) && - !this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON); - this.data.pushButton = this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON); + const isRadio = this.hasFieldFlag(AnnotationFieldFlag.RADIO), + isPushButton = this.hasFieldFlag(AnnotationFieldFlag.PUSHBUTTON); + + this.data.checkBox = !isRadio && !isPushButton; + this.data.radioButton = isRadio && !isPushButton; + this.data.pushButton = isPushButton; this.data.isTooltipOnly = false; if (this.data.checkBox) {