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
etpinard merged 14 commits into from
Oct 6, 2016
Merged

Range slider second iteration (part 1) #962

Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions src/components/dragelement/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -177,6 +177,8 @@ function coverSlip() {
return cover;
}

dragElement.coverSlip = coverSlip;

function finishDrag(gd) {
gd._dragging = false;
if(gd._replotPending) Plotly.plot(gd);
Expand Down
51 changes: 51 additions & 0 deletions src/components/rangeslider/constants.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {

// attribute container name
name: 'rangeslider',

// class names

containerClassName: 'rangeslider-container',
bgClassName: 'rangeslider-bg',
rangePlotClassName: 'rangeslider-rangeplot',

maskMinClassName: 'rangeslider-mask-min',
maskMaxClassName: 'rangeslider-mask-max',
slideBoxClassName: 'rangeslider-slidebox',

grabberMinClassName: 'rangeslider-grabber-min',
grabAreaMinClassName: 'rangeslider-grabarea-min',
handleMinClassName: 'rangeslider-handle-min',

grabberMaxClassName: 'rangeslider-grabber-max',
grabAreaMaxClassName: 'rangeslider-grabarea-max',
handleMaxClassName: 'rangeslider-handle-max',

// style constants

maskColor: 'rgba(0,0,0,0.4)',

slideBoxFill: 'transparent',
slideBoxCursor: 'ew-resize',

grabAreaFill: 'transparent',
grabAreaCursor: 'col-resize',
grabAreaWidth: 10,
grabAreaMinOffset: -6,
grabAreaMaxOffset: -2,

handleWidth: 2,
handleRadius: 1,
handleFill: '#fff',
handleStroke: '#666',
};
287 changes: 0 additions & 287 deletions src/components/rangeslider/create_slider.js
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions src/components/rangeslider/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,19 @@ var attributes = require('./attributes');
module.exports = function handleDefaults(layoutIn, layoutOut, axName, counterAxes) {
if(!layoutIn[axName].rangeslider) return;

var containerIn = Lib.isPlainObject(layoutIn[axName].rangeslider) ?
layoutIn[axName].rangeslider : {},
// not super proud of this (maybe store _ in axis object instead
if(!Lib.isPlainObject(layoutIn[axName].rangeslider)) {
layoutIn[axName].rangeslider = {};
}

var containerIn = layoutIn[axName].rangeslider,
containerOut = layoutOut[axName].rangeslider = {};

function coerce(attr, dflt) {
return Lib.coerce(containerIn, containerOut, attributes, attr, dflt);
}

coerce('bgcolor');
coerce('bgcolor', layoutOut.plot_bgcolor);
coerce('bordercolor');
coerce('borderwidth');
coerce('thickness');
Expand All@@ -48,4 +52,7 @@ module.exports = function handleDefaults(layoutIn, layoutOut, axName, counterAxe
layoutOut[ax] = opposing;
});
}

// to map back range slider (auto) range
containerOut._input = containerIn;

@mdtuszmdtuszSep 22, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to delete containerIn._input before this to avoid a loop?

@etpinardetpinardOct 6, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what kind of loop are you referring to here?

@mdtuszmdtuszOct 6, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

containerOut._input = { /* the containerIn */, _input: { /* the previous containerIn */, _input: { /* the previous conta...

@etpinardetpinardOct 6, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_input is always linked to the layout as passed to Plotly.plot(gd, data, layout) - which doesn't know anything about containerOut.

};
Loading