From f4b1fc7b6c3e41d402d1dfedd85ee1ea794f7f77 Mon Sep 17 00:00:00 2001 From: Alex Ritter Date: Sat, 16 Apr 2022 14:32:43 +0200 Subject: [PATCH] Replace getConfig(string) to getConfig() --- src/asset_manager/index.js | 4 ++-- src/canvas/view/CanvasView.js | 2 +- src/canvas/view/FramesView.js | 2 +- src/code_manager/model/CssGenerator.js | 4 ++-- src/commands/view/ComponentDrag.js | 2 +- src/commands/view/SelectComponent.js | 2 +- src/css_composer/model/CssRule.js | 2 +- src/css_composer/view/CssRulesView.js | 2 +- src/dom_components/model/Component.js | 10 +++++----- src/dom_components/model/Components.js | 4 ++-- src/dom_components/view/ComponentView.js | 2 +- src/dom_components/view/ToolbarButtonView.js | 8 ++++---- src/domain_abstract/ui/InputColor.js | 2 +- src/editor/model/Editor.js | 4 ++-- src/selector_manager/model/Selector.js | 2 +- src/selector_manager/view/ClassTagsView.js | 2 +- src/style_manager/view/LayerView.js | 2 +- src/style_manager/view/PropertyFileView.js | 2 +- src/style_manager/view/PropertyStackView.js | 2 +- src/style_manager/view/PropertyView.js | 2 +- src/style_manager/view/SectorView.js | 2 +- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js index 3b1a4e39a..be8c8b737 100644 --- a/src/asset_manager/index.js +++ b/src/asset_manager/index.js @@ -136,7 +136,7 @@ export default () => { __trgCustom() { const bhv = this.__getBehaviour(); - if (!bhv.container && !this.getConfig('custom').open) { + if (!bhv.container && !this.getConfig().custom.open) { return; } this.em.trigger(this.events.custom, this.__customData()); @@ -321,7 +321,7 @@ export default () => { * )); */ render(assts) { - if (this.getConfig('custom')) return; + if (this.getConfig().custom) return; const toRender = assts || this.getAll().models; if (!am) { diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index 2801ced35..6d8051ca8 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -108,7 +108,7 @@ export default class CanvasView extends View { } onWheel(ev) { - if ((ev.ctrlKey || ev.metaKey) && this.em.getConfig('multiFrames')) { + if ((ev.ctrlKey || ev.metaKey) && this.em.getConfig().multiFrames) { this.preventDefault(ev); const { model } = this; const delta = Math.max(-1, Math.min(1, ev.wheelDelta || -ev.detail)); diff --git a/src/canvas/view/FramesView.js b/src/canvas/view/FramesView.js index 88ad9f743..01ae1ef1b 100644 --- a/src/canvas/view/FramesView.js +++ b/src/canvas/view/FramesView.js @@ -14,7 +14,7 @@ export default class FramesView extends DomainViews { onRender() { const { config, $el } = this; const { em } = config; - em && $el.attr({ class: `${em.getConfig('stylePrefix')}frames` }); + em && $el.attr({ class: `${em.getConfig().stylePrefix}frames` }); } } diff --git a/src/code_manager/model/CssGenerator.js b/src/code_manager/model/CssGenerator.js index 82ddc03d2..53a0327b9 100644 --- a/src/code_manager/model/CssGenerator.js +++ b/src/code_manager/model/CssGenerator.js @@ -24,7 +24,7 @@ export default class CssGenerator extends Model { buildFromModel(model, opts = {}) { let code = ''; const em = this.em; - const avoidInline = em && em.getConfig('avoidInlineStyle'); + const avoidInline = em && em.getConfig().avoidInlineStyle; const style = model.styleToString(); const classes = model.get('classes'); this.ids.push(`#${model.getId()}`); @@ -51,7 +51,7 @@ export default class CssGenerator extends Model { this.model = model; const codeJson = []; let code = model ? this.buildFromModel(model, opts) : ''; - const clearStyles = isUndefined(opts.clearStyles) && em ? em.getConfig('clearStyles') : opts.clearStyles; + const clearStyles = isUndefined(opts.clearStyles) && em ? em.getConfig().clearStyles : opts.clearStyles; if (cssc) { let rules = opts.rules || cssc.getAll(); diff --git a/src/commands/view/ComponentDrag.js b/src/commands/view/ComponentDrag.js index bb0075833..2bb590c06 100644 --- a/src/commands/view/ComponentDrag.js +++ b/src/commands/view/ComponentDrag.js @@ -80,7 +80,7 @@ export default { if (!guidesEl) { const { editor, em, opts } = this; - const pfx = editor.getConfig('stylePrefix'); + const pfx = editor.getConfig().stylePrefix; const elInfoX = document.createElement('div'); const elInfoY = document.createElement('div'); const guideContent = `
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index 2e0eeac1b..edc795f16 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -61,7 +61,7 @@ export default { * */ toggleSelectComponent(enable) { const { em } = this; - const listenToEl = em.getConfig('listenToEl'); + const listenToEl = em.getConfig().listenToEl; const { parentNode } = em.getContainer(); const method = enable ? 'on' : 'off'; const methods = { on, off }; diff --git a/src/css_composer/model/CssRule.js b/src/css_composer/model/CssRule.js index 2beb24c40..17029f73c 100644 --- a/src/css_composer/model/CssRule.js +++ b/src/css_composer/model/CssRule.js @@ -228,7 +228,7 @@ export default class CssRule extends Model.extend(Styleable) { toJSON(...args) { const obj = Model.prototype.toJSON.apply(this, args); - if (this.em.getConfig('avoidDefaults')) { + if (this.em.getConfig().avoidDefaults) { const defaults = this.defaults(); forEach(defaults, (value, key) => { diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js index ecf9a44c5..987577b7c 100644 --- a/src/css_composer/view/CssRulesView.js +++ b/src/css_composer/view/CssRulesView.js @@ -101,7 +101,7 @@ export default class CssRulesView extends View { } getMediaWidth(mediaText) { - return mediaText && mediaText.replace(`(${this.em.getConfig('mediaCondition')}: `, '').replace(')', ''); + return mediaText && mediaText.replace(`(${this.em.getConfig().mediaCondition}: `, '').replace(')', ''); } render() { diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js index 316f81648..c1cb51399 100644 --- a/src/dom_components/model/Component.js +++ b/src/dom_components/model/Component.js @@ -23,7 +23,7 @@ const escapeRegExp = str => { return str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&'); }; -const avoidInline = em => em && em.getConfig('avoidInlineStyle'); +const avoidInline = em => em && em.getConfig().avoidInlineStyle; export const eventDrag = 'component:drag'; export const keySymbols = '__symbols'; @@ -465,7 +465,7 @@ export default class Component extends Model.extend(Styleable) { const prop = isString(options) ? options : ''; const opts = prop ? optsAdd : options; - if (em && em.getConfig('avoidInlineStyle') && !opts.inline) { + if (em && em.getConfig().avoidInlineStyle && !opts.inline) { const state = em.get('state'); const cc = em.get('CssComposer'); const rule = cc.getIdRule(this.getId(), { state, ...opts }); @@ -490,7 +490,7 @@ export default class Component extends Model.extend(Styleable) { const em = this.em; const { opt } = this; - if (em && em.getConfig('avoidInlineStyle') && !opt.temporary && !opts.inline) { + if (em && em.getConfig().avoidInlineStyle && !opt.temporary && !opts.inline) { const style = this.get('style') || {}; prop = isString(prop) ? this.parseStyle(prop) : prop; prop = { ...prop, ...style }; @@ -1062,7 +1062,7 @@ export default class Component extends Model.extend(Styleable) { initToolbar() { const { em } = this; const model = this; - const ppfx = (em && em.getConfig('stylePrefix')) || ''; + const ppfx = (em && em.getConfig().stylePrefix) || ''; if (!model.get('toolbar') && em) { const tb = []; @@ -1495,7 +1495,7 @@ export default class Component extends Model.extend(Styleable) { } } - if (this.em.getConfig('avoidDefaults')) { + if (this.em.getConfig().avoidDefaults) { this.getChangedProps(obj); } diff --git a/src/dom_components/model/Components.js b/src/dom_components/model/Components.js index 5202f5ecc..bbf039546 100644 --- a/src/dom_components/model/Components.js +++ b/src/dom_components/model/Components.js @@ -255,10 +255,10 @@ export default Backbone.Collection.extend({ onAdd(model, c, opts = {}) { const { domc, em } = this; const style = model.getStyle(); - const avoidInline = em && em.getConfig('avoidInlineStyle'); + const avoidInline = em && em.getConfig().avoidInlineStyle; domc && domc.Component.ensureInList(model); - if (!isEmpty(style) && !avoidInline && em && em.get && em.getConfig('forceClass') && !opts.temporary) { + if (!isEmpty(style) && !avoidInline && em && em.get && em.getConfig().forceClass && !opts.temporary) { const name = model.cid; const rule = em.get('CssComposer').setClassRule(name, style); model.setStyle({}); diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js index 340d449a4..3c1e3d43e 100644 --- a/src/dom_components/view/ComponentView.js +++ b/src/dom_components/view/ComponentView.js @@ -232,7 +232,7 @@ export default Backbone.View.extend({ updateStyle(m, v, opts = {}) { const { model, em } = this; - if (em && em.getConfig('avoidInlineStyle') && !opts.inline) { + if (em && em.getConfig().avoidInlineStyle && !opts.inline) { const style = model.getStyle(); !isEmpty(style) && model.setStyle(style); } else { diff --git a/src/dom_components/view/ToolbarButtonView.js b/src/dom_components/view/ToolbarButtonView.js index 6714d1468..fa1c89d4e 100644 --- a/src/dom_components/view/ToolbarButtonView.js +++ b/src/dom_components/view/ToolbarButtonView.js @@ -4,7 +4,7 @@ export default Backbone.View.extend({ events() { return ( this.model.get('events') || { - mousedown: 'handleClick' + mousedown: 'handleClick', } ); }, @@ -43,7 +43,7 @@ export default Backbone.View.extend({ const calibrated = { ...event, clientX: event.clientX - left, - clientY: event.clientY - top + clientY: event.clientY - top, }; em.trigger('toolbar:run:before'); @@ -68,10 +68,10 @@ export default Backbone.View.extend({ const { editor, $el, model } = this; const id = model.get('id'); const label = model.get('label'); - const pfx = editor.getConfig('stylePrefix'); + const pfx = editor.getConfig().stylePrefix; $el.addClass(`${pfx}toolbar-item`); id && $el.addClass(`${pfx}toolbar-item__${id}`); label && $el.append(label); return this; - } + }, }); diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 244a3760c..fb1aeaa32 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -99,7 +99,7 @@ export default class InputColor extends Input { var colorEl = $(`
`); var cpStyle = colorEl.get(0).style; var elToAppend = em && em.config ? em.config.el : ''; - var colorPickerConfig = (em && em.getConfig && em.getConfig('colorPicker')) || {}; + var colorPickerConfig = (em && em.getConfig && em.getConfig().colorPicker) || {}; let changed = 0; let previousColor; diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js index 5100ef33a..09b666c5e 100644 --- a/src/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -326,7 +326,7 @@ export default class EditorModel extends Model { const multiple = isArray(el); const els = (multiple ? el : [el]).map(el => getModel(el, $)); const selected = this.getSelectedAll(); - const mltSel = this.getConfig('multipleSelection'); + const mltSel = this.getConfig().multipleSelection; let added; // If an array is passed remove all selected @@ -749,7 +749,7 @@ export default class EditorModel extends Model { } getIcon(icon) { - const icons = this.getConfig('icons') || {}; + const icons = this.getConfig().icons || {}; return icons[icon] || ''; } diff --git a/src/selector_manager/model/Selector.js b/src/selector_manager/model/Selector.js index b4e44b757..1a6dd6d00 100644 --- a/src/selector_manager/model/Selector.js +++ b/src/selector_manager/model/Selector.js @@ -127,7 +127,7 @@ export default class Selector extends Model { let obj = Model.prototype.toJSON.call(this, [opts]); const defaults = result(this, 'defaults'); - if (em && em.getConfig('avoidDefaults')) { + if (em && em.getConfig().avoidDefaults) { forEach(defaults, (value, key) => { if (obj[key] === value) { delete obj[key]; diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js index f3e7596b1..e1cc65450 100644 --- a/src/selector_manager/view/ClassTagsView.js +++ b/src/selector_manager/view/ClassTagsView.js @@ -234,7 +234,7 @@ export default class ClassTagsView extends View { */ updateStateVis(target) { const em = this.em; - const avoidInline = em && em.getConfig('avoidInlineStyle'); + const avoidInline = em && em.getConfig().avoidInlineStyle; const display = this.collection.length || avoidInline ? '' : 'none'; this.getStatesC().css('display', display); this.updateSelector(target); diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index f3aca438e..62354d16d 100644 --- a/src/style_manager/view/LayerView.js +++ b/src/style_manager/view/LayerView.js @@ -13,7 +13,7 @@ export default class LayerView extends View { template() { const { pfx, ppfx, em } = this; - const icons = em?.getConfig('icons'); + const icons = em?.getConfig().icons; const iconClose = icons?.close || ''; const iconMove = icons?.move || ''; diff --git a/src/style_manager/view/PropertyFileView.js b/src/style_manager/view/PropertyFileView.js index e070cffe5..470e5ae5f 100644 --- a/src/style_manager/view/PropertyFileView.js +++ b/src/style_manager/view/PropertyFileView.js @@ -12,7 +12,7 @@ export default class PropertyFileView extends PropertyView { templateInput() { const { pfx, em } = this; - const icons = this.em?.getConfig('icons'); + const icons = this.em?.getConfig().icons; const iconClose = icons?.close; return ` diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js index c156eeaea..724386148 100644 --- a/src/style_manager/view/PropertyStackView.js +++ b/src/style_manager/view/PropertyStackView.js @@ -13,7 +13,7 @@ export default class PropertyStackView extends PropertyCompositeView { templateInput() { const { pfx, em } = this; - const icons = em?.getConfig('icons'); + const icons = em?.getConfig().icons; const iconPlus = icons?.plus || '+'; return `
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js index 99058357c..9236134af 100644 --- a/src/style_manager/view/PropertyView.js +++ b/src/style_manager/view/PropertyView.js @@ -17,7 +17,7 @@ export default class Property extends View { const { pfx, em } = this; const { parent } = model; const { icon = '', info = '' } = model.attributes; - const icons = em?.getConfig('icons'); + const icons = em?.getConfig().icons; const iconClose = icons?.close || ''; return ` diff --git a/src/style_manager/view/SectorView.js b/src/style_manager/view/SectorView.js index 7afc7f512..1c777bb65 100644 --- a/src/style_manager/view/SectorView.js +++ b/src/style_manager/view/SectorView.js @@ -4,7 +4,7 @@ import PropertiesView from './PropertiesView'; export default class SectorView extends View { template({ pfx, label }) { - const icons = this.em?.getConfig('icons'); + const icons = this.em?.getConfig().icons; const iconCaret = icons?.caret || ''; const clsPfx = `${pfx}sector-`;