Merge pull request #54 from janpantel/iss-53

Fix(once): moved once to a special function
janpantel · Feb 27, 2015 · 566ae5b · 566ae5b
2 parents 951bd0d + 4e3bc8f
commit 566ae5b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/mock/socket-io.js b/mock/socket-io.js
@@ -34,7 +34,7 @@ function createMockSocketObject() {
             (this._listeners[ev] = this._listeners[ev] || []).push(fn);
         },
         once: function(ev, fn) {
-            (this._raw._listeners[ev] = this._raw._listeners[ev] || []).push(fn);
+            (this._listeners[ev] = this._listeners[ev] || []).push(fn);
             fn._once = true;
         },
         emit: function(ev, data) {

diff --git a/src/service/angular-sails.js b/src/service/angular-sails.js
@@ -1,7 +1,9 @@
 /*global angular, io */
 (function(angular, io) {
     'use strict';
-    io.sails.autoConnect = false;
+    if(io.sails){
+      io.sails.autoConnect = false;
+    }
 
     // copied from angular
     function parseHeaders(headers) {
@@ -49,7 +51,7 @@
 
         this.httpVerbs = ['get', 'post', 'put', 'delete'];
 
-        this.eventNames = ['on', 'off', 'once'];
+        this.eventNames = ['on', 'off'];
 
         this.url = undefined;
 
@@ -207,7 +209,7 @@
             }
 
             function wrapEvent(eventName) {
-                if(socket[eventName] || socket._raw[eventName]){
+                if(socket[eventName] || socket._raw && socket._raw[eventName]){
                     socket['legacy_' + eventName] = socket[eventName] || socket._raw[eventName];
                     socket[eventName] = function(event, cb) {
                         if (cb !== null && angular.isFunction(cb)) {
@@ -219,6 +221,17 @@
                 }
             }
 
+            // sails.io.js doesn't have `once`, need to access it through `._raw`
+            socket.once = function(event, cb){
+              if (cb !== null && angular.isFunction(cb)) {
+                if(socket._raw){
+                  socket._raw.once(event, function(result) {
+                      $rootScope.$evalAsync(cb.bind(socket, result));
+                  });
+                }
+              }
+            };
+
             angular.forEach(provider.httpVerbs, promisify);
             angular.forEach(provider.eventNames, wrapEvent);