Skip to content

Commit 658e5cb

Browse files
committed
fix registry for new circular dep
1 parent c87b01a commit 658e5cb

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/registry.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
var Loggers = require('./lib/loggers');
1313
var noop = require('./lib/noop');
1414
var pushUnique = require('./lib/push_unique');
15+
var ExtendModule = require('./lib/extend');
16+
var extendFlat = ExtendModule.extendFlat;
17+
var extendDeep = ExtendModule.extendDeep;
18+
1519
var basePlotAttributes = require('./plots/attributes');
1620
var baseLayoutAttributes = require('./plots/layout_attributes');
17-
var Lib = require('./lib');
1821

1922
exports.modules = {};
2023
exports.allCategories = {};
@@ -68,7 +71,7 @@ exports.register = function(_module, thisType, categoriesIn, meta) {
6871
* (at least after https://github.com/plotly/documentation/issues/202 gets done!)
6972
*/
7073
if(_module.layoutAttributes) {
71-
Lib.extendFlat(exports.traceLayoutAttributes, _module.layoutAttributes);
74+
extendFlat(exports.traceLayoutAttributes, _module.layoutAttributes);
7275
}
7376
};
7477

@@ -137,7 +140,7 @@ exports.registerComponent = function(_module) {
137140
}
138141

139142
if(_module.schema && _module.schema.layout) {
140-
Lib.extendDeep(baseLayoutAttributes, _module.schema.layout);
143+
extendDeep(baseLayoutAttributes, _module.schema.layout);
141144
}
142145
};
143146

@@ -166,7 +169,7 @@ function mergeComponentAttrsToTrace(componentName, traceType) {
166169

167170
var traceAttrs = componentSchema.traces[traceType];
168171
if(traceAttrs) {
169-
Lib.extendDeep(exports.modules[traceType]._module.attributes, traceAttrs);
172+
extendDeep(exports.modules[traceType]._module.attributes, traceAttrs);
170173
}
171174
}
172175

@@ -176,7 +179,7 @@ function mergeComponentAttrsToTransform(componentName, transformType) {
176179

177180
var transformAttrs = componentSchema.transforms[transformType];
178181
if(transformAttrs) {
179-
Lib.extendDeep(exports.transformsRegistry[transformType].attributes, transformAttrs);
182+
extendDeep(exports.transformsRegistry[transformType].attributes, transformAttrs);
180183
}
181184
}
182185

@@ -191,7 +194,7 @@ function mergeComponentAttrsToSubplot(componentName, subplotName) {
191194

192195
var componentLayoutAttrs = componentSchema.subplots[subplotAttr];
193196
if(subplotAttrs && componentLayoutAttrs) {
194-
Lib.extendDeep(subplotAttrs, componentLayoutAttrs);
197+
extendDeep(subplotAttrs, componentLayoutAttrs);
195198
}
196199
}
197200

0 commit comments

Comments
 (0)