8000 Branch for 1.31.2 by etpinard · Pull Request #2111 · plotly/plotly.js · GitHub
[go: up one dir, main page]

Skip to content

Branch for 1.31.2 #2111

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.

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
Oct 23, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
discontinuing per-trace type visibility check
  • Loading branch information
monfera authored and etpinard committed Oct 23, 2017
commit ea9880efe07a2e906bc299721789937efe88d147
3 changes: 0 additions & 3 deletions src/traces/bar/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
module.exports = function selectPoints(searchInfo, polygon) {
var cd = searchInfo.cd;
var selection = [];
var trace = cd[0].trace;
var node3 = cd[0].node3;
var i;

if(trace.visible !== true) return [];

if(polygon === false) {
// clear selection
for(i = 0; i < cd.length; i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/traces/scatter/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = function selectPoints(searchInfo, polygon) {

// TODO: include lines? that would require per-segment line properties
var hasOnlyLines = (!subtypes.hasMarkers(trace) && !subtypes.hasText(trace));
if(trace.visible !== true || hasOnlyLines) return [];
if(hasOnlyLines) return [];

var opacity = Array.isArray(marker.opacity) ? 1 : marker.opacity;

Expand Down
2 changes: 1 addition & 1 deletion src/traces/scattergeo/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = function selectPoints(searchInfo, polygon) {
var di, lonlat, x, y, i;

var hasOnlyLines = (!subtypes.hasMarkers(trace) && !subtypes.hasText(trace));
if(trace.visible !== true || hasOnlyLines) return [];
if(hasOnlyLines) return [];

var marker = trace.marker;
var opacity = Array.isArray(marker.opacity) ? 1 : marker.opacity;
Expand Down
D9FE
2 changes: 1 addition & 1 deletion src/traces/scattergl/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = function selectPoints(searchInfo, polygon) {
var scene = glTrace.scene;

var hasOnlyLines = (!subtypes.hasMarkers(trace) && !subtypes.hasText(trace));
if(trace.visible !== true || hasOnlyLines) return [];
if(hasOnlyLines) return [];

// filter out points by visible scatter ones
if(polygon === false) {
Expand Down
2 changes: 1 addition & 1 deletion src/traces/scattermapbox/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function selectPoints(searchInfo, polygon) {
// to not insert data-driven 'circle-opacity' when we don't need to
trace._hasDimmedPts = false;

if(trace.visible !== true || !subtypes.hasMarkers(trace)) return [];
if(!subtypes.hasMarkers(trace)) return [];

if(polygon === false) {
for(i = 0; i < cd.length; i++) {
Expand Down
0