Merge pull request #101 from QuickBlox/develop.QBWEBSDK-220.v2

QBWEBSDK-220

Author: Igor Khomenko

.gitignore

@@ -10,3 +10,6 @@ npm-debug.log
 
 # Use command grunt for create quickblox.js
 quickblox.js
+
+#jasmine-npm generate
+.grunt

js/modules/qbPushNotifications.js

@@ -8,17 +8,22 @@
 var config = require('../qbConfig'),
     Utils = require('../qbUtils');
 
+var isBrowser = typeof window !== "undefined";
+
 function PushNotificationsProxy(service) {
   this.service = service;
   this.subscriptions = new SubscriptionsProxy(service);
   this.events = new EventsProxy(service);
 
   this.base64Encode = function(str) {
-    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
-      return String.fromCharCode('0x' + p1);
-    }));
-  }
-
+    if(isBrowser) {
+      return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
+        return String.fromCharCode('0x' + p1);
+      }));
+    } else {
+      return new Buffer(str).toString('base64');
+    }
+  };
 }
 
 // Subscriptions
@@ -43,7 +48,6 @@ SubscriptionsProxy.prototype = {
 
   delete: function(id, callback) {
     Utils.QBLog('[SubscriptionsProxy]', 'delete', id);
-
     this.service.ajax({url: Utils.getUrl(config.urls.subscriptions, id), type: 'DELETE', dataType:'text'},
                       function(err, res){
                         if (err) { callback(err, null);}
@@ -72,7 +76,7 @@ EventsProxy.prototype = {
       callback = params;
       params = null;
     }
-    
+
     Utils.QBLog('[EventsProxy]', 'list', params);
 
     this.service.ajax({url: Utils.getUrl(config.urls.events), data: params}, callback);
@@ -92,10 +96,8 @@ EventsProxy.prototype = {
 
   delete: function(id, callback) {
     Utils.QBLog('[EventsProxy]', 'delete', id);
-
     this.service.ajax({url: Utils.getUrl(config.urls.events, id), type: 'DELETE'}, callback);
   }
-
 };
 
 module.exports = PushNotificationsProxy;

package.json

@@ -46,15 +46,16 @@
     "xml2js": "^0.4.13"
   },
   "devDependencies": {
+    "ghooks": "^1.0.3",
     "grunt": "^0.4.5",
     "grunt-browserify": "^3.2.1",
     "grunt-contrib-connect": "^0.9.0",
     "grunt-contrib-uglify": "^0.6.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-notify": "^0.4.1",
     "grunt-parallel": "^0.4.1",
-    "load-grunt-tasks": "^1.0.0",
-    "xml2js": "^0.4.12"
+    "jasmine": "^2.4.1",
+    "load-grunt-tasks": "^1.0.0"
   },
   "autoupdate": {
     "source": "git",
@@ -64,5 +65,10 @@
       "quickblox.js",
       "quickblox.min.js"
     ]
+  },
+  "config": {
+    "ghooks": {
+      "pre-commit": "jasmine"
+    }
   }
 }