Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Rangeslider speedup #368

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 3 commits into from
Mar 30, 2016
Merged

Rangeslider speedup #368

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
773f4de
Add call to requestAnimationFrame for rangeslider calls
mdtusz Mar 30, 2016
07ac5f3
Fixup tests
mdtusz Mar 30, 2016
a718d15
:expessionless: fdescribe...
mdtusz Mar 30, 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
Fixup tests
  • Loading branch information
@mdtusz
mdtusz committed Mar 30, 2016
commit 07ac5f3d516b18c45aa8394c2298d4f44cf49a4e
114 changes: 61 additions & 53 deletions 114 test/jasmine/tests/range_slider_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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() {
fdescribe('the range slider', function() {

var gd,
rangeSlider,
Expand Down Expand Up @@ -48,89 +48,91 @@ describe('the range slider', function() {
expect(bg.getAttribute('stroke-width')).toBe('2');
});

it('should react to resizing the minimum handle', function() {
it('should react to resizing the minimum handle', function(done) {
var start = 85,
end = 140,
dataMinStart = rangeSlider.getAttribute('data-min'),
diff = end - start;

slide(start, 400, end, 400);
slide(start, 400, end, 400).then(function() {
var maskMin = children[2],
handleMin = children[5];

var maskMin = children[2],
handleMin = children[5];

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(rangeSlider.getAttribute('data-min')).toEqual(String(+dataMinStart + diff));
expect(maskMin.getAttribute('width')).toEqual(String(diff));
expect(handleMin.getAttribute('transform')).toBe('translate(' + (diff - 3) + ')');
}).then(done);
});

it('should react to resizing the maximum handle', function() {
it('should react to resizing the maximum handle', function(done) {
var start = 705,
end = 500,
dataMaxStart = rangeSlider.getAttribute('data-max'),
diff = end - start;

slide(start, 400, end, 400);

var maskMax = children[3],
handleMax = children[6];
slide(start, 400, end, 400).then(function() {
var maskMax = children[3],
handleMax = children[6];

expect(rangeSlider.getAttribute('data-max')).toEqual(String(+dataMaxStart + diff));
expect(maskMax.getAttribute('width')).toEqual(String(-diff));
expect(handleMax.getAttribute('transform')).toBe('translate(' + (+dataMaxStart + diff) + ')');
expect(rangeSlider.getAttribute('data-max')).toEqual(String(+dataMaxStart + diff));
expect(maskMax.getAttribute('width')).toEqual(String(-diff));
expect(handleMax.getAttribute('transform')).toBe('translate(' + (+dataMaxStart + diff) + ')');
}).then(done);
});

it('should react to moving the slidebox left to right', function() {
it('should react to moving the slidebox left to right', function(done) {
var start = 250,
end = 300,
dataMinStart = rangeSlider.getAttribute('data-min'),
diff = end - start;

slide(start, 400, end, 400);

var maskMin = children[2],
handleMin = children[5];
slide(start, 400, end, 400).then(function() {
var maskMin = children[2],
handleMin = children[5];

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

it('should react to moving the slidebox right to left', function() {
it('should react to moving the slidebox right to left', function(done) {
var start = 300,
end = 250,
dataMaxStart = rangeSlider.getAttribute('data-max'),
diff = end - start;

slide(start, 400, end, 400);
slide(start, 400, end, 400).then(function() {
var maskMax = children[3],
handleMax = children[6];

expect(rangeSlider.getAttribute('data-max')).toEqual(String(+dataMaxStart + diff));
expect(maskMax.getAttribute('width')).toEqual(String(-diff));
expect(handleMax.getAttribute('transform')).toEqual('translate(' + (+dataMaxStart + diff) + ')');
}).then(done);

var maskMax = children[3],
handleMax = children[6];

expect(rangeSlider.getAttribute('data-max')).toEqual(String(+dataMaxStart + diff));
expect(maskMax.getAttribute('width')).toEqual(String(-diff));
expect(handleMax.getAttribute('transform')).toEqual('translate(' + (+dataMaxStart + diff) + ')');
});

it('should resize the main plot when rangeslider has moved', function() {
it('should resize the main plot when rangeslider has moved', function(done) {
var start = 300,
end = 400,
rangeDiff1 = gd._fullLayout.xaxis.range[1] - gd._fullLayout.xaxis.range[0];

slide(start, 400, end, 400);

var rangeDiff2 = gd._fullLayout.xaxis.range[1] - gd._fullLayout.xaxis.range[0];

expect(rangeDiff2).toBeLessThan(rangeDiff1);

start = 400;
end = 200;

slide(start, 400, end, 400);

var rangeDiff3 = gd._fullLayout.xaxis.range[1] - gd._fullLayout.xaxis.range[0];

expect(rangeDiff3).toBeLessThan(rangeDiff2);
rangeDiff1 = gd._fullLayout.xaxis.range[1] - gd._fullLayout.xaxis.range[0],
rangeDiff2,
rangeDiff3;

slide(start, 400, end, 400).then(function() {
rangeDiff2 = gd._fullLayout.xaxis.range[1] - gd._fullLayout.xaxis.range[0];
expect(rangeDiff2).toBeLessThan(rangeDiff1);
}).then(function() {
start = 400;
end = 200;

return slide(start, 400, end, 400);
}).then(function() {
rangeDiff3 = gd._fullLayout.xaxis.range[1] - gd._fullLayout.xaxis.range[0];
expect(rangeDiff3).toBeLessThan(rangeDiff2);
}).then(done);
});
});

Expand Down Expand Up @@ -310,8 +312,14 @@ describe('the range slider', function() {


function slide(fromX, fromY, toX, toY) {
mouseEvent('mousemove', fromX, fromY);
mouseEvent('mousedown', fromX, fromY);
mouseEvent('mousemove', toX, toY);
mouseEvent('mouseup', toX, toY);
return new Promise(function(resolve) {
mouseEvent('mousemove', fromX, fromY);
mouseEvent('mousedown', fromX, fromY);
mouseEvent('mousemove', toX, toY);
mouseEvent('mouseup', toX, toY);

setTimeout(function() {
return resolve();
}, 20);
});
}
Morty Proxy This is a proxified and sanitized view of the page, visit original site.