Commit c4b6f384 authored by shturnev's avatar shturnev

Merge branch 'hotfix/1.0.4'

parents 8374dc42 6e84856f
Pipeline #144506091 failed with stages
in 7 minutes and 52 seconds
......@@ -88,7 +88,7 @@
<!--open media item-->
<div class="opened-media-cont column" v-if="Object.keys(showingItem).length">
<Pano :type="showingItem.type" :source="`${static_files_url}big/${showingItem.bigName}`"/>
<Pano :type="showingItem.type" :source="`${static_files_url}big/${showingItem.bigName}`"/>
<div class="head-actions">
<q-btn
@click="showingItem ={}"
......@@ -109,7 +109,7 @@
size="28px" flat color="grey-7" text-color="grey-4" icon="arrow_forward_ios"/>
</div>
<div class="bottom-actions">
<q-icon @click="beforeDelete(showingItem)" class="btn" name="delete_outline" color="white" size="27px" />
<q-icon @click="beforeDelete(showingItem)" class="btn" name="delete_outline" color="white" size="27px"/>
</div>
</div>
......@@ -153,11 +153,17 @@
<br>
<div class="text-center">
v{{configData.version}}
<a class="text-secondary" href=""
@click.prevent="openExternalLink('https://gitlab.com/go-apps-XnjRcS/vr-viewer-for-linux/electron-version/-/blob/master/CHANGELOG.md')">see
the list of changes</a>.
<br>
Created by
<a class="text-secondary" href=""
@click.prevent="openExternalLink('https://www.facebook.com/sergey.shturnev')">
Shturnev Sergey
</a>
Shturnev Sergey</a>
</div>
......@@ -297,35 +303,38 @@
this.$set(this.items[index], 'selected', status)
})
},
clearSelected(){
clearSelected() {
this.items = this.items.filter(item => !item.selected);
},
beforeDelete(item = null) {
if(item){
this.toggleSelection(item, item.index)
if (item) {
this.toggleSelection(this.items[item.index], item.index)
}
this.$q.dialog({
title: 'Delete?',
message: `Would you like to delete
${this.total_selected > 1 ? 'these ('+ this.total_selected + ') files': 'this file'}`,
${this.total_selected > 1 ? 'these (' + this.total_selected + ') files' : 'this file'}`,
cancel: true,
persistent: true,
dark: true,
color: 'white'
}).onOk(() => {
if(item){
if(this.items[item.index + 1]){
this.showItem(this.items[item.index + 1], item.index + 1)
}else if(this.items[item.index - 1]){
this.showItem(this.items[item.index - 1], item.index - 1)
}else{
this.showingItem = {}
}
if (item) {
if (this.items[item.index + 1]) {
this.showItem(this.items[item.index + 1], item.index + 1)
} else if (this.items[item.index - 1]) {
this.showItem(this.items[item.index - 1], item.index - 1)
} else {
this.showingItem = {}
}
}
this.deleteFiles()
}).onCancel(() => {
if(item){
this.toggleSelection(this.items[item.index], item.index)
}
})
},
deleteFiles() {
......@@ -391,7 +400,7 @@
let ver = data.filename_orig.split("_")[1];
this.$q.notify({
message: `<div class="text-subtitle1">New version released <b>v${ver}</b>.</div>
message: `<div class="text-subtitle1">New version released <b>v${ver}</b></div>
<div class="">Installed v${this.configData.version}</div>`,
multiLine: true,
html: true,
......@@ -525,14 +534,15 @@
right: 0;
top: 0;
}
&>.bottom-actions{
& > .bottom-actions {
display: flex;
position: absolute;
bottom: 8px;
right: 97px;
&>.btn{
&:hover{
& > .btn {
&:hover {
cursor: pointer;
filter: drop-shadow(white 0 0 5px);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment