Merge branch 'develop' into gh-pages

Author: Igor Khomenko

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
   "license": "MIT",

js/modules/qbChat.js

@@ -139,6 +139,9 @@ function ChatProxy(service, webrtcModule, conn) {
       extension: extraParamsParsed ? extraParamsParsed.extension : null,
       delay: delay
     };
+    if (markable) {
+      message.markable = 1;
+    }
     if (typeof self.onMessageListener === 'function' && (type === 'chat' || type === 'groupchat')){
       self.onMessageListener(userId, message);
     }
@@ -407,7 +410,8 @@ ChatProxy.prototype = {
     }
 
     // chat markers
-    if (message.type === 'chat') {
+    //
+    if (message.markable) {
       msg.c('markable', {
         xmlns: Strophe.NS.CHAT_MARKERS
       });

js/qbConfig.js

@@ -6,7 +6,7 @@
  */
 
 var config = {
-  version: '1.15.0',
+  version: '1.15.1',
   creds: {
     appId: '',
     authKey: '',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "js/qbMain.js",
   "license": [

quickblox.js

@@ -1,4 +1,4 @@
-/* QuickBlox JavaScript SDK - v1.15.0 - 2015-10-16 */
+/* QuickBlox JavaScript SDK - v1.15.1 - 2015-10-16 */
 
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.QB = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 /*
@@ -282,6 +282,9 @@ function ChatProxy(service, webrtcModule, conn) {
       extension: extraParamsParsed ? extraParamsParsed.extension : null,
       delay: delay
     };
+    if (markable) {
+      message.markable = 1;
+    }
     if (typeof self.onMessageListener === 'function' && (type === 'chat' || type === 'groupchat')){
       self.onMessageListener(userId, message);
     }
@@ -550,7 +553,8 @@ ChatProxy.prototype = {
     }
 
     // chat markers
-    if (message.type === 'chat') {
+    //
+    if (message.markable) {
       msg.c('markable', {
         xmlns: Strophe.NS.CHAT_MARKERS
       });
@@ -2850,7 +2854,7 @@ Blob.prototype.download = function() {
  */
 
 var config = {
-  version: '1.15.0',
+  version: '1.15.1',
   creds: {
     appId: '',
     authKey: '',

quickblox.min.js

@@ -39,6 +39,7 @@ describe('QuickBlox SDK - Chat module', function() {
           param2: "value2"
         });
         expect(receivedMessage.id).toEqual(self.messageId);
+        expect(receivedMessage.markable).toEqual(1);
         self.messageId = null;
 
         done();
@@ -49,7 +50,8 @@ describe('QuickBlox SDK - Chat module', function() {
         extension: {
           param1: "value1",
           param2: "value2"
-        }
+        },
+        markable: 1
       };
       QB.chat.send(QBUser1.id, message);
       this.messageId = message.id;