Skip to content

Add config options in plot schema #3376

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 11 commits into from
Jan 16, 2019
Merged

Add config options in plot schema #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
10bbf37
add configAttributes to plot_config.js module
etpinard Dec 26, 2018
7698e76
add config attributes to plot-schema
etpinard Dec 26, 2018
f9cfadb
Merge branch 'master' into config-opts-in-plot-schema
etpinard Jan 8, 2019
c83538a
make scrollZoom a flaglist w/ dflt 'gl3d+geo+mapbox'
etpinard Jan 8, 2019
b56591d
resolves #143 - implement scrollZoom:false for geo subplots
etpinard Jan 8, 2019
26618dd
resolves #2998 - implement scrollZoom:false for gl3d subplots
etpinard Jan 8, 2019
16a01e7
implement scrollZoom:false for mapbox subplots
etpinard Jan 8, 2019
09f1af5
explicitly assert that _scrollZoom.cartesian isn't set
etpinard Jan 16, 2019
ceac510
Merge pull request #3422 from plotly/scrollzoom-flaglist
etpinard Jan 16, 2019
bed30cd
config opts declaration fixes
etpinard Jan 16, 2019
e7f1478
Merge branch 'master' into config-opts-in-plot-schema
etpinard Jan 16, 2019
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
8 changes: 4 additions & 4 deletions src/lib/loggers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/* eslint-disable no-console */

var config = require('../plot_api/plot_config');
var dfltConfig = require('../plot_api/plot_config').dfltConfig;

var loggers = module.exports = {};

Expand All @@ -21,7 +21,7 @@ var loggers = module.exports = {};
*/

loggers.log = function() {
if(config.logging > 1) {
if(dfltConfig.logging > 1) {
var messages = ['LOG:'];

for(var i = 0; i < arguments.length; i++) {
Expand All @@ -33,7 +33,7 @@ loggers.log = function() {
};

loggers.warn = function() {
if(config.logging > 0) {
if(dfltConfig.logging > 0) {
var messages = ['WARN:'];

for(var i = 0; i < arguments.length; i++) {
Expand All @@ -45,7 +45,7 @@ loggers.warn = function() {
};

loggers.error = function() {
if(config.logging > 0) {
if(dfltConfig.logging > 0) {
var messages = ['ERROR:'];

for(var i = 0; i < arguments.length; i++) {
Expand Down
6 changes: 2 additions & 4 deletions src/lib/queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
* LICENSE file in the root directory of this source tree.
*/


'use strict';

var Lib = require('../lib');
var config = require('../plot_api/plot_config');

var dfltConfig = require('../plot_api/plot_config').dfltConfig;

/**
* Copy arg array *without* removing `undefined` values from objects.
Expand Down Expand Up @@ -91,7 +89,7 @@ queue.add = function(gd, undoFunc, undoArgs, redoFunc, redoArgs) {
queueObj.redo.args.push(redoArgs);
}

if(gd.undoQueue.queue.length > config.queueLength) {
if(gd.undoQueue.queue.length > dfltConfig.queueLength) {
gd.undoQueue.queue.shift();
gd.undoQueue.index--;
}
Expand Down
25 changes: 22 additions & 3 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var initInteractions = require('../plots/cartesian/graph_interact').initInteract
var xmlnsNamespaces = require('../constants/xmlns_namespaces');
var svgTextUtils = require('../lib/svg_text_utils');

var defaultConfig = require('./plot_config');
var dfltConfig = require('./plot_config').dfltConfig;
var manageArrays = require('./manage_arrays');
var helpers = require('./helpers');
var subroutines = require('./subroutines');
Expand Down Expand Up @@ -405,7 +405,7 @@ function emitAfterPlot(gd) {
}

exports.setPlotConfig = function setPlotConfig(obj) {
return Lib.extendFlat(defaultConfig, obj);
return Lib.extendFlat(dfltConfig, obj);
};

function setBackground(gd, bgColor) {
Expand All @@ -423,7 +423,7 @@ function opaqueSetBackground(gd, bgColor) {

function setPlotContext(gd, config) {
if(!gd._context) {
gd._context = Lib.extendDeep({}, defaultConfig);
gd._context = Lib.extendDeep({}, dfltConfig);

// stash <base> href, used to make robust clipPath URLs
var base = d3.select('base');
Expand Down Expand Up @@ -507,6 +507,25 @@ function setPlotContext(gd, config) {
// Check if gd has a specified widht/height to begin with
context._hasZeroHeight = context._hasZeroHeight || gd.clientHeight === 0;
context._hasZeroWidth = context._hasZeroWidth || gd.clientWidth === 0;

// fill context._scrollZoom helper to help manage scrollZoom flaglist
var szIn = context.scrollZoom;
var szOut = context._scrollZoom = {};
if(szIn === true) {
szOut.cartesian = 1;
szOut.gl3d = 1;
szOut.geo = 1;
szOut.mapbox = 1;
} else if(typeof szIn === 'string') {
var parts = szIn.split('+');
for(i = 0; i < parts.length; i++) {
szOut[parts[i]] = 1;
}
} else if(szIn !== false) {
szOut.gl3d = 1;
szOut.geo = 1;
szOut.mapbox = 1;
}
}

function plotLegacyPolar(gd, data, layout) {
Expand Down
Loading