Browse Source

Fix TS

pull/4313/head
Artur Arseniev 4 years ago
parent
commit
981bc7012c
  1. 2
      src/canvas/model/Frame.ts
  2. 2
      src/editor/model/Editor.ts
  3. 5
      src/pages/model/Page.ts

2
src/canvas/model/Frame.ts

@ -1,7 +1,5 @@
import { result, forEach, isEmpty, isString } from 'underscore'; import { result, forEach, isEmpty, isString } from 'underscore';
import { Model } from '../../common'; import { Model } from '../../common';
import { Component } from '../../dom_components/model/Component';
import Components from '../../dom_components/model/Components';
import ComponentWrapper from '../../dom_components/model/ComponentWrapper'; import ComponentWrapper from '../../dom_components/model/ComponentWrapper';
import EditorModel from '../../editor/model/Editor'; import EditorModel from '../../editor/model/Editor';
import { isComponent, isObject } from '../../utils/mixins'; import { isComponent, isObject } from '../../utils/mixins';

2
src/editor/model/Editor.ts

@ -401,7 +401,7 @@ export default class EditorModel extends Model {
* @param {Object} [opts={}] Options, optional * @param {Object} [opts={}] Options, optional
* @public * @public
*/ */
setSelected(el: any | any[], opts: any = {}) { setSelected(el?: any | any[], opts: any = {}) {
const { event } = opts; const { event } = opts;
const ctrlKey = event && (event.ctrlKey || event.metaKey); const ctrlKey = event && (event.ctrlKey || event.metaKey);
const { shiftKey } = event || {}; const { shiftKey } = event || {};

5
src/pages/model/Page.ts

@ -25,10 +25,7 @@ export default class Page extends Model {
['component', 'styles'].map((i) => this.unset(i)); ['component', 'styles'].map((i) => this.unset(i));
} }
const frms: any[] = props.frames || [defFrame]; const frms: any[] = props.frames || [defFrame];
const frames = new Frames( const frames = new Frames(frms?.map((model) => new Frame(model, opts)));
frms?.map((model) => new Frame(model, opts)),
opts
);
frames.page = this; frames.page = this;
this.set('frames', frames); this.set('frames', frames);
!this.getId() && this.set('id', em?.get('PageManager')._createId()); !this.getId() && this.set('id', em?.get('PageManager')._createId());

Loading…
Cancel
Save