8000 Add registry of component modules by etpinard · Pull Request #845 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Add registry of component modules #845

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 18 commits into from
Aug 19, 2016
Merged

Add registry of component modules #845

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bf28ad9
move Plotly.register in plot_api/register.js
etpinard Aug 8, 2016
00536f4
lint: split registry switch block into routines
etpinard Aug 9, 2016
910e17c
move registry objects and helper method to src/registry.js
etpinard Aug 9, 2016
11f475e
move Registry tests, plots_test.js -> register_test.js
etpinard Aug 9, 2016
4a3f254
rm some unnecessary deps on Plots
etpinard Aug 9, 2016
161af7e
sub Plots[method] -> Registry[method]
etpinard Aug 9, 2016
2382c04
rm a few exported objects in src/plotly.js:
etpinard Aug 10, 2016
710f312
rm circular dep in plot_image/to_image.js
etpinard Aug 10, 2016
c6aa0fb
register: add support for component modules
etpinard Aug 11, 2016
68268e3
register components modules
etpinard Aug 11, 2016
4f754aa
lib: add Lib.noop method
etpinard Aug 11, 2016
0aa87c4
add Registry.getComponentMethod + use it in plot_api / plots
etpinard Aug 11, 2016
65ffb52
require only range slider/selector default handlers cartesian defaults
etpinard Aug 11, 2016
d11c8f9
lint plot_schema.js
etpinard Aug 11, 2016
a1ea365
use componentsRegistry in plot schema
etpinard Aug 11, 2016
2802d22
Merge branch 'master' into registry-use-component
etpinard Aug 18, 2016
39c32d0
doc: improve comment about trace type 'various'
etpinard Aug 18, 2016
489513b
plots: extend export obj with Registry instead of hard-coding
etpinard Aug 18, 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
lint plot_schema.js
  • Loading branch information
@etpinard
etpinard committed Aug 11, 2016
commit d11c8f912833887b0a34d93515fbc27deb56e433
14 changes: 8 additions & 6 deletions src/plot_api/plot_schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ var Registry = require('../registry');
var Plots = require('../plots/plots');
var Lib = require('../lib');

// FIXME polar attribute are not part of Plotly yet
var polarAreaAttrs = require('../plots/polar/area_attributes');
var polarAxisAttrs = require('../plots/polar/axis_attributes');

var extendFlat = Lib.extendFlat;
var extendDeep = Lib.extendDeep;
var extendDeepAll = Lib.extendDeepAll;
Expand All @@ -34,9 +38,6 @@ var plotSchema = {
defs: {}
};

// FIXME polar attribute are not part of Plotly yet
var polarAreaAttrs = require('../plots/polar/area_attributes'),
polarAxisAttrs = require('../plots/polar/axis_attributes');

var PlotSchema = module.exports = {};

Expand Down Expand Up @@ -169,7 +170,7 @@ function coupleAttrs(attrsIn, attrsOut, whichAttrs, type) {

if(k === NESTED_MODULE) {
Object.keys(attrsIn[k]).forEach(function(kk) {
nestedModule = getModule({module: attrsIn[k][kk]});
nestedModule = getModule({_module: attrsIn[k][kk]});
if(nestedModule === undefined) return;

nestedAttrs = nestedModule[whichAttrs];
Expand All @@ -187,7 +188,7 @@ function coupleAttrs(attrsIn, attrsOut, whichAttrs, type) {
Object.keys(attrsIn[k]).forEach(function(kk) {
if(kk !== type) return;

composedModule = getModule({module: attrsIn[k][kk]});
composedModule = getModule({_module: attrsIn[k][kk]});
if(composedModule === undefined) return;

composedAttrs = composedModule[whichAttrs];
Expand Down Expand Up @@ -253,7 +254,8 @@ function getModule(arg) {
}

var subplotsRegistry = Registry.subplotsRegistry,
_module = arg.module;
componentsRegistry = Registry.componentsRegistry,
_module = arg._module;

if(subplotsRegistry[_module]) return subplotsRegistry[_module];
else if('module' in arg) return Plotly[_module];
Expand Down
0