8000 Introducing layout update menus (aka dropdowns) by etpinard · Pull Request #770 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Introducing layout update menus (aka dropdowns) #770

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 17 commits into from
Aug 3, 2016
Merged

Introducing layout update menus (aka dropdowns) #770

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ba20206
introduce UpdateMenus module
etpinard Jul 22, 2016
2ac6dd4
plugin UpdateMenus into plot code
etpinard Jul 22, 2016
a02c225
make 'updatemenus' relayout calls work
etpinard Jul 22, 2016
4f9f525
Merge branch 'master' into layout-updatemenus
etpinard Aug 1, 2016
c9141e0
fixup update menu header drop/fold toggle
etpinard Jul 25, 2016
606c43e
color: add borderLine color def
etpinard Jul 29, 2016
5f99dbf
make update menu style Derek-proof
etpinard Jul 29, 2016
a1265a9
add update menu button label default
etpinard Aug 1, 2016
06e8140
skip over non-object buttons and button w/o 'args'
etpinard Aug 1, 2016
ca26892
DRY up button remove routine
etpinard Aug 1, 2016
b47008f
clear all push margins objects if all menus get removed
etpinard Aug 1, 2016
a33aa46
add updatemenu image test
etpinard Aug 1, 2016
56a3703
add updatemenus jasmine test suite
etpinard Aug 1, 2016
b412398
test: modif update menu test suite to pass on CircleCI
etpinard Aug 2, 2016
b8e80fd
improve 'object constancy' for update menu full opts objects
etpinard Aug 2, 2016
3610253
improve object constancy approach:
etpinard Aug 3, 2016
42d40ee
rm comments (moved to #810)
etpinard Aug 3, 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
DRY up button remove routine
  • Loading branch information
@etpinard
etpinard committed Aug 1, 2016
commit ca26892e61c92d6b825048c8177b5bfec05dfa22
26 changes: 16 additions & 10 deletions src/components/updatemenus/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,23 @@ module.exports = function draw(gd) {
.classed(constants.buttonGroupClassName, true)
.style('pointer-events', 'all');

// whenever we add new menu,
// whenever we add new menu, attach 'state' variable to node
// to keep track of the active menu ('-1' means no menu is active)
// and remove all dropped buttons (if any)
if(headerGroups.enter().size()) {

// attach 'state' variable to node to keep track of the active menu
// '-1' means no menu is active
gButton.attr(constants.menuIndexAttrName, '-1');

// remove all dropped buttons (if any)
gButton.selectAll('g.' + constants.buttonClassName).remove();
gButton
.call(removeAllButtons)
.attr(constants.menuIndexAttrName, '-1');
}

// remove exiting header, remove dropped buttons and reset margins
headerGroups.exit().each(function(menuOpts) {
d3.select(this).remove();
gButton.selectAll('g.' + constants.buttonClassName).remove();

gButton
.call(removeAllButtons)
.attr(constants.menuIndexAttrName, '-1');

Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index);
});

Expand Down Expand Up @@ -177,7 +179,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
});

header.on('click', function() {
gButton.selectAll('g.' + constants.buttonClassName).remove();
gButton.call(removeAllButtons);

// if clicked index is same as dropped index => fold
// otherwise => drop buttons associated with header
Expand Down Expand Up @@ -429,3 +431,7 @@ function setItemPosition(item, menuOpts, posOpts) {

posOpts.y += menuOpts.height1 + posOpts.yPad;
}

function removeAllButtons(gButton) {
gButton.selectAll('g.' + constants.buttonClassName).remove();
}
0