Merge pull request #150 from kuzzleio/hotfix-IE11

[MASTER] Hotfix IE 11

Author: stafyniaksacha

.travis.yml

@@ -24,7 +24,7 @@ deploy:
   skip_cleanup: true
   email: [email protected]
   api_key:
-    secure: DqPwRO+LYFFOgIdZ23Prhw14f1ycsOcOXZsl7tMi4kznwu1PTkWgW+rFyCMoTeV/BxexvzMjAneSqO0plvbZyKOMzNtNCGPUjD49zzdpgkMo4Gc+fwb9AgbqUj3rRROX+106KJsoSRuTzOeuK+Ar7NJNBH1xX+zKkNHd+FaJiPFGwKTcEOguf0ger04NyZUVpzs4YPJDlZdXjXQEdh9EhnvLSUkPXD6cbPuSCMKoOuuUZIWXA3rwOMdId6dLp63NAv0SxCqiCGO82BfRj1pbn3ocqgorGSTI2l4aSHF5IU9WPH/j1WnaLJVgqCbXyALWE7qXwiPc2/IEmQLe4JnkUjY5RLPNppJk1g5lGoM8Wd/21EsGb4jYuLJlTjHhe2qHY2Xki3r0WoZyLzGYlHMNAZaSBDckMssG3LjSWQSqCwKZM4DypdQ16ROALYQELKL/MSQQS+vD+/hgCf8JDIytnEZyHzllbwhBxctWp4UYbjcsS5dh/YJFbNl6Vgf8i9S+RnqxlV96pyHX881vz9ZskpHvMEwgENDNZqGRUzeyM058VlqspL9mq6VbbTiRNneupQAEyeyZ0oadNhy7dG0oOABVAcwpGGDBWXSd3OYGPcWrbTKpiGbH/NAlsC8sXLtA74mGvupkxXSFJRf75KC8bYZrpb6Q6eLGFHB480lomXw=
+    secure: fyAUrBhmctUri2wPCcdufPME6EyFLpC4OS4wMAmUc7iNNSUl2C9On0HMkmz1JKD/+fMhlFCvQcpD6O8hNThneSqrv/PANAyz9YXblv35W9v1XbYrzm5IWQ4D30+Zg350SK6Wqn4Wr6jZkRXQKhBo8GQ5aLsDdhr7RgRBpw8p6GwDuda41K9cAOh8vbX2u6guOfeJW+jfwfXgwZUl/DEor8XkIJYcVwOF0989FT0urYf28afnxVgaj5XuIyNQMLC0R0KAsbYO0EPDy1O7a34SFUoNVBXPqP+5wYocML6mKNOFtLfvTAfIeErQc6Is3roJvZqMkcu8zzRH+OdbQfa+3+sUTPbxBAaNvcITO/z36QnYh/Swbnfxn0dD5ue2bAXseVpa55fWw0DPOQkcQ3VJ9hHQfMWTn+4EH6lqYEynSJ0KGbHqzm3Qm15fCj0s+vjvs4axGcYEpZlJaTu9o3oHYJTTDfbkk4b7nbKGQ/vDsYFTRL2yRprYlCQ8YoUnDMOB3YHxmRs7Jgxb9lbg8iD5ZMtP1+QIhUMJTI16ruxs88bRvCaTkfdTOGv0qVhgA9a00+G1XMLxCzpvI8wKgo7+GKRPUyvR2bRCQS6mHtbp6beCqPxgzyfGzg8XU09disST7spqH3E8ohWwVfgkjoBlS9+y62iaiwXRsTVXyeGJpac=
   on:
     repo: kuzzleio/sdk-javascript
     branch: master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {

src/kuzzle.js

@@ -534,15 +534,11 @@ Kuzzle.prototype.logout = function (cb) {
     };
 
   this.query({controller: 'auth', action: 'logout'}, request, {queuable: false}, typeof cb !== 'function' ? null : function(error) {
-    if (error === null) {
-      self.unsetJwtToken();
-      cb(null, self);
-    }
-    else {
-      cb(error);
-    }
+    cb(error, self);
   });
 
+  self.unsetJwtToken();
+
   return self;
 };
 

src/networkWrapper/wrappers/websocket.js

@@ -162,11 +162,17 @@ function WSNode(host, port, ssl) {
    * @param {function} callback
    */
   this.off = function (roomId, callback) {
-    var index;
+    var index = -1;
 
     if (this.listeners[roomId]) {
-      index = this.listeners[roomId].findIndex(function (listener) {
-        return listener.fn === callback;
+      // Array.findIndex is not supported by internet explorer
+      this.listeners[roomId].some(function (listener, i) {
+        if (listener.fn === callback) {
+          index = i;
+          return true;
+        }
+
+        return false;
       });
 
       if (index !== -1) {

test/kuzzle/constructor.test.js

@@ -913,7 +913,7 @@ describe('Kuzzle constructor', () => {
         kuzzle.login('local', loginCredentials);
       });
 
-      it('should have a empty token in logout callback', function (done) {
+      it('should have a empty token in logout callback', function () {
         var
           unsetJwtToken = false,
           kuzzle;
@@ -932,10 +932,8 @@ describe('Kuzzle constructor', () => {
           cb(null, {});
         };
 
-        kuzzle.logout(function() {
-          should(unsetJwtToken).be.exactly(true);
-          done();
-        });
+        kuzzle.logout(() => {});
+        should(unsetJwtToken).be.exactly(true);
       });
 
       it('should give an error if login query fail to the logout callback if is set', function (done) {