Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f5bccd5
First cut at slider
rreusser Sep 28, 2016
83483fd
Fix lint errors in slider
rreusser Sep 28, 2016
f69a328
Add slider transitions
rreusser Sep 28, 2016
82ea558
Expand touchable slider area
rreusser Sep 28, 2016
ca5f9f5
Add slider mock
rreusser Sep 28, 2016
c6a3e11
Rename sliders and bump circular require tolerance
rreusser Sep 28, 2016
5b74652
Add trbl padding to sliders
rreusser Sep 28, 2016
e13e0ee
Remove fanciness from slider constants
rreusser Sep 28, 2016
8fe1842
Tweak slider behavior to avoid event -> method loops
rreusser Sep 28, 2016
05ac586
Improve padding logic for updatemenus
rreusser Sep 28, 2016
4604341
Add jasmine tests for updatemenus padding
rreusser Sep 29, 2016
8558be8
add streaming maxpoints max and dflt
cldougl Sep 29, 2016
c673afe
Merge pull request #996 from plotly/maxpt_dflt
cldougl Sep 29, 2016
304174a
Add current value output to sliders
rreusser Sep 29, 2016
fce36fa
Merge pull request #989 from plotly/fix-updatemenus-padding
rreusser Sep 29, 2016
52b4a2a
First cut at slider
rreusser Sep 28, 2016
b161d55
Fix lint errors in slider
rreusser Sep 28, 2016
8d7c40d
Add slider transitions
rreusser Sep 28, 2016
30b5f2d
Expand touchable slider area
rreusser Sep 28, 2016
19442d9
Add slider mock
rreusser Sep 28, 2016
ecb7e87
Rename sliders and bump circular require tolerance
rreusser Sep 28, 2016
9c0f9ac
Add trbl padding to sliders
rreusser Sep 29, 2016
2a6f987
Remove fanciness from slider constants
rreusser Sep 28, 2016
5bd6bdd
Tweak slider behavior to avoid event -> method loops
rreusser Sep 28, 2016
4520a48
Add current value output to sliders
rreusser Sep 29, 2016
88d6728
Tweak slider colors
rreusser Sep 29, 2016
6da5b0f
Fix sliders in plot schema
rreusser Sep 29, 2016
1cad8a4
Merge branch 'slider-component' of github.com:plotly/plotly.js into s…
rreusser Sep 29, 2016
4a9edd0
Working through slider testing issues
rreusser Sep 29, 2016
6cb6d42
Add slider tests
rreusser Oct 3, 2016
4775a47
Test updateevent for sliders
rreusser Oct 3, 2016
a08f084
Update sliders baseline to reflect bugfix
rreusser Oct 3, 2016
5816c24
Fix plot schema error
rreusser Oct 3, 2016
2cfa81b
Remove unneeded lines from sliders test
rreusser Oct 4, 2016
1d52b51
Remove updatevalue and updateevent
rreusser Oct 6, 2016
892583d
Removed unused slider function
rreusser Oct 6, 2016
5015710
Clean up slider options
rreusser Oct 6, 2016
582c643
Remove unneeded/failing slider test
rreusser Oct 6, 2016
70610ec
Add suffix to currentvalue slider label
rreusser Oct 6, 2016
f25127c
don't coerce slider currentvalue attrs when !visible
rreusser Oct 6, 2016
4b608ee
Be more specific about *all* unused slider attrs not set
rreusser Oct 6, 2016
6c9034d
Test mouse movement for sliders
rreusser Oct 6, 2016
21e2f99
Make sure slider Drawing.bBox calls fall back to defined
rreusser 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
Rename sliders and bump circular require tolerance
  • Loading branch information
