mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop 

# Conflicts:
#	release-notes.md
pull/1348/head
antelle 2019-10-13 23:27:52 +02:00
parent e866bac25a 2c9c8b9ab4
commit 57af428b9e
9 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/views/fields/field-view-autocomplete.js
View File

@ -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 = $('<div class="details__field-autocomplete"></div>').appendTo('body');
this.autocomplete.css({
top: fieldRect.bottom + shadowSpread,

2
app/scripts/views/fields/field-view-date.js
View File

@ -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;

2
app/scripts/views/fields/field-view-tags.js
View File

@ -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 = $('<div class="details__field-autocomplete"></div>').appendTo(
'body'
);

2
app/scripts/views/fields/field-view-text.js
View File

@ -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

2
desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.11.8",
"version": "1.11.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
desktop/package.json
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.11.8",
"version": "1.11.9",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.11.8",
"version": "1.11.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.11.8",
"version": "1.11.9",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,

3
release-notes.md
View File

@ -9,8 +9,9 @@ Release notes
`+` #480: option to launch the app minimized
`-` fix #1273: untranslated menu items
##### v1.11.9 (TBD)
##### v1.11.9 (2019-10-13)
`-` 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