From 99bcbc288cb1423f11689e0a2d7b6aa4a2a6305b Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 13 Oct 2019 13:16:57 +0200 Subject: [PATCH] fix #1290: generator popup positioning in custom themes --- app/scripts/views/fields/field-view-autocomplete.js | 2 +- app/scripts/views/fields/field-view-date.js | 2 +- app/scripts/views/fields/field-view-tags.js | 2 +- app/scripts/views/fields/field-view-text.js | 2 +- release-notes.md | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/scripts/views/fields/field-view-autocomplete.js b/app/scripts/views/fields/field-view-autocomplete.js index 94d391ba..df95b0fc 100644 --- a/app/scripts/views/fields/field-view-autocomplete.js +++ b/app/scripts/views/fields/field-view-autocomplete.js @@ -17,7 +17,7 @@ class FieldViewAutocomplete extends FieldViewText { startEdit() { super.startEdit(); const fieldRect = this.input[0].getBoundingClientRect(); - const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')); + const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')) || 0; this.autocomplete = $('
').appendTo('body'); this.autocomplete.css({ top: fieldRect.bottom + shadowSpread, diff --git a/app/scripts/views/fields/field-view-date.js b/app/scripts/views/fields/field-view-date.js index 1eb9feb3..bd636f87 100644 --- a/app/scripts/views/fields/field-view-date.js +++ b/app/scripts/views/fields/field-view-date.js @@ -42,7 +42,7 @@ class FieldViewDate extends FieldViewText { adjustPickerPosition(...args) { window.Pikaday = Pikaday; Pikaday.prototype.adjustPosition.apply(this.picker, args); - const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')); + const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')) || 0; if (shadowSpread) { const isOnTop = this.picker.el.classList.contains('top-aligned'); const offset = isOnTop ? -shadowSpread : shadowSpread; diff --git a/app/scripts/views/fields/field-view-tags.js b/app/scripts/views/fields/field-view-tags.js index eade2980..f6fb4b48 100644 --- a/app/scripts/views/fields/field-view-tags.js +++ b/app/scripts/views/fields/field-view-tags.js @@ -41,7 +41,7 @@ class FieldViewTags extends FieldViewText { startEdit() { super.startEdit(); const fieldRect = this.input[0].getBoundingClientRect(); - const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')); + const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')) || 0; this.tagsAutocomplete = $('
').appendTo( 'body' ); diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js index 55b8b25d..7c622bfb 100644 --- a/app/scripts/views/fields/field-view-text.js +++ b/app/scripts/views/fields/field-view-text.js @@ -102,7 +102,7 @@ class FieldViewText extends FieldView { this.hideGenerator(); } else { const fieldRect = this.input[0].getBoundingClientRect(); - const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')); + const shadowSpread = parseInt(this.input.css('--focus-shadow-spread')) || 0; this.gen = new GeneratorView({ pos: { left: fieldRect.left, top: fieldRect.bottom + shadowSpread }, password: this.value diff --git a/release-notes.md b/release-notes.md index a539b1be..1b062909 100644 --- a/release-notes.md +++ b/release-notes.md @@ -2,6 +2,7 @@ Release notes ------------- ##### v1.11.9 (TBD) `-` fix #1300: selecting auto-type sequence items issues +`-` fix #1290: generator popup positioning in custom themes ##### v1.11.8 (2019-10-11) `-` fix #1292: macOS app notarization