Merge remote-tracking branch 'remotes/origin/gh-pages' into develop

Conflicts:
	quickblox.min.js

Author: dimaspirit

README.md

@@ -20,7 +20,7 @@ For correct work of JS SDK you must include the  library in your html before `qu
 
 ```html
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.3.2/quickblox.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.3.4/quickblox.min.js"></script>
 ```
 
 ## Bower and RequireJS

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
   "license": "Apache 2.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "src/qbMain.js",
   "license": "(Apache-2.0)",

spec/QB-ChatSpec.js

@@ -68,12 +68,13 @@ describe('Chat API', function() {
                     body: body,
                     extension: msgExtension,
                     markable: 1
-            };
+                };
 
             function onMsgCallback(userId, receivedMessage) {
                 expect(userId).toEqual(QBUser1.id);
 
                 expect(receivedMessage).toBeDefined();
+                expect(receivedMessage.id).toEqual(msg.id);
                 expect(receivedMessage.type).toEqual(msg.type);
                 expect(receivedMessage.body).toEqual(body);
                 expect(receivedMessage.extension).toEqual(msgExtension);
@@ -83,27 +84,31 @@ describe('Chat API', function() {
             }
 
             QB.chat.onMessageListener = onMsgCallback;
-            QB.chat.send(QBUser1.id, msg);
+            msg.id = QB.chat.send(QBUser1.id, msg);
         }, MESSAGING_TIMEOUT);
 
         it('can send and receive system message', function(done) {
-            var extension = {
-                name: 'Walle',
-                action: 'Found love'
-            };
+            var msg = {
+                    body: 'Notification',
+                    extension:{
+                        name: 'Walle',
+                        action: 'Found love'
+                    }
+                };
 
             function onSystemMessageListenerCb(receivedMessage) {
                 expect(receivedMessage).toBeDefined();
 
                 expect(receivedMessage.userId).toEqual(QBUser1.id);
-                expect(receivedMessage.extension).toEqual(extension);
+                expect(receivedMessage.id).toEqual(msg.id);
+                expect(receivedMessage.body).toEqual(msg.body);
+                expect(receivedMessage.extension).toEqual(msg.extension);
 
                 done();
             }
 
             QB.chat.onSystemMessageListener = onSystemMessageListenerCb;
-
-            QB.chat.sendSystemMessage(QBUser1.id, {'extension': extension});
+            msg.id = QB.chat.sendSystemMessage(QBUser1.id, msg);
         }, MESSAGING_TIMEOUT);
 
         it('can send and receive \'delivered\' status', function(done) {

src/modules/qbChat.js

@@ -313,6 +313,7 @@ function ChatProxy(service, webrtcModule, conn) {
             extraParams = chatUtils.getElement(stanza, 'extraParams'),
             delay = chatUtils.getElement(stanza, 'delay'),
             moduleIdentifier = chatUtils.getElementText(extraParams, 'moduleIdentifier'),
+            bodyContent = chatUtils.getElementText(stanza, 'body'),
             message;
 
         if (moduleIdentifier === 'SystemNotifications' && typeof self.onSystemMessageListener === 'function') {
@@ -321,6 +322,7 @@ function ChatProxy(service, webrtcModule, conn) {
             message = {
                 id: messageId,
                 userId: self.helpers.getIdFromNode(from),
+                body: bodyContent,
                 extension: extraParamsParsed.extension
             };
 
@@ -608,6 +610,8 @@ ChatProxy.prototype = {
 
             nClient.send(stanza);
         }
+
+        return paramsCreateMsg.id;
     },
     sendSystemMessage: function(jid_or_user_id, message) {
         var self = this,
@@ -620,14 +624,20 @@ ChatProxy.prototype = {
 
         var stanza = chatUtils.createStanza(builder, paramsCreateMsg);
 
+        if (message.body) {
+            stanza.c('body', {
+                xmlns: chatUtils.MARKERS.CLIENT,
+            }).t(message.body).up();
+        }
+
         if(Utils.getEnv().browser) {
             // custom parameters
             if (message.extension) {
               stanza.c('extraParams', {
                 xmlns: chatUtils.MARKERS.CLIENT
               }).c('moduleIdentifier').t('SystemNotifications').up();
 
-             stanza = chatUtils.filledExtraParams(stanza, message.extension);
+              stanza = chatUtils.filledExtraParams(stanza, message.extension);
             }
 
             connection.send(stanza);
@@ -644,6 +654,8 @@ ChatProxy.prototype = {
 
             nClient.send(stanza);
         }
+        
+        return paramsCreateMsg.id;
     },
     sendIsTypingStatus: function(jid_or_user_id) {
         var self = this,

src/qbConfig.js

@@ -12,7 +12,7 @@
  */
 
 var config = {
-  version: '2.3.2',
+  version: '2.3.4',
   creds: {
     appId: '',
     authKey: '',