Skip to content

Commit 8163e97

Browse files
authored
Sprint 7
- new chat sample - webrtc-adapter as dependency - connect without roster
1 parent 85c1813 commit 8163e97

38 files changed

+106725
-190
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "quickblox",
33
"description": "QuickBlox JavaScript SDK",
4-
"version": "2.5.1",
4+
"version": "2.5.2",
55
"homepage": "https://quickblox.com/developers/Javascript",
66
"main": "quickblox.js",
77
"license": "Apache 2.0",

gulpfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ gulp.task('build', function () {
2424
return browserify('./src/qbMain.js', browserifyOpts)
2525
.bundle()
2626
.on('error', function(error) {
27+
throw new Error(error);
2728
notify('Failed when create a bundle.');
2829
this.emit('end');
2930
})

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "quickblox",
33
"description": "QuickBlox JavaScript SDK",
4-
"version": "2.5.1",
4+
"version": "2.5.2",
55
"homepage": "https://quickblox.com/developers/Javascript",
66
"main": "src/qbMain.js",
77
"license": "(Apache-2.0)",
@@ -41,7 +41,8 @@
4141
"crypto-js": "3.1.2-2",
4242
"node-xmpp-client": "^3.0.0",
4343
"request": "^2.48.0",
44-
"strophe.js": "^1.2.8",
44+
"strophe.js": "1.2.12",
45+
"webrtc-adapter": "^2.1.0",
4546
"xml2js": "^0.4.13"
4647
},
4748
"devDependencies": {
@@ -53,9 +54,9 @@
5354
"gulp-notify": "^2.2.0",
5455
"gulp-uglify": "^2.0.0",
5556
"jaguarjs-jsdoc": "^1.0.1",
56-
"jsdoc": "^3.4.3",
5757
"jasmine": "^2.4.1",
5858
"jquery-custom": "^1.1.1",
59+
"jsdoc": "^3.4.3",
5960
"jshint": "^2.9.3",
6061
"jshint-stylish": "^2.2.1",
6162
"pump": "^1.0.1",

quickblox.min.js

Lines changed: 103416 additions & 43 deletions
Large diffs are not rendered by default.

samples/content/js/config.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
var QBApp = {
2-
appId: 92,
3-
authKey: 'wJHdOcQSxXQGWx5',
4-
authSecret: 'BTFsj7Rtt27DAmT'
2+
appId: 32186,
3+
authKey: 'hZW5jgFxzOS2aCC',
4+
authSecret: 'HOvhKhWNeGgV8cF'
55
};
66

7+
// id 25430199
78
var QBUser = {
8-
login: "contentuser",
9-
password: "contentuser"
9+
login: "constentUserJS",
10+
password: "constentUserJS"
1011
};
1112

12-
var CONFIG = {
13-
14-
};
15-
16-
QB.init(QBApp.appId, QBApp.authKey, QBApp.authSecret, CONFIG);
13+
QB.init(QBApp.appId, QBApp.authKey, QBApp.authSecret);

0 commit comments

Comments
 (0)