Merge branch 'master' into ternary

plotly · etpinard · Apr 12, 2016 · Mar 11, 2016 · Mar 13, 2016 · Mar 13, 2016
commit e78818dd0b8a04f67903ce365ab24a26455ec21b
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -33,8 +33,8 @@ axes.getFromTrace = axisIds.getFromTrace;
 
 // find the list of possible axes to reference with an xref or yref attribute
 // and coerce it to that list
-axes.coerceRef = function(containerIn, containerOut, td, axLetter) {
-    var axlist = td._fullLayout._hasGL2D ? [] : axes.listIds(td, axLetter),
+axes.coerceRef = function(containerIn, containerOut, gd, axLetter) {
+    var axlist = gd._fullLayout._hasGL2D ? [] : axes.listIds(gd, axLetter),
         refAttr = axLetter + 'ref',
         attrDef = {};
 
@@ -832,7 +832,7 @@ function modDateFormat(fmt,x) {
 }
 
 // draw the text for one tick.
-// px,py are the location on td.paper
+// px,py are the location on gd.paper
 // prefix is there so the x axis ticks can be dropped a line
 // ax is the axis layout, x is the tick value
 // hover is a (truthy) flag for whether to show numbers with a bit
@@ -1251,13 +1251,13 @@ axes.findSubplotsWithAxis = function(subplots, ax) {
 };
 
 // makeClipPaths: prepare clipPaths for all single axes and all possible xy pairings
-axes.makeClipPaths = function(td) {
-    var layout = td._fullLayout,
+axes.makeClipPaths = function(gd) {
+    var layout = gd._fullLayout,
         defs = layout._defs,
         fullWidth = {_offset: 0, _length: layout.width, _id: ''},
         fullHeight = {_offset: 0, _length: layout.height, _id: ''},
-        xaList = axes.list(td, 'x', true),
-        yaList = axes.list(td, 'y', true),
+        xaList = axes.list(gd, 'x', true),
+        yaList = axes.list(gd, 'y', true),
         clipList = [],
         i,
         j;
@@ -1373,11 +1373,10 @@ axes.doTicks = function(gd, axid, skipTitle) {
         pad = (ax.linewidth||1) / 2,
         labelStandoff =
             (ax.ticks==='outside' ? ax.ticklen : 1) + (ax.linewidth||0),
-        labelShift = 0,
-        gridWidth = Plotly.Drawing.crispRound(td, ax.gridwidth, 1),
-        zeroLineWidth = Plotly.Drawing.crispRound(td, ax.zerolinewidth, gridWidth),
-        tickWidth = Plotly.Drawing.crispRound(td, ax.tickwidth, 1),
-        sides, transfn, tickpathfn,
+        gridWidth = Plotly.Drawing.crispRound(gd, ax.gridwidth, 1),
+        zeroLineWidth = Plotly.Drawing.crispRound(gd, ax.zerolinewidth, gridWidth),
+        tickWidth = Plotly.Drawing.crispRound(gd, ax.tickwidth, 1),
+        sides, transfn, tickprefix, tickmid,
         i;
 
     if(ax._counterangle && ax.ticks==='outside') {
@@ -1648,14 +1647,14 @@ axes.doTicks = function(gd, axid, skipTitle) {
         // now this only applies to regular cartesian axes; colorbars and
         // others ALWAYS call doTicks with skipTitle=true so they can
         // configure their own titles.
-        var ax = axisIds.getFromId(td, axid),
-            avoidSelection = d3.select(td).selectAll('g.' + axid + 'tick'),
+        var ax = axisIds.getFromId(gd, axid),
+            avoidSelection = d3.select(gd).selectAll('g.' + axid + 'tick'),
             avoid = {
                 selection: avoidSelection,
                 side: ax.side
             },
             axLetter = axid.charAt(0),
-            gs = td._fullLayout._size,
+            gs = gd._fullLayout._size,
             offsetBase = 1.5,
             fontSize = ax.titlefont.size,
             transform,
@@ -1675,20 +1674,24 @@ axes.doTicks = function(gd, axid, skipTitle) {
         if(axLetter === 'x') {
             counterAxis = (ax.anchor === 'free') ?
                 {_offset: gs.t + (1 - (ax.position || 0)) * gs.h, _length: 0} :
-                axisIds.getFromId(td, ax.anchor);
+                axisIds.getFromId(gd, ax.anchor);
 
             x = ax._offset + ax._length / 2;
             y = counterAxis._offset + ((ax.side === 'top') ?
                 -10 - fontSize*(offsetBase + (ax.showticklabels ? 1 : 0)) :
                 counterAxis._length + 10 +
                     fontSize*(offsetBase + (ax.showticklabels ? 1.5 : 0.5)));
 
+            if(ax.rangeslider && ax.rangeslider.visible && ax._boundingBox) {
+                y += gs.h * ax.rangeslider.thickness + ax._boundingBox.height;
+            }
+
             if(!avoid.side) avoid.side = 'bottom';
         }
         else {
             counterAxis = (ax.anchor === 'free') ?
                 {_offset: gs.l + (ax.position || 0) * gs.w, _length: 0} :
-                axisIds.getFromId(td, ax.anchor);
+                axisIds.getFromId(gd, ax.anchor);
 
             y = ax._offset + ax._length / 2;
             x = counterAxis._offset + ((ax.side === 'right') ?
@@ -1700,7 +1703,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
             if(!avoid.side) avoid.side = 'left';
         }
 
-        Titles.draw(td, axid + 'title', {
+        Titles.draw(gd, axid + 'title', {
             propContainer: ax,
             propName: ax._name + '.title',
             dfltName: axLetter.toUpperCase() + ' axis',
@@ -1741,8 +1744,8 @@ axes.doTicks = function(gd, axid, skipTitle) {
         // zero line
         if(zlcontainer) {
             var hasBarsOrFill = false;
-            for(var i = 0; i < td._fullData.length; i++) {
-                if(traceHasBarsOrFill(td._fullData[i], subplot)) {
+            for(var i = 0; i < gd._fullData.length; i++) {
+                if(traceHasBarsOrFill(gd._fullData[i], subplot)) {
                     hasBarsOrFill = true;
                     break;
                 }

diff --git a/src/plots/cartesian/layout_defaults.js b/src/plots/cartesian/layout_defaults.js
@@ -116,7 +116,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 
     var bgColor = Color.combine(plot_bgcolor, layoutOut.paper_bgcolor);
 
-    xaList.concat(yaList).forEach(function(axName) {
+    axesList.forEach(function(axName) {
         var axLetter = axName.charAt(0),
             axLayoutIn = layoutIn[axName] || {},
             axLayoutOut = {},
@@ -152,4 +152,12 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         }
 
     });
+
+    // quick second pass for rangeslider defaults
+    axesList.forEach(function(axName) {
+        var axLetter = axName.charAt(0),
+            counterAxes = {x: yaList, y: xaList}[axLetter];
+
+        RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+    });
 };