From 011d1d52606da88622ade6d84e158e86499b220f Mon Sep 17 00:00:00 2001 From: korelstar Date: Fri, 17 Jul 2020 18:17:50 +0200 Subject: [PATCH 1/2] fix note refresh for unsaved changes --- src/components/Note.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Note.vue b/src/components/Note.vue index fadf9584f..d01dd3252 100644 --- a/src/components/Note.vue +++ b/src/components/Note.vue @@ -242,6 +242,10 @@ export default { }, refreshNote() { + if (this.note.unsaved) { + this.startRefreshTimer() + return + } refreshNote(parseInt(this.noteId), this.etag).then(etag => { if (etag) { this.etag = etag From b462ae8211c6ff773bf203b20b5f7420cc5aea11 Mon Sep 17 00:00:00 2001 From: korelstar Date: Fri, 17 Jul 2020 18:28:52 +0200 Subject: [PATCH 2/2] don't fail on deprecated use (PHAN) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 200336c3d..a33b1d6e2 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ lint-php-ncversion: lint-php-phan: # PHAN - vendor/bin/phan --allow-polyfill-parser -k tests/phan-config.php --no-progress-bar -m checkstyle | vendor/bin/cs2pr --colorize + vendor/bin/phan --allow-polyfill-parser -k tests/phan-config.php --no-progress-bar -m checkstyle | vendor/bin/cs2pr --graceful-warnings --colorize lint-php-phpcs: # PHP CodeSniffer