deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправки багов

Browse Source
This commit is contained in:
Book Pauk
2020-11-04 22:23:39 +07:00
parent 94b8f9fe1c
commit 1d8bd56862
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
View File

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

13
client/components/ExternalLibs/ExternalLibs.vue
View File

@@ -294,8 +294,13 @@ class ExternalLibs extends Vue {
loadLibs() {
const libs = this.libs;
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);