Skip to content

Commit

Permalink
Files changed for version 3.15.2
Browse files Browse the repository at this point in the history
  • Loading branch information
xavijam committed Sep 1, 2015
1 parent f63194a commit 969c1be
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 16 deletions.
5 changes: 4 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
3.X ()

3.15.2 (01//09//2015)
* Take `visible` attribute into account when determining visibility of layers and serializing maps (#546)
* Only show legends if the layer is visible (#651)
* Extracted pecan code to separate module, https://github.com/CartoDB/pecan/ (#649,#654)
* Search control will show the result of the search with a pin and infowindow (cartodb/#4914).

3.15 (24//06//2015)
* cartodb.js knows how to work with multiple types of sublayers (#508):
Expand Down Expand Up @@ -47,7 +50,7 @@
* Infowindow in anonymous maps are requested by attributes endpoint in maps api so SQL API is not used anymore
* Changed the way remote host is set for maps and sql API.
* Fixed error management when map instanciation fails
* Instead of showing a single date, Torque's timeslider shows the date range that a single step comprises.
* Instead of showing a single date, Torque's timeslider shows the date range that a single step comprises.
* Fixed enabling or disabling the torque loop property not working from cartodb.js
* Allows to specify a step when generating a static map of a Torque layer
* Deprecation warning:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ This library allows to embed visualizations created with CartoDB in your map or
```


2. Create the map and add the layer
2. Create the map and add the layer

```javascript
var map = L.map('map').setView([0, 0], 3);

// set a base layer
// set a base layer
L.tileLayer('http://a.tile.stamen.com/toner/{z}/{x}/{y}.png', {
attribution: 'stamen http://maps.stamen.com/'
}).addTo(map);

// add the cartodb layer
var layerUrl = 'http://documentation.cartodb.com/api/v2/viz/2b13c956-e7c1-11e2-806b-5404a6a683d5/viz.json';
cartodb.createLayer(map, layerUrl).addTo(map);
Expand Down Expand Up @@ -63,7 +63,7 @@ You can find the documentation online [here](http://docs.cartodb.com/cartodb-pla

## How to build
Build CartoDB.js library:

- Install [node.js](http://nodejs.org/download/), from 0.10 version
- Install grunt & bower: `npm install -g grunt-cli bower`
- Install node dependencies: `npm install`
Expand Down
12 changes: 6 additions & 6 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- Create a new branch to prepare the release:

```
git flow release start 3.15.1
git flow release start 3.15.2
```

- Build CartoDB.js files, choosing the new version:
Expand All @@ -25,7 +25,7 @@ grunt release
- Update the NEWS file and commit the changes. Take into account that new CartoDB.js version will be replaced in ```API.md```, ```RELEASING.md```, ```README.md```, ```package.json```, ```cartodb.js``` and ```examples``` files.

```
git commit -am "Files changed for version 3.15.1"
git commit -am "Files changed for version 3.15.2"
```

- Release it.
Expand All @@ -36,8 +36,8 @@ grunt publish

- Check if those files have been updated in the CDN:
```
http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.1/cartodb.js
http://libs.cartocdn.com/cartodb.js/v3/3.15.1/cartodb.js
http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.2/cartodb.js
http://libs.cartocdn.com/cartodb.js/v3/3.15.2/cartodb.js
http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.13/cartodb.js
http://libs.cartocdn.com/cartodb.js/v3/3.13/cartodb.js
```
Expand All @@ -46,7 +46,7 @@ http://libs.cartocdn.com/cartodb.js/v3/3.13/cartodb.js
- And to finish: close the release and push it.

```
git flow release finish 3.15.1
git flow release finish 3.15.2
git push --all
git push --tags
```
Expand Down Expand Up @@ -75,7 +75,7 @@ grunt
grunt publish
```

For example, if we are in 3.15.1 and we want to go back to 3.13.4
For example, if we are in 3.15.2 and we want to go back to 3.13.4

```
git checkout 3.13.4
Expand Down
4 changes: 2 additions & 2 deletions doc/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -1452,10 +1452,10 @@ Anytime you wish to push a stable version of your site to the web though, you ca
alert(cartodb.VERSION)
```
Once you know which version of CartoDB.js you're using, you can point your site to that release. If the current version of CartoDB.js is 3.15.1, the URL would be:
Once you know which version of CartoDB.js you're using, you can point your site to that release. If the current version of CartoDB.js is 3.15.2, the URL would be:
```html
<script src="http://libs.cartocdn.com/cartodb.js/v3/3.15.1/cartodb.js"></script>
<script src="http://libs.cartocdn.com/cartodb.js/v3/3.15.2/cartodb.js"></script>
```
You can do the same for the CSS documents we provide:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cartodb.js",
"version": "3.15.1",
"version": "3.15.2",
"description": "CartoDB javascript library",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/cartodb.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var cdb = root.cdb = {};

cdb.VERSION = "3.15.1";
cdb.VERSION = "3.15.2";
cdb.DEBUG = false;

cdb.CARTOCSS_VERSIONS = {
Expand Down

0 comments on commit 969c1be

Please sign in to comment.