Skip to content

Commit be8ccd2

Browse files
dimaspiritdimaspirit
committed
Merge branch 'gh-pages' of https://github.com/QuickBlox/quickblox-javascript-sdk into gh-pages
# Conflicts: # docs/QB.chat.html # docs/QB.chat.muc.html # docs/QB.chat.roster.html # docs/QB.html # docs/global.html # docs/index.html # gulpfile.js # package.json # quickblox.min.js # src/qbConfig.js # src/qbMain.js
2 parents 6034650 + 1bb56ed commit be8ccd2

File tree

19 files changed

+222
-483
lines changed

19 files changed

+222
-483
lines changed

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ The QuickBlox JavaScript SDK provides a JavaScript library making it even easier
88

99
[QuickBlox](https://quickblox.com) is a suite of communication features & data services (APIs, SDKs, code samples, admin panel, tutorials) which help digital agencies, mobile developers and publishers to add great communication functionality to smartphone applications like in Skype, WhatsApp, Viber.
1010

11-
1211
# Install
1312

1413
## Dependencies for browser
1514

1615
For the library to work, you need to include either [jQuery](http://jquery.com/) or [Zepto](http://zeptojs.com/) in your html before `quickblox.min.js`, like so:
1716

18-
For correct work of JS SDK you must include the library in your html before `quickblox.min.js`, like so:
17+
For correct work of JS SDK you must include the library in your html before `quickblox.min.js`, like so:
1918

2019
```html
2120
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
22-
<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.4.0/quickblox.min.js"></script>
21+
<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.5.0/quickblox.min.js"></script>
2322
```
2423

24+
Begin with version 2.5.0 no dependencies for work correctly is not needed.
25+
2526
## Bower and RequireJS
2627

2728
If you use bower package manager for your project, you can install JS SDK through bower:

‎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.4.0",
4+
"version": "2.5.0",
55
"homepage": "https://quickblox.com/developers/Javascript",
66
"main": "quickblox.js",
77
"license": "Apache 2.0",

‎docs/QB.chat.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2844,7 +2844,7 @@ <h5>Returns:</h5>
28442844

28452845

28462846
<footer>
2847-
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu Nov 24 2016 18:27:01 GMT+0200 (EET)
2847+
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed Nov 30 2016 15:51:27 GMT+0200 (FLE Standard Time)
28482848
</footer>
28492849
</div>
28502850
</div>

‎docs/QB.chat.muc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ <h2>
276276

277277

278278
<footer>
279-
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu Nov 24 2016 18:27:01 GMT+0200 (EET)
279+
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed Nov 30 2016 15:51:27 GMT+0200 (FLE Standard Time)
280280
</footer>
281281
</div>
282282
</div>

‎docs/QB.chat.roster.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ <h4 class="name" id=".remove">
964964

965965

966966
<footer>
967-
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu Nov 24 2016 18:27:01 GMT+0200 (EET)
967+
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed Nov 30 2016 15:51:28 GMT+0200 (FLE Standard Time)
968968
</footer>
969969
</div>
970970
</div>

‎docs/QB.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ <h4 class="name" id=".createSession">
373373

374374

375375
<div class="tag-source">
376-
qbMain.js, line 118
376+
qbMain.js, line 117
377377
</div>
378378

379379
</div>
@@ -512,7 +512,7 @@ <h4 class="name" id=".destroySession">
512512

513513

514514
<div class="tag-source">
515-
qbMain.js, line 133
515+
qbMain.js, line 132
516516
</div>
517517

518518
</div>
@@ -628,7 +628,7 @@ <h4 class="name" id=".getSession">
628628

629629

630630
<div class="tag-source">
631-
qbMain.js, line 102
631+
qbMain.js, line 101
632632
</div>
633633

634634
</div>
@@ -931,7 +931,7 @@ <h4 class="name" id=".login">
931931

932932

933933
<div class="tag-source">
934-
qbMain.js, line 149
934+
qbMain.js, line 148
935935
</div>
936936

937937
</div>
@@ -1070,7 +1070,7 @@ <h4 class="name" id=".logout">
10701070

10711071

10721072
<div class="tag-source">
1073-
qbMain.js, line 164
1073+
qbMain.js, line 163
10741074
</div>
10751075

10761076
</div>
@@ -1192,7 +1192,7 @@ <h4 class="name" id=".logout">
11921192

11931193

11941194
<footer>
1195-
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu Nov 24 2016 18:27:01 GMT+0200 (EET)
1195+
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed Nov 30 2016 15:51:27 GMT+0200 (FLE Standard Time)
11961196
</footer>
11971197
</div>
11981198
</div>

‎docs/global.html‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,7 @@ <h4 class="name" id="answerTimer">answerTimer</h4>
271271
<dd>
272272

273273
<div class="description">
274-
We use this timeout to fix next issue:
275-
"From Android/iOS make a call to Web and kill the Android/iOS app instantly. Web accept/reject popup will be still visible.
276-
We need a way to hide it if sach situation happened."
274+
We use this timeout to fix next issue:"From Android/iOS make a call to Web and kill the Android/iOS app instantly. Web accept/reject popup will be still visible.We need a way to hide it if sach situation happened."
277275
</div>
278276

279277

@@ -408,8 +406,7 @@ <h4 class="name" id="config">config</h4>
408406
<dd>
409407

410408
<div class="description">
411-
QuickBlox JavaScript SDK
412-
WebRTC Module (WebRTC helpers)
409+
QuickBlox JavaScript SDKWebRTC Module (WebRTC helpers)
413410
</div>
414411

415412

@@ -454,9 +451,7 @@ <h4 class="name" id="config">config</h4>
454451
<dd>
455452

456453
<div class="description">
457-
QuickBlox JavaScript SDK
458-
459-
Proxy Module
454+
QuickBlox JavaScript SDKProxy Module
460455
</div>
461456

462457

@@ -501,12 +496,7 @@ <h4 class="name" id="config">config</h4>
501496
<dd>
502497

503498
<div class="description">
504-
User's callbacks (listener-functions):
505-
- onUserNotAnswerListener(session, userID)
506-
- onRemoteStreamListener(session, userID, stream)
507-
- onSessionConnectionStateChangedListener(session, userID, connectionState)
508-
- onSessionCloseListener(session)
509-
- onCallStatsReport(session, userId, stats, error)
499+
User's callbacks (listener-functions):- onUserNotAnswerListener(session, userID)- onRemoteStreamListener(session, userID, stream)- onSessionConnectionStateChangedListener(session, userID, connectionState)- onSessionCloseListener(session)- onCallStatsReport(session, userId, stats, error)
510500
</div>
511501

512502

@@ -551,8 +541,7 @@ <h4 class="name" id="connection">connection</h4>
551541
<dd>
552542

553543
<div class="description">
554-
Browser env.
555-
Uses by Strophe
544+
Browser env.Uses by Strophe
556545
</div>
557546

558547

@@ -597,8 +586,7 @@ <h4 class="name" id="isBrowser">isBrowser</h4>
597586
<dd>
598587

599588
<div class="description">
600-
For server-side applications through using npm package 'quickblox'
601-
you should include the following lines
589+
For server-side applications through using npm package 'quickblox'you should include the following lines
602590
</div>
603591

604592

@@ -643,9 +631,7 @@ <h4 class="name" id="NodeClient">NodeClient</h4>
643631
<dd>
644632

645633
<div class="description">
646-
Node env.
647-
NodeClient - constructor from node-xmpp-client
648-
nClient - connection
634+
Node env.NodeClient - constructor from node-xmpp-clientnClient - connection
649635
</div>
650636

651637

@@ -735,8 +721,7 @@ <h4 class="name" id="WebRTCSession">WebRTCSession</h4>
735721
<dd>
736722

737723
<div class="description">
738-
QuickBlox JavaScript SDK
739-
WebRTC Module (WebRTC client)
724+
QuickBlox JavaScript SDKWebRTC Module (WebRTC client)
740725
</div>
741726

742727

@@ -928,7 +913,7 @@ <h4 class="name" id="_prepareExtension">
928913

929914

930915
<div class="tag-source">
931-
modules/webrtc/qbWebRTCSession.js, line 860
916+
modules/webrtc/qbWebRTCSession.js, line 871
932917
</div>
933918

934919
</div>
@@ -939,8 +924,7 @@ <h4 class="name" id="_prepareExtension">
939924

940925

941926
<div class="description">
942-
private _prepareExtension - replace property null to empty string
943-
return object with property or empty if extension didn't set
927+
private _prepareExtension - replace property null to empty stringreturn object with property or empty if extension didn't set
944928
</div>
945929

946930

@@ -1386,8 +1370,7 @@ <h4 class="name" id="WebRTCSignalingConstants">
13861370

13871371

13881372
<div class="description">
1389-
QuickBlox JavaScript SDK
1390-
WebRTC Module (WebRTC signaling constants)
1373+
QuickBlox JavaScript SDKWebRTC Module (WebRTC signaling constants)
13911374
</div>
13921375

13931376

@@ -1734,7 +1717,7 @@ <h4 class="name" id="createSession">
17341717

17351718

17361719
<div class="tag-source">
1737-
qbMain.js, line 119
1720+
qbMain.js, line 118
17381721
</div>
17391722

17401723
</div>
@@ -1873,7 +1856,7 @@ <h4 class="name" id="destroySessionCallback">
18731856

18741857

18751858
<div class="tag-source">
1876-
qbMain.js, line 134
1859+
qbMain.js, line 133
18771860
</div>
18781861

18791862
</div>
@@ -2134,7 +2117,7 @@ <h4 class="name" id="getSessionCallback">
21342117

21352118

21362119
<div class="tag-source">
2137-
qbMain.js, line 103
2120+
qbMain.js, line 102
21382121
</div>
21392122

21402123
</div>
@@ -2273,7 +2256,7 @@ <h4 class="name" id="loginCallback">
22732256

22742257

22752258
<div class="tag-source">
2276-
qbMain.js, line 150
2259+
qbMain.js, line 149
22772260
</div>
22782261

22792262
</div>
@@ -2418,7 +2401,7 @@ <h4 class="name" id="logoutCallback">
24182401

24192402

24202403
<div class="tag-source">
2421-
qbMain.js, line 165
2404+
qbMain.js, line 164
24222405
</div>
24232406

24242407
</div>
@@ -2709,7 +2692,7 @@ <h4 class="name" id="removeRosterCallback">
27092692

27102693

27112694
<footer>
2712-
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu Nov 24 2016 18:27:01 GMT+0200 (EET)
2695+
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed Nov 30 2016 15:51:27 GMT+0200 (FLE Standard Time)
27132696
</footer>
27142697
</div>
27152698
</div>

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ <h1>License</h1><p>Apache 2.0</p></article>
280280

281281

282282
<footer>
283-
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu Nov 24 2016 18:27:01 GMT+0200 (EET)
283+
Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed Nov 30 2016 15:51:27 GMT+0200 (FLE Standard Time)
284284
</footer>
285285
</div>
286286
</div>

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gulp.task('build', function () {
2424
return browserify('./src/qbMain.js', browserifyOpts)
2525
.bundle()
2626
.on('error', function(error) {
27-
notify('Failed when create a bundle <%= error.message %>');
27+
notify('Failed when create a bundle.');
2828
this.emit('end');
2929
})
3030
.pipe(source('quickblox.min.js'))

‎package.json‎

Lines changed: 3 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.4.0",
4+
"version": "2.5.0",
55
"homepage": "https://quickblox.com/developers/Javascript",
66
"main": "src/qbMain.js",
77
"license": "(Apache-2.0)",
@@ -77,11 +77,11 @@
7777
}
7878
},
7979
"scripts": {
80-
"setDependencies": "npm i && npm install -g gulp-cli && npm install -g jasmine",
80+
"setDependencies": "npm i && npm install -g gulp-cli && npm install rimraf -g &&npm install -g jasmine",
8181
"lint": "jshint src --reporter=node_modules/jshint-stylish",
8282
"build": "npm run lint && gulp generate-build_version && gulp build && gulp minify && npm run doc",
8383
"develop": "cross-env NODE_ENV=develop gulp",
84-
"doc": "rm -r docs || mkdir docs && jsdoc -c ./jsdoc.conf.json",
84+
"doc": "rimraf docs && mkdir docs && jsdoc -c ./jsdoc.conf.json",
8585
"start": "gulp connect"
8686
}
8787
}

0 commit comments

Comments
 (0)