Merge remote-tracking branch 'remotes/origin/develop' into develop.QBWEBSDK-240

Conflicts:
	quickblox.min.js
	samples/webrtc/config.js
	samples/webrtc/index.html

Author: dimaspirit

.bowerrc

@@ -1,6 +1,10 @@
 language: node_js
 node_js:
   - "4.1"
+  
+branches:
+  only:
+    - gh-pages
 
 before_script: "npm run-script setDependencies"
 

.travis.yml

@@ -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.0.4/quickblox.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.1.0/quickblox.min.js"></script>
 ```
 
 ## Bower and RequireJS
@@ -79,8 +79,8 @@ The quickblox.js library is build from a number of **CommonJS modules** containe
 These modules are combined through [browserify](http://browserify.org/) into a single `quickblox.js` file in the root and so this is the only file that needs to be included in a `<script>` tag OR in a RequireJS application OR in Node.js environment (everywhere). To build the library, use the [Grunt](http://gruntjs.com/) task runner:
 
 * You need to have the dependencies listed in the package.json available, use `npm install` to load them.
-* Install grunt-cli `npm install -g grunt-cli`
-* Also you need install jasmine global `npm i -g jasmine` for tests.
+* Install **grunt-cli** `npm install -g grunt-cli`
+* Also you need install **jasmine** global `npm i -g jasmine` for tests.
 * Change the 'version' properties in next files:
   * https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/js/qbConfig.js
   * https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/bower.json

README.md

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

bower.json

@@ -328,22 +328,22 @@ ChatProxy.prototype = {
 
       switch (status) {
       case Strophe.Status.ERROR:
-        err = getError(422, 'Status.ERROR - An error has occurred');
+        err = Utils.getError(422, 'Status.ERROR - An error has occurred');
         if (typeof callback === 'function') callback(err, null);
         break;
       case Strophe.Status.CONNECTING:
         Utils.QBLog('[ChatProxy]', 'Status.CONNECTING');
         Utils.QBLog('[ChatProxy]', 'Chat Protocol - ' + (config.chatProtocol.active === 1 ? 'BOSH' : 'WebSocket'));
         break;
       case Strophe.Status.CONNFAIL:
-        err = getError(422, 'Status.CONNFAIL - The connection attempt failed');
+        err = Utils.getError(422, 'Status.CONNFAIL - The connection attempt failed');
         if (typeof callback === 'function') callback(err, null);
         break;
       case Strophe.Status.AUTHENTICATING:
         Utils.QBLog('[ChatProxy]', 'Status.AUTHENTICATING');
         break;
       case Strophe.Status.AUTHFAIL:
-        err = getError(401, 'Status.AUTHFAIL - The authentication attempt failed');
+        err = Utils.getError(401, 'Status.AUTHFAIL - The authentication attempt failed');
         if (typeof callback === 'function') callback(err, null);
         break;
       case Strophe.Status.CONNECTED:
@@ -1001,7 +1001,7 @@ PrivacyListProxy.prototype = {
         var errorObject = getErrorFromXMLNode(stanzaError);
         callback(errorObject, null);
       }else{
-        callback(getError(408), null);
+        callback(Utils.getError(408), null);
       }
     });
   },
@@ -1041,7 +1041,7 @@ PrivacyListProxy.prototype = {
         var errorObject = getErrorFromXMLNode(stanzaError);
         callback(errorObject, null);
       }else{
-        callback(getError(408), null);
+        callback(Utils.getError(408), null);
       }
     });
   },
@@ -1105,7 +1105,7 @@ PrivacyListProxy.prototype = {
         var errorObject = getErrorFromXMLNode(stanzaError);
         callback(errorObject);
       }else{
-        callback(getError(408));
+        callback(Utils.getError(408));
       }
     });
   },
@@ -1154,7 +1154,7 @@ PrivacyListProxy.prototype = {
         var errorObject = getErrorFromXMLNode(stanzaError);
         callback(errorObject);
       }else{
-        callback(getError(408));
+        callback(Utils.getError(408));
       }
     });
   },
@@ -1177,7 +1177,7 @@ PrivacyListProxy.prototype = {
         var errorObject = getErrorFromXMLNode(stanzaError);
         callback(errorObject);
       }else{
-        callback(getError(408));
+        callback(Utils.getError(408));
       }
     });
   },
@@ -1200,7 +1200,7 @@ PrivacyListProxy.prototype = {
         var errorObject = getErrorFromXMLNode(stanzaError);
         callback(errorObject);
       }else{
-        callback(getError(408));
+        callback(Utils.getError(408));
       }
     });
   }
@@ -1407,7 +1407,7 @@ function getErrorFromXMLNode(stanzaError) {
   var errorElement = stanzaError.getElementsByTagName('error')[0];
   var errorCode = parseInt(errorElement.getAttribute('code'));
   var errorText = errorElement.getElementsByTagName('text')[0].textContent;
-  return getError(errorCode, errorText);
+  return Utils.getError(errorCode, errorText);
 }
 
 function getLocalTime() {

js/modules/qbChat.js

@@ -10,7 +10,7 @@
  */
 
 var config = {
-  version: '2.0.4',
+  version: '2.1.0',
   creds: {
     appId: '',
     authKey: '',

js/qbConfig.js

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

package.json

@@ -5,6 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>QuickBlox JavaScript WebRTC sample</title>
+    
+    <link rel="canonical" href="https://quickblox.github.io/quickblox-javascript-sdk/samples/webrtc" />
 
     <link rel="shortcut icon" href="https://quickblox.com/favicon.ico">
 
@@ -280,13 +282,19 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 
-    <script src="../../quickblox.js"></script>
+    <script src="../../quickblox.min.js"></script>
     <!-- Routing lib -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone-min.js"></script>
 
     <script src="config.js"></script>
     <script src="js/helpers.js"></script>
     <!-- <script src="js/msgBoard.js"></script> -->
     <script src="js/app.js"></script>
+    
+    <script type="text/javascript">
+      var host = "quickblox.github.io";
+      if ((host == window.location.host) && (window.location.protocol != "https:"))
+        window.location.protocol = "https";
+    </script>
 </body>
 </html>