From 1d8bd5686211f2de0af9f1c3948987d97b444a94 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 4 Nov 2020 22:23:39 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookmarkSettings/BookmarkSettings.vue       |  2 +-
 client/components/ExternalLibs/ExternalLibs.vue | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue b/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
index 1dbdfba2..a1ff69cd 100644
--- a/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
+++ b/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
@@ -24,7 +24,7 @@
                     <q-btn class="q-mb-sm" round dense color="blue" icon="la la-minus" @click.stop="delBookmark" size="14px" :disabled="!ticked.length">
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Удалить отмеченные закладки</q-tooltip>
                     </q-btn>
-                    <q-btn class="q-mb-sm" round dense color="blue" icon="la la-edit" @click.stop="editBookmark" size="14px" :disabled="!selected || selected.indexOf('-') < 0">
+                    <q-btn class="q-mb-sm" round dense color="blue" icon="la la-edit" @click.stop="editBookmark" size="14px" :disabled="!selected || selected.indexOf('r-') == 0">
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Редактировать закладку</q-tooltip>
                     </q-btn>
                     <q-btn class="q-mb-sm" round dense color="blue" icon="la la-arrow-up" @click.stop="moveBookmark(false)" size="14px" :disabled="!ticked.length">
diff --git a/client/components/ExternalLibs/ExternalLibs.vue b/client/components/ExternalLibs/ExternalLibs.vue
index 265e8981..e6a61511 100644
--- a/client/components/ExternalLibs/ExternalLibs.vue
+++ b/client/components/ExternalLibs/ExternalLibs.vue
@@ -294,8 +294,13 @@ class ExternalLibs extends Vue {
 
     loadLibs() {
         const libs = this.libs;
-        this.startLink = libs.startLink;
-        this.rootLink = lu.getOrigin(libs.startLink);
+        try {
+            this.startLink = libs.startLink;
+            this.rootLink = lu.getOrigin(libs.startLink);
+        } catch(e) {
+            this.startLink = '';
+            this.rootLink = '';
+        }
 
         this.updateSelectedLink();
     }
@@ -304,7 +309,11 @@ class ExternalLibs extends Vue {
         switch (event.action) {
             case 'setLibs': this.commitLibs(event.data); break;
             case 'setRootLink': this.rootLink = event.data; this.rootLinkInput(); break;
-            case 'setSelectedLink': this.selectedLink = event.data; this.selectedLinkInput(); break;
+            case 'setSelectedLink': 
+                this.selectedLink = event.data;
+                this.rootLink = lu.getOrigin(this.selectedLink);
+                this.selectedLinkInput();
+                break;
             case 'editBookmark': this.addBookmark('edit', event.data.link, event.data.desc); break;
             case 'addBookmark': this.addBookmark('add'); break;
         }
@@ -552,7 +561,7 @@ class ExternalLibs extends Vue {
                 libs.groups[index].list.push({l: link, c: this.bookmarkDesc});
                 this.commitLibs(libs);
             } else if (item.c != this.bookmarkDesc) {
-                if (await this.$root.stdDialog.confirm(`Такая закладка уже существует с другим описанием<br>` +
+                if (await this.$root.stdDialog.confirm(`Такая закладка уже существует с другим описанием.<br>` +
                     `Заменить '${this.$sanitize(item.c)}' на '${this.$sanitize(this.bookmarkDesc)}'?`, ' ')) {
                     item.c = this.bookmarkDesc;
                     this.commitLibs(libs);