Merge pull request #758 from chme/web_update

[htdocs] Update player web interface
This commit is contained in:
Christian Meffert 2019-06-17 22:00:32 +02:00 committed by GitHub
commit 795da5059d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 416 additions and 289 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "forked-daapd-web",
"version": "0.5.2",
"version": "0.5.3",
"description": "forked-daapd web interface",
"author": "chme <christian.meffert@googlemail.com>",
"license": "GPL-2.0",
@ -12,17 +12,17 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.18.0",
"axios": "^0.19.0",
"bulma": "^0.7.5",
"mdi": "^2.1.99",
"mdi": "^2.2.43",
"moment": "^2.24.0",
"moment-duration-format": "^2.2.2",
"moment-duration-format": "^2.3.2",
"npm": "^6.9.0",
"reconnectingwebsocket": "^1.0.0",
"spotify-web-api-js": "^1.2.0",
"vue": "^2.6.10",
"vue-infinite-loading": "^2.4.4",
"vue-progressbar": "^0.7.4",
"vue-progressbar": "^0.7.5",
"vue-range-slider": "^0.6.0",
"vue-router": "^3.0.6",
"vuedraggable": "^2.21.0",
@ -31,8 +31,8 @@
"devDependencies": {
"@vue/cli-plugin-babel": "^3.8.0",
"@vue/cli-plugin-eslint": "^3.8.0",
"@vue/cli-service": "^3.8.0",
"@vue/eslint-config-standard": "^3.0.5",
"@vue/cli-service": "^3.8.4",
"@vue/eslint-config-standard": "^4.0.0",
"vue-template-compiler": "^2.6.10"
}
}

View File

@ -18,10 +18,9 @@ export default {
},
is_pause_allowed () {
return this.$store.getters.now_playing &&
(this.$store.getters.now_playing.data_kind === 'file' ||
((this.$store.getters.now_playing.data_kind === 'url' && this.$store.state.player.item_length_ms !== 0) && this.$store.getters.now_playing.data_kind !== 'pipe')
)
return (this.$store.getters.now_playing &&
!(this.$store.getters.now_playing.data_kind === 'url' && this.$store.state.player.item_length_ms <= 0) &&
this.$store.getters.now_playing.data_kind !== 'pipe')
}
},

View File

@ -47,7 +47,7 @@
</div>
</template>
<template slot="content">
<draggable v-model="queue_items" :options="{handle:'.handle'}" @end="move_item">
<draggable v-model="queue_items" handle=".handle" @end="move_item">
<list-item-queue-item v-for="(item, index) in queue_items"
:key="item.id" :item="item" :position="index"
:current_position="current_position"