MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-07 21:03:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #669 from chme/web

Browse Source 
Update player webinterface (v0.4.2)
This commit is contained in:
Christian Meffert
2019-01-23 10:05:50 +01:00
committed by GitHub
parent 99b0b644a9 d0e11457ee
commit 95a92b2fbf
10 changed files with 1298 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/js/forked-daapd.js
View File

@@ -130,7 +130,13 @@ var app = new Vue({
console.log('Websocket disabled');
return;
}
var socket = new WebSocket('ws://' + document.domain + ':' + this.config.websocket_port, 'notify');
var protocol = 'ws://'
if (window.location.protocol === 'https:') {
protocol = 'wss://'
}
var socket = new WebSocket(protocol + document.domain + ':' + this.config.websocket_port, 'notify');
const vm = this;
socket.onopen = function() {
socket.send(JSON.stringify({ notify: ['update', 'pairing', 'spotify', 'lastfm', 'outputs']}));

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

26
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

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

File diff suppressed because it is too large Load Diff

18
web-src/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "forked-daapd-web",
"version": "0.4.1",
"version": "0.4.2",
"description": "forked-daapd web interface",
"author": "chme <christian.meffert@googlemail.com>",
"license": "GPL-2.0",
@@ -15,24 +15,24 @@
"axios": "^0.18.0",
"bulma": "^0.7.1",
"mdi": "^2.1.99",
"moment": "^2.23.0",
"moment": "^2.24.0",
"moment-duration-format": "^2.2.2",
"npm": "^6.5.0",
"npm": "^6.6.0",
"reconnectingwebsocket": "^1.0.0",
"spotify-web-api-js": "^1.1.1",
"vue": "^2.5.21",
"vue": "^2.5.22",
"vue-infinite-loading": "^2.4.3",
"vue-progressbar": "^0.7.4",
"vue-range-slider": "^0.6.0",
"vue-router": "^3.0.2",
"vuedraggable": "^2.17.0",
"vuex": "^3.0.1"
"vuex": "^3.1.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.2.2",
"@vue/cli-plugin-eslint": "^3.2.2",
"@vue/cli-service": "^3.2.3",
"@vue/cli-plugin-babel": "^3.3.0",
"@vue/cli-plugin-eslint": "^3.3.0",
"@vue/cli-service": "^3.3.1",
"@vue/eslint-config-standard": "^3.0.5",
"vue-template-compiler": "^2.5.21"
"vue-template-compiler": "^2.5.22"
}
}

7
web-src/src/App.vue
View File

@@ -86,8 +86,13 @@ export default {
const vm = this
var protocol = 'ws://'
if (window.location.protocol === 'https:') {
protocol = 'wss://'
}
var socket = new ReconnectingWebSocket(
'ws://' + window.location.hostname + ':' + vm.$store.state.config.websocket_port,
protocol + window.location.hostname + ':' + vm.$store.state.config.websocket_port,
'notify',
{ reconnectInterval: 3000 }
)