Skip to content

SDK v.2.0.2 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 11, 2016
Merged

SDK v.2.0.2 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e1da89c
QBWEBSDK-223
Jan 8, 2016
2070370
additional changes
Jan 8, 2016
cd52925
fixed one more time
Jan 8, 2016
f820bae
fix for node (check webrtc)
Jan 8, 2016
1f635ca
added QB.chat.helpers.getRoomJidFromDialogId
Jan 8, 2016
e5964f7
change version to 2.0.2
Jan 11, 2016
7a4d415
Merge branch 'develop.webrtc.bf080116' of https://github.com/QuickBlo…
Jan 11, 2016
113e8be
merged
Jan 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 4 additions & 0 deletions js/modules/qbChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion js/qbConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

var config = {
version: '2.0.1',
version: '2.0.2',
creds: {
appId: '',
authKey: '',
Expand Down
4 changes: 3 additions & 1 deletion js/qbMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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",
Expand Down
18 changes: 9 additions & 9 deletions quickblox.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/webrtc/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading