Merge branch 'release/3.9.07'

Author: javisantana

NEWS

@@ -1,3 +1,21 @@
+3.9.07 (03//06//2014)
+- Fixed exception on hover for layers without tooltip
+- Improved tooltip interaction
+- Changed cartocss library to support marker-type "rectangle"
+- Fixed setParam when there are no default params (#120)
+
+3.9.06 (25//05//2014)
+- Allowfullscreen parameter added to iframe code
+  in share dialog.
+- Enables custom legends in Torque.
+
+3.9.05 (19//05//2014)
+- Fixed tileJSON method in cdb.Tiles
+- Adds support for Markdown in descriptions
+
+3.9.04 (14//05//2014)
+- Added position parameter in Tooltip overlay
+
 3.9.03 (14//05//2014)
 - Added tooltip option in createLayer method
 

dist/cartodb.core.js

@@ -1,5 +1,5 @@
-// version: 3.9.03
-// sha: dfbb8f4204e231cd83fc53f18e0a00e25ff99a53
+// version: 3.9.07
+// sha: 5472b924db5374c519a5de4f73f8681e7861c4f5
 ;(function() {
   this.cartodb = {};
   var Backbone = {};
@@ -1141,7 +1141,7 @@ var Mustache;
 
     var cdb = root.cdb = {};
 
-    cdb.VERSION = '3.9.03';
+    cdb.VERSION = '3.9.07';
     cdb.DEBUG = false;
 
     cdb.CARTOCSS_VERSIONS = {
@@ -2418,12 +2418,23 @@ Map.prototype = {
     this.invalidate();
   },
 
-  _tileJSONfromTiles: function(layer, urls) {
+  _tileJSONfromTiles: function(layer, urls, options) {
+    options = options || {};
+    var subdomains = options.subdomains || ['0', '1', '2', '3'];
+
+    function replaceSubdomain(t) {
+      var tiles = [];
+      for (var i = 0; i < t.length; ++i) {
+        tiles.push(t[i].replace('{s}', subdomains[i % subdomains.length]));
+      }
+      return tiles;
+    }
+
     return {
       tilejson: '2.0.0',
       scheme: 'xyz',
-      grids: urls.grids[layer],
-      tiles: urls.tiles,
+      grids: replaceSubdomain(urls.grids[layer]),
+      tiles: replaceSubdomain(urls.tiles),
       formatter: function(options, data) { return data; }
      };
   },
@@ -2433,13 +2444,14 @@ Map.prototype = {
    */
   getTileJSON: function(layer, callback) {
     layer = layer == undefined ? 0: layer;
+    var self = this;
     this.getTiles(function(urls) {
       if(!urls) {
         callback(null);
         return;
       }
       if(callback) {
-        callback(this._tileJSONfromTiles(layer, urls));
+        callback(self._tileJSONfromTiles(layer, urls));
       }
     });
   },
@@ -2569,6 +2581,9 @@ NamedMap.prototype = _.extend({}, Map.prototype, {
     } else {
       params = attr;
     }
+    if (!this.named_map.params) {
+      this.named_map.params = {};
+    }
     for (var k in params) {
       if (params[k] === undefined || params[k] === null) {
         delete this.named_map.params[k];

dist/cartodb.core.uncompressed.js

@@ -775,6 +775,15 @@ div.cartodb-header div.social a {
   background:url('../img/other.png') no-repeat 0 0;
 }
 
+div.cartodb-header a {
+  color: #397DBA;
+  text-decoration: none;
+}
+
+div.cartodb-header a:hover {
+  text-decoration: underline;
+}
+
 div.cartodb-header div.social a.twitter {
   margin-left:3px;
   background:url('../img/other.png') no-repeat -26px 0;
@@ -3362,6 +3371,7 @@ div.cartodb-timeslider .ui-slider-vertical .ui-slider-range-max {
 
   div.cartodb-tooltip-content p {
     display:block;
+    margin:0;
     padding:0 0 7px;
     font:normal 12px "Helvetica Neue", "Helvetica", Arial;
     color:#333333;