chore(ngSocket): apply consistent naming to native event handlers

jeffbcross · jeffbcross · commit d5406aacfbf3 · 2014-01-25T13:48:26.000-08:00
diff --git a/src/ngSocket.js b/src/ngSocket.js
@@ -14,13 +14,8 @@ angular.module('ngSocket', []).
         this.sendQueue = [];
         this.onMessageCallbacks = [];
 
-        this.socket.onopen = function () {
-          this.onOpened.apply(this, arguments);
-        }.bind(this);
-
-        this.socket.onmessage = function () {
-          this._onmessage.apply(this, arguments);
-        }.bind(this);
+        this.socket.onopen = this._onOpenHandler.bind(this);
+        this.socket.onmessage = this._onMessageHandler.bind(this);
       };
 
       NGWebSocket.prototype.fireQueue = function () {
@@ -50,7 +45,7 @@ angular.module('ngSocket', []).
         this.onMessageCallbacks.push({fn: callback, pattern: pattern});
       };
 
-      NGWebSocket.prototype._onmessage = function (message) {
+      NGWebSocket.prototype._onMessageHandler = function (message) {
         var pattern;
         for (var i = 0; i < this.onMessageCallbacks.length; i++) {
           pattern = this.onMessageCallbacks[i].pattern;
@@ -69,7 +64,7 @@ angular.module('ngSocket', []).
         }
       };
 
-      NGWebSocket.prototype.onOpened = function () {
+      NGWebSocket.prototype._onOpenHandler = function () {
         $rootScope.$apply(function () {
           this.deferred.resolve();
           this.fireQueue.call(this);
diff --git a/test/ngSocket.spec.js b/test/ngSocket.spec.js
@@ -134,9 +134,9 @@ describe('ngSocket', function () {
         var mock = {spyable: function () {}}
         var spy = spyOn(mock, 'spyable');
         ws.onMessage(mock.spyable, 'foo');
-        ws._onmessage({data: 'bar'});
+        ws._onMessageHandler({data: 'bar'});
         expect(spy).not.toHaveBeenCalled();
-        ws._onmessage({data: 'foo'});
+        ws._onMessageHandler({data: 'foo'});
         expect(spy).toHaveBeenCalled();
       });
 
@@ -150,9 +150,9 @@ describe('ngSocket', function () {
         var mock = {spyable: function () {}}
         var spy = spyOn(mock, 'spyable');
         ws.onMessage(mock.spyable, /baz[0-9]{2}/);
-        ws._onmessage({data: 'bar'});
+        ws._onMessageHandler({data: 'bar'});
         expect(spy).not.toHaveBeenCalled();
-        ws._onmessage({data: 'baz21'});
+        ws._onMessageHandler({data: 'baz21'});
         expect(spy).toHaveBeenCalled();
       });
 
@@ -163,7 +163,7 @@ describe('ngSocket', function () {
     });
 
 
-    describe('.onOpened()', function () {
+    describe('._onOpenHandler()', function () {
       it('should resolve and apply', function () {
         var resolved = false;
         var ws = ngWebSocket('ws://foo');
@@ -172,15 +172,15 @@ describe('ngSocket', function () {
         });
 
         expect(resolved).toBe(false);
-        ws.onOpened.call(ws);
+        ws._onOpenHandler.call(ws);
         expect(resolved).toBe(true);
       });
 
 
       it('should call fireQueue to flush any queued send() calls', function () {
         var ws = ngWebSocket('ws://foo');
         var spy = spyOn(ws, 'fireQueue');
-        ws.onOpened.call(ws);
+        ws._onOpenHandler.call(ws);
         expect(spy).toHaveBeenCalled();
       });
     });
