update events

MediaBrowser · Dec 16, 2015 · ac6b6e3 · ac6b6e3
1 parent 65c9f95
commit ac6b6e3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 70 deletions.
diff --git a/apiclient.js b/apiclient.js
@@ -39,40 +39,18 @@
                     throw new Error('Invalid url: ' + val);
                 }
 
-                serverAddress = val;
-            }
-
-            return serverAddress;
-        };
+                var changed = val != serverAddress;
 
-        var callbacks = {};
-        self.on = function (name, fn) {
-            callbacks[name] = (callbacks[name] || []);
+                serverAddress = val;
 
-            if (callbacks[name].indexOf(fn) == -1) {
-                callbacks[name].push(fn);
+                if (changed) {
+                    Events.trigger(this, 'serveraddresschanged');
+                }
             }
-        };
-
-        self.off = function (name, fn) {
 
-            callbacks[name] = (callbacks[name] || []).filter(function (i) {
-                return i != fn;
-            });
+            return serverAddress;
         };
 
-        function trigger(name, data) {
-
-            var eventObject = {
-                type: name,
-                detail: data
-            };
-
-            (callbacks[name] || []).forEach(function (c) {
-                c.call(self, eventObject);
-            });
-        }
-
         self.serverInfo = function (info) {
 
             serverInfo = info || serverInfo;
@@ -159,11 +137,12 @@
 
         function onFetchFail(url, response) {
 
-            trigger('requestfail', {
+            Events.trigger(self, 'requestfail', [
+            {
                 url: url,
                 status: response.status,
                 errorCode: response.headers ? response.headers["X-Application-Error-Code"] : null
-            });
+            }]);
         }
 
         self.setRequestHeaders = function (headers) {
@@ -559,17 +538,17 @@
 
                 logger.log('web socket connection opened');
                 setTimeout(function () {
-                    trigger('websocketopen');
+                    Events.trigger(self, 'websocketopen');
                 }, 0);
             };
             webSocket.onerror = function () {
                 setTimeout(function () {
-                    trigger('websocketerror');
+                    Events.trigger(self, 'websocketerror');
                 }, 0);
             };
             webSocket.onclose = function () {
                 setTimeout(function () {
-                    trigger('websocketclose');
+                    Events.trigger(self, 'websocketclose');
                 }, 0);
             };
         };
@@ -594,7 +573,7 @@
                 }
             }
 
-            trigger('websocketmessage', msg);
+            Events.trigger(self, 'websocketmessage', [msg]);
         }
 
         self.sendWebSocketMessage = function (name, data) {

diff --git a/connectionmanager.js b/connectionmanager.js
@@ -209,34 +209,6 @@
             });
         }
 
-        var callbacks = {};
-        self.on = function (name, fn) {
-            callbacks[name] = (callbacks[name] || []);
-
-            if (callbacks[name].indexOf(fn) == -1) {
-                callbacks[name].push(fn);
-            }
-        };
-
-        self.off = function (name, fn) {
-
-            callbacks[name] = (callbacks[name] || []).filter(function (i) {
-                return i != fn;
-            });
-        };
-
-        function trigger(name, data) {
-
-            var eventObject = {
-                type: name,
-                detail: data
-            };
-
-            (callbacks[name] || []).forEach(function (c) {
-                c.call(self, eventObject);
-            });
-        }
-
         var connectUser;
         self.connectUser = function () {
             return connectUser;
@@ -341,7 +313,7 @@
                 credentialProvider.credentials(credentials);
             }
 
-            trigger('apiclientcreated', apiClient);
+            Events.trigger(self, 'apiclientcreated', [apiClient]);
 
             if (existingServer.Id) {
                 return;
@@ -373,7 +345,7 @@
         function onConnectUserSignIn(user) {
 
             connectUser = user;
-            trigger('connectusersignedin', user);
+            Events.trigger(self, 'connectusersignedin', [user]);
         }
 
         function getOrAddApiClient(server, connectionMode) {
@@ -394,7 +366,7 @@
                     onAuthenticated(instance, result, {}, true);
                 };
 
-                trigger('apiclientcreated', apiClient);
+                Events.trigger(self, 'apiclientcreated', [apiClient]);
             }
 
             logger.log('returning instance from getOrAddApiClient');
@@ -482,7 +454,7 @@
 
         function onLocalUserSignIn(user) {
 
-            trigger('localusersignedin', user);
+            Events.trigger(self, 'localusersignedin', [user]);
         }
 
         function ensureConnectUser(credentials) {
@@ -747,7 +719,7 @@
 
                 if (connectUser) {
                     connectUser = null;
-                    trigger('connectusersignedout');
+                    Events.trigger(self, 'connectusersignedout');
                 }
             });
         };
@@ -762,10 +734,10 @@
 
             return apiClient.logout().then(function () {
 
-                trigger('localusersignedout', logoutInfo);
+                Events.trigger(self, 'localusersignedout', [logoutInfo]);
             }, function () {
 
-                trigger('localusersignedout', logoutInfo);
+                Events.trigger(self, 'localusersignedout', [logoutInfo]);
             });
         }
 
@@ -1170,7 +1142,7 @@
 
             resolve(result);
 
-            trigger('connected', result);
+            Events.trigger(self, 'connected', [result]);
         }
 
         function normalizeAddress(address) {