bugfix: switching printers in remoteMode change to single mode

Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-01-11 22:48:23 +01:00
parent b6d20f20ee
commit 84f2b6a473
5 changed files with 10 additions and 6 deletions

View File

@ -58,7 +58,6 @@ export default class WebSocketClient {
this.instance.onclose = (e) => { this.instance.onclose = (e) => {
this.passToStore('socket/onClose', e) this.passToStore('socket/onClose', e)
window.console.log("reconnectInterval: "+this.reconnectInterval)
if (!e.wasClean && this.reconnects < this.maxReconnects) { if (!e.wasClean && this.reconnects < this.maxReconnects) {
this.reconnects++ this.reconnects++

View File

@ -8,17 +8,21 @@ export default {
router.push("/"); router.push("/");
}, },
changePrinter({ dispatch, getters }, payload) { changePrinter({ dispatch, getters, state }, payload) {
const remoteMode = state.socket.remoteMode
dispatch('files/reset') dispatch('files/reset')
dispatch('gui/reset') dispatch('gui/reset')
dispatch('printer/reset') dispatch('printer/reset')
dispatch('server/reset')
dispatch('socket/reset') dispatch('socket/reset')
const printerSocket = getters["farm/"+payload.printer+"/getSocketData"] const printerSocket = getters["farm/"+payload.printer+"/getSocketData"]
dispatch('socket/setSocket', { dispatch('socket/setSocket', {
hostname: printerSocket.hostname, hostname: printerSocket.hostname,
port: printerSocket.port port: printerSocket.port,
remoteMode: remoteMode,
}) })
} }
} }

View File

@ -1,8 +1,10 @@
import Vue from 'vue' import Vue from 'vue'
export default { export default {
reset({ commit }) { reset({ commit, dispatch }) {
commit('reset') commit('reset')
dispatch('power/reset')
dispatch('updateManager/reset')
}, },
init({ dispatch, state }) { init({ dispatch, state }) {

View File

@ -26,7 +26,6 @@ export default {
onClose ({ commit }, event) { onClose ({ commit }, event) {
commit('setDisconnected'); commit('setDisconnected');
window.console.log(event)
if (event.wasClean) window.console.log('Socket closed clear') if (event.wasClean) window.console.log('Socket closed clear')
}, },

View File

@ -1,6 +1,6 @@
export default { export default {
getUrl: state => { getUrl: state => {
return "//" + state.hostname + (state.port === 80 ? ":"+state.port : "") return "//" + state.hostname + (state.port !== 80 ? ":"+state.port : "")
} }
} }