Skip to content

Axes ref cleanup #1431

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 10 commits into from
Mar 2, 2017
Merged

Axes ref cleanup #1431

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1700908
add extra karma config
etpinard Feb 28, 2017
11073f2
replace for-each by for-loop in cartesian layout defaults
etpinard Feb 28, 2017
2289657
rm _gd ref in fullLayout axis containers
etpinard Mar 1, 2017
6a271ed
call setConvert on 3d axis during Scene.plot
etpinard Mar 1, 2017
704596a
require axis_ids instead of Axes in cartesian index
etpinard Mar 1, 2017
045da99
improve comment for setScale in lsInner
etpinard Mar 1, 2017
50d1288
Merge branch 'master' into axes-ref-cleanup
etpinard Mar 2, 2017
5eb6202
replace .map with for-loops
etpinard Mar 2, 2017
6e25640
link fullLayout.separators to ax._separators
etpinard Mar 2, 2017
9612549
replace gd._replotting -> fullLayout._replotting
etpinard Mar 2, 2017
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
require axis_ids instead of Axes in cartesian index
  • Loading branch information
@etpinard
etpinard committed Mar 1, 2017
commit 704596a5bf9a7f86850e414d5533e626fa865cdf
9 changes: 5 additions & 4 deletions src/plots/cartesian/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
var d3 = require('d3');
var Lib = require('../../lib');
var Plots = require('../plots');
var Axes = require('./axes');

var axisIds = require('./axis_ids');
var constants = require('./constants');

exports.name = 'cartesian';
Expand Down Expand Up @@ -166,7 +167,7 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)

if(hadCartesian && !hasCartesian) {
var subplotLayers = oldFullLayout._cartesianlayer.selectAll('.subplot');
var axIds = Axes.listIds({ _fullLayout: oldFullLayout });
var axIds = axisIds.listIds({ _fullLayout: oldFullLayout });

subplotLayers.call(purgeSubplotLayers, oldFullLayout);
oldFullLayout._defs.selectAll('.axesclip').remove();
Expand Down Expand Up @@ -241,13 +242,13 @@ function makeSubplotData(gd) {
// dimension that this one overlays to be an overlaid subplot,
// the main plot must exist make sure we're not trying to
// overlay on an axis that's already overlaying another
var xa2 = Axes.getFromId(gd, xa.overlaying) || xa;
var xa2 = axisIds.getFromId(gd, xa.overlaying) || xa;
if(xa2 !== xa && xa2.overlaying) {
xa2 = xa;
xa.overlaying = false;
}

var ya2 = Axes.getFromId(gd, ya.overlaying) || ya;
var ya2 = axisIds.getFromId(gd, ya.overlaying) || ya;
if(ya2 !== ya && ya2.overlaying) {
ya2 = ya;
ya.overlaying = false;
Expand Down