rreusser committed Sep 29, 2016
commit ecb7e878d941bbc65660a5469fb13391dc1a0c98
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ function findDimensions(gd, sliderOpts) {
sliderOpts.labelStride = Math.max(1, Math.ceil(computedSpacePerLabel / availableSpacePerLabel));
sliderOpts.labelHeight = labelHeight;

// Hard-code this for now:
sliderOpts.height = constants.tickOffset + constants.tickLength + sliderOpts.labelHeight + sliderOpts.ypad * 2;

var xanchor = 'left';
Expand Down Expand Up @@ -205,6 +204,8 @@ function drawSlider(gd, sliderGroup, sliderOpts) {
// Position the rectangle:
Lib.setTranslate(sliderGroup, sliderOpts.lx + sliderOpts.xpad, sliderOpts.ly + sliderOpts.ypad);

// Every time the slider is draw from scratch, just detach and reattach the event listeners.
// This could perhaps be avoided.
removeListeners(gd, sliderGroup, sliderOpts);
attachListeners(gd, sliderGroup, sliderOpts);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

exports.moduleType = 'component';

exports.name = 'slider';
exports.name = 'sliders';

exports.layoutAttributes = require('./attributes');

Expand Down
2 changes: 1 addition & 1 deletion src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ exports.register([
require('./components/shapes'),
require('./components/images'),
require('./components/updatemenus'),
require('./components/slider'),
require('./components/sliders'),
require('./components/rangeslider'),
require('./components/rangeselector')
]);
Expand Down
13 changes: 11 additions & 2 deletions src/plot_api/plot_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ Plotly.plot = function(gd, data, layout, config) {
Registry.getComponentMethod('legend', 'draw')(gd);
Registry.getComponentMethod('rangeselector', 'draw')(gd);
Registry.getComponentMethod('updatemenus', 'draw')(gd);
Registry.getComponentMethod('slider', 'draw')(gd);
Registry.getComponentMethod('sliders', 'draw')(gd);

for(i = 0; i < calcdata.length; i++) {
cd = calcdata[i];
Expand Down Expand Up @@ -304,7 +304,7 @@ Plotly.plot = function(gd, data, layout, config) {
Registry.getComponentMethod('rangeslider', 'draw')(gd);
Registry.getComponentMethod('rangeselector', 'draw')(gd);
Registry.getComponentMethod('updatemenus', 'draw')(gd);
Registry.getComponentMethod('slider', 'draw')(gd);
Registry.getComponentMethod('sliders', 'draw')(gd);
}

function cleanUp() {
Expand Down Expand Up @@ -1946,6 +1946,15 @@ function _relayout(gd, aobj) {
for(i = 0; i < diff; i++) menus.push({});
flags.doplot = true;
}
else if(p.parts[0] === 'sliders') {
Lib.extendDeepAll(gd.layout, Lib.objectFromPath(ai, vi));

var sliders = gd._fullLayout.sliders || [];
diff = (p.parts[2] + 1) - sliders.length;

for(i = 0; i < diff; i++) sliders.push({});
flags.doplot = true;
}
// alter gd.layout
else {
// check whether we can short-circuit a full redraw
Expand Down
2 changes: 1 addition & 1 deletion src/plotly.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports.Shapes = require('./components/shapes');
exports.Legend = require('./components/legend');
exports.Images = require('./components/images');
exports.UpdateMenus = require('./components/updatemenus');
exports.Slider = require('./components/slider');
exports.Sliders = require('./components/sliders');
exports.ModeBar = require('./components/modebar');

// plot api
Expand Down
2 changes: 1 addition & 1 deletion tasks/test_syntax.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function assertCircularDeps() {
// as of v1.17.0 - 2016/09/08
// see https://github.com/plotly/plotly.js/milestone/9
// for more details
var MAX_ALLOWED_CIRCULAR_DEPS = 33;
var MAX_ALLOWED_CIRCULAR_DEPS = 34;

if(circularDeps.length > MAX_ALLOWED_CIRCULAR_DEPS) {
logs.push('some new circular dependencies were added to src/');
Expand Down