Skip to content

Commit 0f5940f

Browse files
author
Igor Khomenko
committed
Merge branch 'develop' of github.com:QuickBlox/quickblox-javascript-sdk into develop
2 parents 08322ee + 3340476 commit 0f5940f

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: node_js
22
node_js:
33
- "4.1"
44

5-
before_script: "npm run-script build"
6-
script: "npm run-script test"
5+
before_script: "npm run-script setDependencies"
76

7+
script: "grunt"
8+
after_success: "jasmine"

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# QuickBlox JavaScript SDK
22

3-
[![npm](https://img.shields.io/npm/v/quickblox.svg)]()
4-
[![npm](https://img.shields.io/npm/dm/quickblox.svg)]()
3+
[![travis-ci](https://api.travis-ci.org/QuickBlox/quickblox-javascript-sdk.svg?branch=gh-pages)](https://travis-ci.org/QuickBlox/quickblox-javascript-sdk)
4+
[![npm](https://img.shields.io/npm/v/quickblox.svg)](https://www.npmjs.com/package/quickblox)
5+
[![npm](https://img.shields.io/npm/dm/quickblox.svg)](https://www.npmjs.com/package/quickblox)
56

67
The QuickBlox JavaScript SDK provides a JavaScript library making it even
78
easier to access the QuickBlox cloud communication backend platform.
@@ -19,7 +20,7 @@ For correct work of JS SDK you must include the library in your html before `qu
1920

2021
```html
2122
<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.0.2/quickblox.min.js"></script>
23+
<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.0.4/quickblox.min.js"></script>
2324
```
2425

2526
## Bower and RequireJS
@@ -78,6 +79,7 @@ The quickblox.js library is build from a number of **CommonJS modules** containe
7879
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:
7980

8081
* You need to have the dependencies listed in the package.json available, use `npm install` to load them.
82+
* Install grunt-cli `npm install -g grunt-cli`
8183
* Also you need install jasmine global `npm i -g jasmine` for tests.
8284
* Change the 'version' properties in next files:
8385
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/js/qbConfig.js

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
}
7575
},
7676
"scripts": {
77-
"build": "npm install -g jasmine && npm install -g grunt && grunt",
77+
"setDependencies": "npm i && npm install -g grunt-cli && npm install -g jasmine",
78+
"build": "grunt",
7879
"test": "jasmine"
7980
}
8081
}

0 commit comments

Comments
 (0)