MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-25 22:55:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #758 from chme/web_update

Browse Source 
[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/player/js/app.js
View File

File diff suppressed because one or more lines are too long

2
htdocs/player/js/app.js.map
View File

File diff suppressed because one or more lines are too long

108
htdocs/player/js/chunk-vendors.js
View File

File diff suppressed because one or more lines are too long

2
htdocs/player/js/chunk-vendors.js.map
View File

File diff suppressed because one or more lines are too long

568
web-src/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
web-src/package.json
View File

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

7
web-src/src/components/PlayerButtonPlayPause.vue
View File

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

2
web-src/src/pages/PageQueue.vue
View File

@ -47,7 +47,7 @@
</div> </div>
</template> </template>
<template slot="content"> <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" <list-item-queue-item v-for="(item, index) in queue_items"
:key="item.id" :item="item" :position="index" :key="item.id" :item="item" :position="index"
:current_position="current_position" :current_position="current_position"