allow default namespace to still be used

pull/269/head
David Vezzani 4 years ago
parent 640dfc044c
commit 1c55f1a4e3

@ -51,6 +51,7 @@ export default class VueSocketIO {
Vue.prototype.$vueSocketIo = this; Vue.prototype.$vueSocketIo = this;
} }
Vue.prototype.$useConnectionNamespace = this.useConnectionNamespace
Vue.mixin(Mixin); Vue.mixin(Mixin);
Logger.info('Vue-Socket.io plugin enabled'); Logger.info('Vue-Socket.io plugin enabled');
@ -75,3 +76,4 @@ export default class VueSocketIO {
} }
} }
} }

@ -7,7 +7,7 @@ export default {
if(!this.sockets) this.sockets = {}; if(!this.sockets) this.sockets = {};
if (typeof this.$vueSocketIo === 'object') { if (typeof this.$vueSocketIo === 'object' && this.$useConnectionNamespace) {
for (const namespace of Object.keys(this.$vueSocketIo)) { for (const namespace of Object.keys(this.$vueSocketIo)) {
this.sockets[namespace] = { this.sockets[namespace] = {
subscribe: (event, callback) => { subscribe: (event, callback) => {
@ -31,7 +31,7 @@ export default {
if(this.$options.sockets){ if(this.$options.sockets){
if (typeof this.$vueSocketIo === 'object') { if (typeof this.$vueSocketIo === 'object' && this.$useConnectionNamespace) {
for (const namespace of Object.keys(this.$vueSocketIo)) { for (const namespace of Object.keys(this.$vueSocketIo)) {
if (this.$options.sockets[namespace]) { if (this.$options.sockets[namespace]) {
Object.keys(this.$options.sockets[namespace]).forEach(event => { Object.keys(this.$options.sockets[namespace]).forEach(event => {
@ -45,7 +45,6 @@ export default {
} }
} else { } else {
Object.keys(this.$options.sockets).forEach(event => { Object.keys(this.$options.sockets).forEach(event => {
if(event !== 'subscribe' && event !== 'unsubscribe') { if(event !== 'subscribe' && event !== 'unsubscribe') {
this.$vueSocketIo.emitter.addListener(event, this.$options.sockets[event], this); this.$vueSocketIo.emitter.addListener(event, this.$options.sockets[event], this);
} }
@ -63,7 +62,7 @@ export default {
if(this.$options.sockets){ if(this.$options.sockets){
if (typeof this.$vueSocketIo === 'object') { if (typeof this.$vueSocketIo === 'object' && this.$useConnectionNamespace) {
for (const namespace of Object.keys(this.$vueSocketIo)) { for (const namespace of Object.keys(this.$vueSocketIo)) {
if (this.$options.sockets[namespace]) { if (this.$options.sockets[namespace]) {
Object.keys(this.$options.sockets[namespace]).forEach(event => { Object.keys(this.$options.sockets[namespace]).forEach(event => {
@ -86,3 +85,4 @@ export default {
} }
} }

Loading…
Cancel
Save