Merge branch 'rangeslider-allow-zoom-on-oppaxis' of github.com:TomDemulierChevret/plotly.js into rangeslider-allow-zoom-on-oppaxis

Author: alexcjohnson

src/components/rangeslider/defaults.js

@@ -10,7 +10,7 @@
 
 var Lib = require('../../lib');
 var attributes = require('./attributes');
-var rangeAttributes = require('./range_attributes');
+var oppAxisAttrs = require('./oppaxis_attributes');
 var axisIds = require('../../plots/cartesian/axis_ids');
 
 module.exports = function handleDefaults(layoutIn, layoutOut, axName) {
@@ -30,7 +30,7 @@ module.exports = function handleDefaults(layoutIn, layoutOut, axName) {
     }
 
     function coerceRange(rangeContainerIn, rangeContainerOut, attr, dflt) {
-        return Lib.coerce(rangeContainerIn, rangeContainerOut, rangeAttributes, attr, dflt);
+        return Lib.coerce(rangeContainerIn, rangeContainerOut, oppAxisAttrs, attr, dflt);
     }
 
     var visible = coerce('visible');

src/components/rangeslider/index.js

@@ -8,13 +8,21 @@
 
 'use strict';
 
+var Lib = require('../../lib');
+var attrs = require('./attributes');
+var oppAxisAttrs = require('./oppaxis_attributes');
+
 module.exports = {
     moduleType: 'component',
     name: 'rangeslider',
 
     schema: {
         subplots: {
-            xaxis: {rangeslider: require('./attributes')}
+            xaxis: {
+                rangeslider: Lib.extendFlat({}, attrs, {
+                    yaxis: oppAxisAttrs
+                })
+            }
         }
     },
 

src/components/rangeslider/range_attributes.js renamed to src/components/rangeslider/oppaxis_attributes.js

@@ -9,6 +9,11 @@
 'use strict';
 
 module.exports = {
+    // not really a 'subplot' attribute container,
+    // but this is the flag we use to denote attributes that
+    // support yaxis, yaxis2, yaxis3, ... counters
+    _isSubplotObj: true,
+
     rangemode: {
         valType: 'enumerated',
         values: ['auto', 'fixed', 'match'],

test/jasmine/tests/plotschema_test.js

@@ -126,9 +126,15 @@ describe('plot schema', function() {
     });
 
     it('all subplot objects should contain _isSubplotObj', function() {
-        var IS_SUBPLOT_OBJ = '_isSubplotObj',
-            astrs = ['xaxis', 'yaxis', 'scene', 'geo', 'ternary', 'mapbox', 'polar'],
-            cnt = 0;
+        var IS_SUBPLOT_OBJ = '_isSubplotObj';
+        var cnt = 0;
+
+        var astrs = [
+            'xaxis', 'yaxis', 'scene', 'geo', 'ternary', 'mapbox', 'polar',
+            // not really a 'subplot' object but supports yaxis, yaxis2, yaxis3,
+            // ... counters, so list it here
+            'xaxis.rangeslider.yaxis'
+        ];
 
         // check if the subplot objects have '_isSubplotObj'
         astrs.forEach(function(astr) {

test/jasmine/tests/validate_test.js

@@ -505,4 +505,25 @@ describe('Plotly.validate', function() {
             'In layout, key grid.subplots[2][0] is set to an invalid value (5)'
         );
     });
+
+    it('should detect opposite axis range slider attributes', function() {
+        var out = Plotly.validate([
+            {y: [1, 2]},
+            {y: [1, 2], yaxis: 'y2'},
+            {y: [1, 2], yaxis: 'y3'}
+        ], {
+            xaxis: {
+                rangeslider: {
+                    yaxis: { rangemode: 'auto' },
+                    yaxis2: { rangemode: 'fixed' },
+                    yaxis3: { range: [0, 1] }
+                }
+            },
+            yaxis: {},
+            yaxis2: {},
+            yaxis3: {}
+        });
+
+        expect(out).toBeUndefined();
+    });
 });