From 94804a65bc7cdad56a58924b0dd4a5157e1bacf2 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 14 Jun 2022 14:38:13 +0200 Subject: [PATCH] eslint fixes --- src/abstract/View.ts | 24 +++++----- src/canvas/index.ts | 12 ++--- src/canvas/model/Canvas.ts | 20 ++++---- src/editor/index.ts | 20 ++++---- src/editor/model/Editor.ts | 94 ++++++++++++++------------------------ src/pages/model/Page.ts | 7 +-- 6 files changed, 75 insertions(+), 102 deletions(-) diff --git a/src/abstract/View.ts b/src/abstract/View.ts index 179d7f734..9d69aa816 100644 --- a/src/abstract/View.ts +++ b/src/abstract/View.ts @@ -1,20 +1,20 @@ -import Backbone from "backbone"; -import Model from "./Model"; -import Module, { IBaseModule } from "./Module"; +import Backbone from 'backbone'; +import Model from './Model'; +import Module, { IBaseModule } from './Module'; -export default class View< - TModel extends Model = Model, - TElement extends Element = HTMLElement -> extends Backbone.View { +export default class View extends Backbone.View< + TModel, + TElement +> { protected get pfx() { - return this.ppfx + this.config.stylePrefix || ""; + return this.ppfx + this.config.stylePrefix || ''; } protected get ppfx() { - return (this.em.config as any).stylePrefix || ""; + return (this.em.config as any).stylePrefix || ''; } - protected get module(): TModel extends Model? M: unknown { + protected get module(): TModel extends Model ? M : unknown { //console.log((this.collection.first as any).module) return this.model?.module ?? (this.collection as any).module; } @@ -23,7 +23,7 @@ export default class View< return this.module.em; } - protected get config(): TModel extends Model ? (M extends IBaseModule ? C : unknown) : unknown{ - return this.module.config as any + protected get config(): TModel extends Model ? (M extends IBaseModule ? C : unknown) : unknown { + return this.module.config as any; } } diff --git a/src/canvas/index.ts b/src/canvas/index.ts index 841e8b595..b67e74a1b 100644 --- a/src/canvas/index.ts +++ b/src/canvas/index.ts @@ -79,7 +79,7 @@ export default class CanvasModule extends Module { * @private */ constructor(em: EditorModel) { - super(em, "Canvas", defaults) + super(em, 'Canvas', defaults); this.canvas = new Canvas(this); this.model = this.canvas; @@ -87,9 +87,7 @@ export default class CanvasModule extends Module { this.stopAutoscroll = this.stopAutoscroll.bind(this); return this; } - init(){ - - } + init() {} onLoad() { this.model.init(); @@ -383,13 +381,13 @@ export default class CanvasModule extends Module { return result; } - canvasRectOffset(el: HTMLElement, pos: {top: number, left: number}, opts: any = {}) { + canvasRectOffset(el: HTMLElement, pos: { top: number; left: number }, opts: any = {}) { const getFrameElFromDoc = (doc: Document) => { const { defaultView } = doc; return defaultView?.frameElement as HTMLElement; }; - const rectOff = (el: HTMLElement, top = 1, pos: {top: number, left: number}) => { + const rectOff = (el: HTMLElement, top = 1, pos: { top: number; left: number }) => { const zoom = this.em.getZoomDecimal(); const side = top ? 'top' : 'left'; const doc = el.ownerDocument; @@ -608,7 +606,7 @@ export default class CanvasModule extends Module { * const coords = canvas.getCoords(); * // { x: 100, y: 100 } */ - getCoords(): {x: number, y: number} { + getCoords(): { x: number; y: number } { const { x, y } = this.canvas.attributes; return { x, y }; } diff --git a/src/canvas/model/Canvas.ts b/src/canvas/model/Canvas.ts index 5b24e5c64..f3b42cd92 100644 --- a/src/canvas/model/Canvas.ts +++ b/src/canvas/model/Canvas.ts @@ -1,8 +1,8 @@ -import { Model } from "../../abstract"; -import { evPageSelect } from "../../pages"; -import Frames from "./Frames"; -import Page from "../../pages/model/Page"; -import CanvasModule from ".."; +import { Model } from '../../abstract'; +import { evPageSelect } from '../../pages'; +import Frames from './Frames'; +import Page from '../../pages/model/Page'; +import CanvasModule from '..'; export default class Canvas extends Model { defaults() { @@ -23,10 +23,10 @@ export default class Canvas extends Model { constructor(module: CanvasModule) { const { em, config } = module; const { scripts, styles } = config; - super(module, {scripts, styles}); - this.set("frames", new Frames(module)) - this.listenTo(this, "change:zoom", this.onZoomChange); - this.listenTo(em, "change:device", this.updateDevice); + super(module, { scripts, styles }); + this.set('frames', new Frames(module)); + this.listenTo(this, 'change:zoom', this.onZoomChange); + this.listenTo(em, 'change:device', this.updateDevice); this.listenTo(em, evPageSelect, this._pageUpdated); } @@ -47,7 +47,7 @@ export default class Canvas extends Model { em.setSelected(); em.get('readyCanvas') && em.stopDefault(); // We have to stop before changing current frames //@ts-ignore - prev?.getFrames().map((frame) => frame.disable()); + prev?.getFrames().map(frame => frame.disable()); this.set('frames', page.getFrames()); } diff --git a/src/editor/index.ts b/src/editor/index.ts index 46371f183..e16cbf631 100644 --- a/src/editor/index.ts +++ b/src/editor/index.ts @@ -54,15 +54,15 @@ * ## Methods * @module Editor */ -import { EventHandler } from "backbone"; -import { isUndefined } from "underscore"; -import { IBaseModule } from "../abstract/Module"; -import CanvasModule from "../canvas"; -import cash from "../utils/cash-dom"; -import html from "../utils/html"; -import defaults from "./config/config"; -import EditorModel from "./model/Editor"; -import EditorView from "./view/EditorView"; +import { EventHandler } from 'backbone'; +import { isUndefined } from 'underscore'; +import { IBaseModule } from '../abstract/Module'; +import CanvasModule from '../canvas'; +import cash from '../utils/cash-dom'; +import html from '../utils/html'; +import defaults from './config/config'; +import EditorModel from './model/Editor'; +import EditorView from './view/EditorView'; export default class EditorModule implements IBaseModule { constructor(config = {}, opts: any = {}) { @@ -113,7 +113,7 @@ export default class EditorModule implements IBaseModule { get Panels(): PanelsModule { return this.em.get('Panels'); } - + get Canvas(): CanvasModule { return this.em.get('Canvas'); } diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts index 132e0897f..c6bc70e38 100644 --- a/src/editor/model/Editor.ts +++ b/src/editor/model/Editor.ts @@ -1,11 +1,4 @@ -import { - isUndefined, - isArray, - contains, - toArray, - keys, - bindAll, -} from 'underscore'; +import { isUndefined, isArray, contains, toArray, keys, bindAll } from 'underscore'; import Backbone from 'backbone'; import $ from '../../utils/cash-dom'; import Extender from '../../utils/extender'; @@ -138,34 +131,26 @@ export default class EditorModel extends Model { } // Load modules - deps.forEach((name) => this.loadModule(name)); - ts_deps.forEach((name) => this.tsLoadModule(name)); + deps.forEach(name => this.loadModule(name)); + ts_deps.forEach(name => this.tsLoadModule(name)); this.on('change:componentHovered', this.componentHovered, this); this.on('change:changesCount', this.updateChanges, this); this.on('change:readyLoad change:readyCanvas', this._checkReady, this); - toLog.forEach((e) => this.listenLog(e)); + toLog.forEach(e => this.listenLog(e)); // Deprecations - [{ from: 'change:selectedComponent', to: 'component:toggled' }].forEach( - (event) => { - const eventFrom = event.from; - const eventTo = event.to; - this.listenTo(this, eventFrom, (...args) => { - this.trigger(eventTo, ...args); - this.logWarning( - `The event '${eventFrom}' is deprecated, replace it with '${eventTo}'` - ); - }); - } - ); + [{ from: 'change:selectedComponent', to: 'component:toggled' }].forEach(event => { + const eventFrom = event.from; + const eventTo = event.to; + this.listenTo(this, eventFrom, (...args) => { + this.trigger(eventTo, ...args); + this.logWarning(`The event '${eventFrom}' is deprecated, replace it with '${eventTo}'`); + }); + }); } _checkReady() { - if ( - this.get('readyLoad') && - this.get('readyCanvas') && - !this.get('ready') - ) { + if (this.get('readyLoad') && this.get('readyCanvas') && !this.get('ready')) { this.set('ready', true); } } @@ -203,11 +188,11 @@ export default class EditorModel extends Model { const sm = this.get('StorageManager'); // In `onLoad`, the module will try to load the data from its configurations. - this.toLoad.forEach((mdl) => mdl.onLoad()); + this.toLoad.forEach(mdl => mdl.onLoad()); // Stuff to do post load const postLoad = () => { - this.modules.forEach((mdl) => mdl.postLoad && mdl.postLoad(this)); + this.modules.forEach(mdl => mdl.postLoad && mdl.postLoad(this)); this.set('readyLoad', 1); }; @@ -238,7 +223,7 @@ export default class EditorModel extends Model { undoManager: false, }); // We only need to load a few modules - ['PageManager', 'Canvas'].forEach((key) => shallow.get(key).onLoad()); + ['PageManager', 'Canvas'].forEach(key => shallow.get(key).onLoad()); this.set('shallow', shallow); } @@ -259,7 +244,7 @@ export default class EditorModel extends Model { } if (stm.isAutosave() && changes >= stm.getStepsBeforeSave()) { - this.store().catch((err) => this.logError(err)); + this.store().catch(err => this.logError(err)); } } @@ -274,9 +259,7 @@ export default class EditorModel extends Model { const Module = moduleName.default || moduleName; const Mod = new Module(this); const name = Mod.name.charAt(0).toLowerCase() + Mod.name.slice(1); - const cfgParent = !isUndefined(config[name]) - ? config[name] - : config[Mod.name]; + const cfgParent = !isUndefined(config[name]) ? config[name] : config[Mod.name]; const cfg = cfgParent === true ? {} : cfgParent || {}; cfg.pStylePrefix = config.pStylePrefix || ''; @@ -346,13 +329,7 @@ export default class EditorModel extends Model { * */ handleUpdates(model: any, val: any, opt: any = {}) { // Component has been added temporarily - do not update storage or record changes - if ( - this.__skip || - opt.temporary || - opt.noCount || - opt.avoidStore || - !this.get('ready') - ) { + if (this.__skip || opt.temporary || opt.noCount || opt.avoidStore || !this.get('ready')) { return; } @@ -410,7 +387,7 @@ export default class EditorModel extends Model { const { event } = opts; const ctrlKey = event && (event.ctrlKey || event.metaKey); const { shiftKey } = event || {}; - const els = (isArray(el) ? el : [el]).map((el) => getModel(el, $)); + const els = (isArray(el) ? el : [el]).map(el => getModel(el, $)); const selected = this.getSelectedAll(); const mltSel = this.getConfig().multipleSelection; let added; @@ -418,9 +395,9 @@ export default class EditorModel extends Model { // If an array is passed remove all selected // expect those yet to be selected const multiple = isArray(el); - multiple && this.removeSelected(selected.filter((s) => !contains(els, s))); + multiple && this.removeSelected(selected.filter(s => !contains(els, s))); - els.forEach((el) => { + els.forEach(el => { let model = getModel(el, undefined); if (model) { @@ -430,8 +407,7 @@ export default class EditorModel extends Model { if (!model.get('selectable') || opts.abort) { if (opts.useValid) { let parent = model.parent(); - while (parent && !parent.get('selectable')) - parent = parent.parent(); + while (parent && !parent.get('selectable')) parent = parent.parent(); model = parent; } else { return; @@ -449,7 +425,7 @@ export default class EditorModel extends Model { let min: number | undefined, max: number | undefined; // Fin min and max siblings - this.getSelectedAll().forEach((sel) => { + this.getSelectedAll().forEach(sel => { const selColl = sel.collection; const selIndex = sel.index(); if (selColl === coll) { @@ -480,7 +456,7 @@ export default class EditorModel extends Model { return this.addSelected(model); } - !multiple && this.removeSelected(selected.filter((s) => s !== model)); + !multiple && this.removeSelected(selected.filter(s => s !== model)); this.addSelected(model, opts); added = model; }); @@ -496,7 +472,7 @@ export default class EditorModel extends Model { const model = getModel(el, $); const models = isArray(model) ? model : [model]; - models.forEach((model) => { + models.forEach(model => { if (model && !model.get('selectable')) return; const { selected } = this; opts.forceChange && this.removeSelected(model, opts); @@ -525,7 +501,7 @@ export default class EditorModel extends Model { const model = getModel(el, $); const models = isArray(model) ? model : [model]; - models.forEach((model) => { + models.forEach(model => { if (this.selected.hasComponent(model)) { this.removeSelected(model, opts); } else { @@ -681,9 +657,7 @@ export default class EditorModel extends Model { const config = this.config; const { optsCss } = config; const avoidProt = opts.avoidProtected; - const keepUnusedStyles = !isUndefined(opts.keepUnusedStyles) - ? opts.keepUnusedStyles - : config.keepUnusedStyles; + const keepUnusedStyles = !isUndefined(opts.keepUnusedStyles) ? opts.keepUnusedStyles : config.keepUnusedStyles; const cssc = this.get('CssComposer'); const wrp = opts.component || this.get('DomComponents').getComponent(); const protCss = !avoidProt ? config.protectedCss : ''; @@ -735,7 +709,7 @@ export default class EditorModel extends Model { const editingCmp = this.getEditing(); editingCmp && editingCmp.trigger('sync:content', { noCount: true }); - this.storables.forEach((m) => { + this.storables.forEach(m => { result = { ...result, ...m.store(1) }; }); return JSON.parse(JSON.stringify(result)); @@ -743,8 +717,8 @@ export default class EditorModel extends Model { loadData(data = {}) { if (!isEmptyObj(data)) { - this.storables.forEach((module) => module.clear()); - this.storables.forEach((module) => module.load(data)); + this.storables.forEach(module => module.clear()); + this.storables.forEach(module => module.load(data)); } return data; } @@ -828,7 +802,7 @@ export default class EditorModel extends Model { } setCurrentFrame(frameView?: FrameView) { - return this.set("currentFrame", frameView); + return this.set('currentFrame', frameView); } getCurrentFrame(): FrameView { @@ -896,13 +870,13 @@ export default class EditorModel extends Model { this.modules .slice() .reverse() - .forEach((mod) => mod.destroy()); + .forEach(mod => mod.destroy()); view && view.remove(); this.clear({ silent: true }); this.destroyed = true; ['_config', 'view', '_previousAttributes', '_events', '_listeners'].forEach( //@ts-ignore - (i) => (this[i] = {}) + i => (this[i] = {}) ); editors.splice(editors.indexOf(editor), 1); //@ts-ignore diff --git a/src/pages/model/Page.ts b/src/pages/model/Page.ts index f501eafaa..7a56bf24c 100644 --- a/src/pages/model/Page.ts +++ b/src/pages/model/Page.ts @@ -21,11 +21,12 @@ export default class Page extends Model { if (!props.frames) { defFrame.component = props.component; defFrame.styles = props.styles; - ['component', 'styles'].map((i) => this.unset(i)); + ['component', 'styles'].map(i => this.unset(i)); } const frms: any[] = props.frames || [defFrame]; - const frames = new Frames(em.get("Canvas"), - frms?.map((model) => new Frame(em.get("Canvas"), model)) + const frames = new Frames( + em.get('Canvas'), + frms?.map(model => new Frame(em.get('Canvas'), model)) ); frames.page = this; this.set('frames', frames);