Skip to content

Commit 215e26a

Browse files
committed
Merge branch 'develop' into 'master'
2 parents 3b04fc4 + 0406f2c commit 215e26a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1354
-490
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,8 @@
5454
"node": true,
5555
"mocha": true
5656
},
57+
"parserOptions": {
58+
"ecmaVersion": 6
59+
},
5760
"extends": "eslint:recommended"
5861
}

.jshintrc

Lines changed: 0 additions & 13 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install:
1818
- npm install
1919
env:
2020
global:
21-
secure: EZ+XXJFDtehmag7wt8JbutqgzpkkJUCzkEWw6W+p7MIxWenLyuGv/RUu7KGqAloOud1cZbmZGSfRx/vsPvxRjo+ZC7aaPqb74qRvfctGdlJTtEffS2jFno1pEppJzCR4n7vocSfMVYtOD6oHP67lXwn/Qnh++WUkZaV137m5+7rqiYgJ+JTeSs5jBRZ6X7VNoNz8tZXejQ+FOymCFQTS2JM/rSZX9NEK+OwUEhEjRcxqWMm2avk6NAQNAL3WQuIBJQH8lxEJxOXkMc0rQZZ09AoLpqJKzsaicaZMInt5JstPo2e9vJfhi+PpRSNhErIff36aCHWRYYDPKl5x6IelZpBfZeTdrs4V2TbRi1y0ELbgMG1FHS4HAw3vTnh4/49g01lAJed4UguFRc6MzwTLAL8uPG/zFe8snm9+kaf4pL7yO89Hf3eltE03+N//tyVv+X/jdSca2dBZ9FMeLE5pJ2jlRiKitCLjXmLUEMMxEwNF7K/IvOrD9wue3JXK0UogOpcXfppk++pNTijsZluU1Yj7k3fGFeS8d6rIU0Yj40y6/VMaJeL4EXlARRsGLigUKVjQL6+/N5xudlsCng+EG+WVIy4wEEPH0QgjUkPTgWx1NrUlTwjskE0cdqDOBu39WkRFJHHECYFPTfTuDJ7xxuuibFTQmUFu2zjbYfYKhPE=
21+
secure: J5FHR91BBBrVqS5QMl+ZC3Oi2UgyQpW5SlKhfCwXJU2rz8XHNWajT5hjihlNiE6SVuUDVNflCcJI7DRD7+hwCt+G0rL9UuLnkKuMGVuVc/vMAjYpjRoVgWHk4KSwN4qWYcbF0k9d5POelI36xFnuQM0ttb3kDi/8T1s26Vsqw2Db1YDoK94ZkqO633gwwmr9RX05+sLXIuKai1bfIjUGU3YTusY0hDVw78Sg+/o1qCHNVwLDutpae/wLypO1/hujgh8SjIkAQBa/yp1gT2W+ykIaApk8eZn630usVttdToDgh2Z5+RLcgHOMi/p2/NvB/XKDq+sYh55tuKtdzu6MNx1vEVolcfiPkI0yPzwAs1IgTxAtGpKVkRlIZNMyksAQBikLqI6iFJHqYcPDHo+R+IwrXXSwZL/gbcfAtLiYWx1JnZHL8KfFz5KvRtINA4iEopzTQrOPJibFYNMWMyybvx7cHe4SAbtZxKq6cCt3fUzvwzfTIQ8m5k6y+w/bOiYY/HV8zvNw5bCS1N6h/6u8mmZMw3wv9N9eQz+h2BKwSziWt27CXcUKl6HhHklR7zj3/b7HwKW1o7Y0cixTl8kUBC8k+093Mhg4FmJWEAacfXVzRDs5nEejronmNUTi8hnpsSBeNMQnuD99zQp+eIi5PjfZ9DsCCM85cYb/LG1HyLs=
2222
deploy:
2323
provider: npm
2424
skip_cleanup: true

README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Official Kuzzle Javascript SDK
55
======
66

7-
This SDK version is compatible with Kuzzle 1.0.0-RC6 and higher
87

98
Please use SDK v1.x for earlier versions of Kuzzle.
109

@@ -100,15 +99,18 @@ kuzzle
10099

101100
### Javascript
102101

103-
You can install this SDK with [Bower](http://bower.io/).
104-
```
105-
bower install kuzzle-sdk --save
102+
Clone this github repository and run ``npm run build``. A ``dist`` directory will be created, containing a browser version of this SDK.
103+
104+
105+
```html
106+
<script type="text/javascript" src="dist/kuzzle.js"></script>
106107
```
107108

109+
If you want to support older browser versions, you may load `socket.io` before Kuzzle, making the SDK compatible with browsers without websocket support:
110+
108111
```html
109-
<!-- Don't forget to include socketio before kuzzle -->
110-
<script type="text/javascript" src="bower_components/socket.io-client/socket.io.js"></script>
111-
<script type="text/javascript" src="bower_components/kuzzle-sdk/dist/kuzzle.min.js"></script>
112+
<!-- Don't forget to include socketio before kuzzle SDK -->
113+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.6.0/socket.io.min.js"></script>
112114
```
113115

114116
#### <a name="basic-usage-js"></a> Basic usage
@@ -137,10 +139,6 @@ kuzzle
137139
});
138140
```
139141

140-
## Building manually
141-
142-
Clone this github repository and run ``npm run build``. A ``dist`` directory will be created, containing a plain browserified version of this SDK, and a minified version.
143-
144142
## Migrating from SDK v1.x
145143

146144
* Kuzzle constructor has been changed. Instead of an URL, you have to provide a resolvable server name, or an IP address. If you need to specify a port different than the provided default values, you can do so using these two new options: `wsPort` (WebSocket port) and `ioPort` (Socket.IO port)

bower.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

codecov.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
coverage:
2+
range: "90...100"
3+
4+
status:
5+
project:
6+
default:
7+
threshold: 1
8+
9+
patch:
10+
default:
11+
branches:
12+
- master

deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ then
55
echo "Push generated dist folder"
66
git config --global user.email "support@kuzzle.io"
77
git config --global user.name "Travis CI"
8-
git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build
8+
git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build > /dev/null 2>&1
99
cd travis-build
1010
ln -s ${TRAVIS_BUILD_DIR}/node_modules
1111
npm run build
1212
git add dist/
13-
git commit -am "Travis CI - [ci skip] - automatic dist folder"
13+
git commit -am "Travis CI - [ci skip] - automatic dist folder" > /dev/null 2>&1
1414
git push origin ${TRAVIS_BRANCH}
1515
fi
1616

dist/kuzzle.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/kuzzle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)