kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix namespace problem.

Browse Source
This commit is contained in:
Michael Teeuw
2016-03-30 17:22:30 +02:00
parent b243d25399
commit 7717b295bd
1 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
js/socketclient.js
View File

@@ -1,5 +1,4 @@
var MMSocket = function(moduleName) { var MMSocket = function(moduleName) {
var self = this; var self = this;
if (typeof moduleName !== 'string') { if (typeof moduleName !== 'string') {
@@ -9,38 +8,25 @@ var MMSocket = function(moduleName) {
self.moduleName = moduleName; self.moduleName = moduleName;
// Private Methods // Private Methods
var socketBase = (typeof window === 'undefined') ? 'http://localhost:'+config.port : ''; socket = io.connect('/' + self.moduleName);
socket = io(socketBase + '/' + self.moduleName);
console.log(socketBase + '/' + self.moduleName);
var notificationCallback = function() {}; var notificationCallback = function() {};
socket.on('connect', function(s) { var onevent = socket.onevent;
socket.onevent = function (packet) {
// add a catch all event. var args = packet.data || [];
var onevent = socket.onevent; onevent.call (this, packet); // original call
socket.onevent = function (packet) { packet.data = ["*"].concat(args);
var args = packet.data || []; onevent.call(this, packet); // additional call to catch-all
onevent.call (this, packet); // original call };
packet.data = ["*"].concat(args);
onevent.call(this, packet); // additional call to catch-all
};
// register catch all.
socket.on('*', function (notification, payload) {
if (notification !== '*') {
//console.log('Received notification: ' + notification +', payload: ' + payload);
notificationCallback(notification, payload);
}
});
// register catch all.
socket.on('*', function (notification, payload) {
if (notification !== '*') {
//console.log('Received notification: ' + notification +', payload: ' + payload);
notificationCallback(notification, payload);
}
}); });
var sendNotification = function(notification, payload) {
//console.log('Send notification: ' + notification +', payload: ' + payload);
socket.emit(notification, payload);
};
// Public Methods // Public Methods
this.setNotificationCallback = function(callback) { this.setNotificationCallback = function(callback) {
@@ -51,6 +37,6 @@ var MMSocket = function(moduleName) {
if (typeof payload === 'undefined') { if (typeof payload === 'undefined') {
payload = {}; payload = {};
} }
sendNotification(notification, payload); socket.emit(notification, payload);
}; };
}; };