8000 Range slider second iteration (part 1) by etpinard · Pull Request #962 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Range slider second iteration (part 1) #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 6, 2016
Merged

Range slider second iteration (part 1) #962

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a9b83bb
dragelement: export cover slip creator
etpinard Sep 21, 2016
b45f116
rangeslider: keep ref of input rangeslider container
etpinard Sep 21, 2016
dd1f9a3
rangeslider: refactor draw routine
etpinard Sep 21, 2016
1bb274b
rangeslider: rm (now useless) create_slider.js file
etpinard Sep 21, 2016
432f599
plot api: rm (now useless) range slider setRangeSliderRange
etpinard Sep 21, 2016
417435f
test: adapt range slider tests
etpinard Sep 21, 2016
74607d4
test: replace data-min / data-max in range slider tests
etpinard Sep 21, 2016
1d7b066
test: add range slider rrelayout test cases
etpinard Sep 21, 2016
c0ca4f5
test: add a little tolerance for FF
etpinard Sep 22, 2016
b062f0b
test: add toBeWithin jasmine matcher
etpinard Oct 5, 2016
8502206
test: use toBeWithin in range slider test
etpinard Oct 5, 2016
697ed3a
move range slider 'range' compute in update
etpinard Oct 6, 2016
b1155a3
book-keep range slider id
etpinard Sep 23, 2016
2a7696a
rangeslider: inherit 'bgcolor' from 'plot_bgcolor'
etpinard Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: adapt range slider tests 
- with proper class name and full 'translate' values
  • Loading branch information
@etpinard
etpinard committed Sep 21, 2016
commit 417435f8896217393fd0c17b29ee81ae0a9afdd1
53 changes: 35 additions & 18 deletions test/jasmine/tests/range_slider_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');

var RangeSlider = require('@src/components/rangeslider');
var constants = require('@src/components/rangeslider/constants');

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mock = require('../../image/mocks/range_slider.json');
var mouseEvent = require('../assets/mouse_event');


describe('the range slider', function() {

var gd,
Expand All @@ -14,6 +18,12 @@ describe('the range slider', function() {

var sliderY = 393;

function getRangeSlider() {
var className = constants.containerClassName;
return document.getElementsByClassName(className)[0];
}


describe('when specified as visible', function() {

beforeEach(function(done) {
Expand All @@ -22,8 +32,9 @@ describe('the range slider', function() {
var mockCopy = Lib.extendDeep({}, mock);

Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function() {
rangeSlider = document.getElementsByClassName('range-slider')[0];
rangeSlider = getRangeSlider();
children = rangeSlider.children;

done();
});
});
Expand Down Expand Up @@ -65,14 +76,14 @@ describe('the range slider', function() {

expect(rangeSlider.getAttribute('data-min')).toEqual(String(+dataMinStart + diff));
expect(maskMin.getAttribute('width')).toEqual(String(diff));
expect(handleMin.getAttribute('transform')).toBe('translate(' + (diff - 3) + ')');
expect(handleMin.getAttribute('transform')).toBe('translate(' + (diff - 3) + ',0)');
}).then(done);
});

function testTranslate1D(node, val) {
var transformParts = node.getAttribute('transform').split('(');
expect(transformParts[0]).toEqual('translate');
expect(+transformParts[1].split(')')[0]).toBeCloseTo(val, 0);
expect(+transformParts[1].split(',0)')[0]).toBeCloseTo(val, 0);
}

it('should react to resizing the maximum handle', function(done) {
Expand Down Expand Up @@ -177,7 +188,7 @@ describe('the range slider', function() {
it('should not add the slider to the DOM by default', function(done) {
Plotly.plot(gd, [{ x: [1, 2, 3], y: [2, 3, 4] }], {})
.then(function() {
var rangeSlider = document.getElementsByClassName('range-slider')[0];
var rangeSlider = getRangeSlider();
expect(rangeSlider).not.toBeDefined();
})
.then(done);
Expand All @@ -187,7 +198,7 @@ describe('the range slider', function() {
Plotly.plot(gd, [{ x: [1, 2, 3], y: [2, 3, 4] }], {})
.then(function() { Plotly.relayout(gd, 'xaxis.rangeslider', 'exists'); })
.then(function() {
var rangeSlider = document.getElementsByClassName('range-slider')[0];
var rangeSlider = getRangeSlider();
expect(rangeSlider).toBeDefined();
})
.then(done);
Expand All @@ -197,7 +208,7 @@ describe('the range slider', function() {
Plotly.plot(gd, [{ x: [1, 2, 3], y: [2, 3, 4] }], {})
.then(function() { Plotly.relayout(gd, 'xaxis.rangeslider.visible', true); })
.then(function() {
var rangeSlider = document.getElementsByClassName('range-slider')[0];
var rangeSlider = getRangeSlider();
expect(rangeSlider).toBeDefined();
})
.then(done);
Expand All @@ -207,7 +218,7 @@ describe('the range slider', function() {
Plotly.plot(gd, [{ x: [1, 2, 3], y: [2, 3, 4] }], { xaxis: { rangeslider: { visible: true }}})
.then(function() { Plotly.relayout(gd, 'xaxis.rangeslider.visible', false); })
.then(function() {
var rangeSlider = document.getElementsByClassName('range-slider')[0];
var rangeSlider = getRangeSlider();
expect(rangeSlider).not.toBeDefined();
})
.then(done);
Expand Down Expand Up @@ -252,13 +263,14 @@ describe('the range slider', function() {
thickness: 0.15,
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444'
bordercolor: '#444',
_input: layoutIn.xaxis.rangeslider
},
_needsExpand: true
},
yaxis: {
fixedrange: true
}
},
};

RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
Expand All @@ -278,7 +290,8 @@ describe('the range slider', function() {
thickness: 0.15,
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444'
bordercolor: '#444',
_input: layoutIn.xaxis.rangeslider
},
_needsExpand: true
},
Expand Down Expand Up @@ -310,7 +323,8 @@ describe('the range slider', function() {
thickness: 0.15,
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444'
bordercolor: '#444',
_input: layoutIn.xaxis.rangeslider
},
_needsExpand: true
},
Expand All @@ -336,7 +350,8 @@ describe('the range slider', function() {
thickness: 0.15,
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444'
bordercolor: '#444',
_input: {}
},
_needsExpand: true
},
Expand All @@ -362,7 +377,8 @@ describe('the range slider', function() {
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444',
range: [1, 10]
range: [1, 10],
_input: layoutIn.xaxis.rangeslider
},
range: [1, 10]
},
Expand All @@ -386,7 +402,8 @@ describe('the range slider', function() {
thickness: 0.15,
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444'
bordercolor: '#444',
_input: {}
},
range: [2, 40],
_needsExpand: true
Expand All @@ -411,19 +428,19 @@ describe('the range slider', function() {
it('should plot when only x data is provided', function(done) {
Plotly.plot(gd, [{ x: [1, 2, 3] }], { xaxis: { rangeslider: {} }})
.then(function() {
var rangeslider = document.getElementsByClassName('range-slider');
var rangeSlider = getRangeSlider();

expect(rangeslider.length).toBe(1);
expect(rangeSlider).toBeDefined();
})
.then(done);
});

it('should plot when only y data is provided', function(done) {
Plotly.plot(gd, [{ y: [1, 2, 3] }], { xaxis: { rangeslider: {} }})
.then(function() {
var rangeslider = document.getElementsByClassName('range-slider');
var rangeSlider = getRangeSlider();

expect(rangeslider.length).toBe(1);
expect(rangeSlider).toBeDefined();
})
.then(done);
});
Expand Down
0