Merge pull request #97 from QuickBlox/develop.webrtc.bf080116

SDK v.2.0.2

Author: Igor Khomenko

bower.json

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

js/modules/qbChat.js

@@ -1361,6 +1361,10 @@ Helpers.prototype = {
     return jid.split('@')[0].split('_')[1];
   },
 
+  getRoomJidFromDialogId: function(dialogId) {
+    return config.creds.appId + '_' + dialogId + '@' + config.endpoints.muc;
+  },
+
   getRoomJid: function(jid) {
     if(!isBrowser) throw unsupported;
     return jid + '/' + this.getIdFromNode(connection.jid);

js/qbConfig.js

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

js/qbMain.js

@@ -44,11 +44,13 @@ QuickBlox.prototype = {
       } else {
         this.webrtc = false;
       }
+    } else {
+      this.webrtc = false;
     }
 
     this.auth = new Auth(this.service);
     this.users = new Users(this.service);
-    this.chat = new Chat(this.service, this.webrtc.signalingProcessor || null, conn || null);
+    this.chat = new Chat(this.service, this.webrtc ? this.webrtc.signalingProcessor : null, conn || null);
     this.content = new Content(this.service);
     this.location = new Location(this.service);
     this.pushnotifications = new PushNotifications(this.service);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "js/qbMain.js",
   "license": [
@@ -24,11 +24,13 @@
   ],
   "maintainers": [
     "Igor Khomenko <igor@quickblox.com>",
-    "Vlad Lukhanin <vladislav.lukhanin@quickblox.com>"
+    "Vlad Lukhanin <vladislav.lukhanin@quickblox.com>",
+    "Dima Lobanov <dmytro.lobanov@injoit.com>"
   ],
   "contributors": [
     "Igor Khomenko <igor@quickblox.com>",
-    "Vlad Lukhanin <vladislav.lukhanin@quickblox.com>"
+    "Vlad Lukhanin <vladislav.lukhanin@quickblox.com>",
+    "Dima Lobanov <dmytro.lobanov@injoit.com>"
   ],
   "repository": {
     "type": "git",

quickblox.min.js

@@ -221,7 +221,7 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
 
     <script type="text/template" id="device_not_found">
         Error: devices (camera or microphone) are not found.
-        &emsp;Login&nbsp;in&nbsp;as&nbsp;<%=name%>
+        <span class="text">&emsp;Login&nbsp;in&nbsp;as&nbsp;<%=name%></span>
         <button class='fw-link j-logout'>Logout</button>
     </script>