From 4053acf377cd49791fa095b2c832042dad8c845e Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Mon, 19 Jun 2023 14:46:00 +0400 Subject: [PATCH] Up editor TS --- src/block_manager/view/BlockView.ts | 4 ++-- src/device_manager/view/DevicesView.ts | 2 +- src/editor/model/Editor.ts | 30 +++++++++++++------------- src/navigator/index.ts | 2 +- src/navigator/view/ItemView.ts | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/block_manager/view/BlockView.ts b/src/block_manager/view/BlockView.ts index 3e8be8ee8..433ce8529 100644 --- a/src/block_manager/view/BlockView.ts +++ b/src/block_manager/view/BlockView.ts @@ -52,7 +52,7 @@ export default class BlockView extends View { return onClick(model, em?.getEditor(), { event: ev }); } const sorter = config.getSorter(); - const content = model.get('content'); + const content = model.get('content')!; const selected = em.getSelected(); sorter.setDropContent(content); let target, valid, insertAt; @@ -78,7 +78,7 @@ export default class BlockView extends View { // If no target found yet, try to append the block to the wrapper if (!target) { - const wrapper = em.getWrapper(); + const wrapper = em.getWrapper()!; valid = sorter.validTarget(wrapper.getEl(), content); if (valid.valid) target = wrapper; } diff --git a/src/device_manager/view/DevicesView.ts b/src/device_manager/view/DevicesView.ts index b3ecab059..8023c90cc 100644 --- a/src/device_manager/view/DevicesView.ts +++ b/src/device_manager/view/DevicesView.ts @@ -73,7 +73,7 @@ export default class DevicesView extends View { if (em && em.getDeviceModel && devicesEl) { const device = em.getDeviceModel(); - devicesEl.val(device ? device.get('id') : ''); + devicesEl.val(device ? device.get('id')! : ''); } } diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts index 1c4785d41..d98f92321 100644 --- a/src/editor/model/Editor.ts +++ b/src/editor/model/Editor.ts @@ -653,7 +653,7 @@ export default class EditorModel extends Model { * @public */ setComponents(components: any, opt = {}) { - return this.get('DomComponents').setComponents(components, opt); + return this.Components.setComponents(components, opt); } /** @@ -662,12 +662,12 @@ export default class EditorModel extends Model { * @private */ getComponents() { - var cmp = this.get('DomComponents'); - var cm = this.get('CodeManager'); + const cmp = this.Components; + const cm = this.CodeManager; if (!cmp || !cm) return; - var wrp = cmp.getComponents(); + const wrp = cmp.getComponents(); return cm.getCode(wrp, 'json'); } @@ -679,7 +679,7 @@ export default class EditorModel extends Model { * @public */ setStyle(style: any, opt = {}) { - const cssc = this.get('CssComposer'); + const cssc = this.Css; cssc.clear(opt); cssc.getAll().add(style, opt); return this; @@ -733,9 +733,9 @@ export default class EditorModel extends Model { const { config } = this; const { optsHtml } = config; const js = config.jsInHtml ? this.getJs(opts) : ''; - const cmp = opts.component || this.get('DomComponents').getComponent(); + const cmp = opts.component || this.Components.getComponent(); let html = cmp - ? this.get('CodeManager').getCode(cmp, 'html', { + ? this.CodeManager.getCode(cmp, 'html', { ...optsHtml, ...opts, }) @@ -755,7 +755,7 @@ export default class EditorModel extends Model { const { optsCss } = config; const avoidProt = opts.avoidProtected; const keepUnusedStyles = !isUndefined(opts.keepUnusedStyles) ? opts.keepUnusedStyles : config.keepUnusedStyles; - const cssc = this.get('CssComposer'); + const cssc = this.Css; const wrp = opts.component || this.Components.getComponent(); const protCss = !avoidProt ? config.protectedCss! : ''; const css = @@ -826,8 +826,8 @@ export default class EditorModel extends Model { * @private */ getDeviceModel() { - var name = this.get('device'); - return this.get('DeviceManager').get(name); + const name = this.get('device'); + return this.Devices.get(name); } /** @@ -862,7 +862,7 @@ export default class EditorModel extends Model { */ refreshCanvas(opts: any = {}) { this.set('canvasOffset', null); - this.set('canvasOffset', this.get('Canvas').getOffset()); + this.set('canvasOffset', this.Canvas.getOffset()); opts.tools && this.trigger('canvas:updateTools'); } @@ -895,7 +895,7 @@ export default class EditorModel extends Model { * @return {Component} */ getWrapper() { - return this.get('DomComponents').getWrapper(); + return this.Components.getWrapper(); } setCurrentFrame(frameView?: FrameView) { @@ -929,11 +929,11 @@ export default class EditorModel extends Model { } getZoomDecimal() { - return this.get('Canvas').getZoomDecimal(); + return this.Canvas.getZoomDecimal(); } getZoomMultiplier() { - return this.get('Canvas').getZoomMultiplier(); + return this.Canvas.getZoomMultiplier(); } setDragMode(value: DragMode) { @@ -1053,7 +1053,7 @@ export default class EditorModel extends Model { */ skip(clb: Function) { this.__skip = true; - const um = this.get('UndoManager'); + const um = this.UndoManager; um ? um.skip(clb) : clb(); this.__skip = false; } diff --git a/src/navigator/index.ts b/src/navigator/index.ts index 4ce72c34b..b551a4dbb 100644 --- a/src/navigator/index.ts +++ b/src/navigator/index.ts @@ -118,7 +118,7 @@ export default class LayerManager extends Module { * layers.setRoot(component); */ setRoot(component: Component | string): Component { - const wrapper: Component = this.em.getWrapper(); + const wrapper: Component = this.em.getWrapper()!; let root = isComponent(component) ? (component as Component) : wrapper; if (component && isString(component) && hasWin()) { diff --git a/src/navigator/view/ItemView.ts b/src/navigator/view/ItemView.ts index 80d0b9405..0e78e9a89 100644 --- a/src/navigator/view/ItemView.ts +++ b/src/navigator/view/ItemView.ts @@ -364,7 +364,7 @@ export default class ItemView extends View { } setRoot(el: Component | string) { - el = isString(el) ? this.em.getWrapper().find(el)[0] : el; + el = isString(el) ? this.em.getWrapper()?.find(el)[0]! : el; const model = getModel(el, 0); if (!model) return; this.stopListening();