From ae67f8c3db3d55183dc0dd768edd618618dee7f7 Mon Sep 17 00:00:00 2001 From: samcm Date: Mon, 10 Apr 2017 22:20:30 +1000 Subject: [PATCH] Persistent custom server URL --- src/components/application/joinroom.vue | 20 +++++++++++++++----- src/store.js | 13 +++++++++++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/components/application/joinroom.vue b/src/components/application/joinroom.vue index 248f9485..a57b409a 100644 --- a/src/components/application/joinroom.vue +++ b/src/components/application/joinroom.vue @@ -24,7 +24,7 @@
- + @@ -106,7 +106,6 @@ export default { data() { return { selectedServer:'', - customServer: 'https://', serverError: null, roomError: null, room:'', @@ -136,9 +135,9 @@ export default { }, attemptConnectCustom: function(){ var that = this - console.log('Attempting to connect to ' + this.customServer ) + console.log('Attempting to connect to ' + this.CUSTOMSERVER ) this.$store.dispatch('socketConnect',{ - address:this.customServer, + address:this.CUSTOMSERVER, callback:function(data){ if (!data.result){ console.log('Failed to connect') @@ -182,7 +181,18 @@ export default { }, context: function(){ return this.$store - } + }, + CUSTOMSERVER: { + get () { + if (!this.$store.getters.getSettingCUSTOMSERVER){ + return 'http://' + } + return this.$store.getters.getSettingCUSTOMSERVER + }, + set (value) { + this.$store.commit('setSettingCUSTOMSERVER',value) + } + }, }, mounted: function() { // Create event listeners diff --git a/src/store.js b/src/store.js index eb65f411..75ab88c0 100644 --- a/src/store.js +++ b/src/store.js @@ -25,7 +25,8 @@ if(!getSetting('INIT')){ setSetting('CLIENTPOLLINTERVAL',1000) setSetting('DARKMODE',false) setSetting('SYNCMODE','cleanseek') - setSetting('SYNCFLEXABILITY',4000) + setSetting('SYNCFLEXABILITY',4000) + setSetting('CUSTOMSERVER','http://') setSetting('INIT',true) } @@ -45,6 +46,7 @@ const state = { CLIENTPOLLINTERVAL: getSetting('CLIENTPOLLINTERVAL'), SYNCMODE: getSetting('SYNCMODE'), SYNCFLEXABILITY: getSetting('SYNCFLEXABILITY'), + CUSTOMSERVER: getSetting('CUSTOMSERVER'), stats: {} } @@ -159,6 +161,10 @@ const mutations = { setSetting('SYNCFLEXABILITY',data) state.SYNCFLEXABILITY = data }, + setSettingCUSTOMSERVER(state,data){ + setSetting('CUSTOMSERVER',data) + state.CUSTOMSERVER = data + }, setSettingDARKMODE(state,data){ setSetting('DARKMODE',data) state.DARKMODE = data @@ -219,7 +225,10 @@ const getters = { }, getSettingSYNCFLEXABILITY: state => { return state.SYNCFLEXABILITY - }, + }, + getSettingCUSTOMSERVER: state => { + return state.CUSTOMSERVER + }, getSettingDARKMODE: state => { return state.DARKMODE },