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
etpinard 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add config options in plot schema by etpinard · Pull Request #3376 · plotly/plotly.js · GitHub
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

etpinard
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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