Browse Source

Up

pull/4128/head
Artur Arseniev 5 years ago
parent
commit
fa13dd03f6
  1. 4
      src/canvas/model/Canvas.js
  2. 10
      src/editor/view/EditorView.js

4
src/canvas/model/Canvas.js

@ -1,5 +1,6 @@
import { Model } from 'common'; import { Model } from 'common';
import { evPageSelect } from 'pages'; import { evPageSelect } from 'pages';
import Frames from './Frames';
export default class Canvas extends Model { export default class Canvas extends Model {
defaults() { defaults() {
@ -13,7 +14,7 @@ export default class Canvas extends Model {
// Scripts to apply on all frames // Scripts to apply on all frames
scripts: [], scripts: [],
// Styles to apply on all frames // Styles to apply on all frames
styles: [] styles: [],
}; };
} }
@ -21,6 +22,7 @@ export default class Canvas extends Model {
const { em } = config; const { em } = config;
this.config = config; this.config = config;
this.em = em; this.em = em;
this.set('frames', new Frames());
this.listenTo(this, 'change:zoom', this.onZoomChange); this.listenTo(this, 'change:zoom', this.onZoomChange);
this.listenTo(em, 'change:device', this.updateDevice); this.listenTo(em, 'change:device', this.updateDevice);
this.listenTo(em, evPageSelect, this._pageUpdated); this.listenTo(em, evPageSelect, this._pageUpdated);

10
src/editor/view/EditorView.js

@ -21,7 +21,7 @@ export default Backbone.View.extend({
}, },
render() { render() {
const { model, $el, conf } = this; const { $el, conf, model } = this;
const pfx = conf.stylePrefix; const pfx = conf.stylePrefix;
const contEl = $(conf.el || `body ${conf.container}`); const contEl = $(conf.el || `body ${conf.container}`);
appendStyles(conf.cssIcons, { unique: 1, prepand: 1 }); appendStyles(conf.cssIcons, { unique: 1, prepand: 1 });
@ -32,12 +32,10 @@ export default Backbone.View.extend({
$el.append(this.cv.render()); $el.append(this.cv.render());
$el.append(this.pn.render()); $el.append(this.pn.render());
$el.attr('class', `${pfx}editor ${pfx}one-bg ${pfx}two-color`); $el.attr('class', `${pfx}editor ${pfx}one-bg ${pfx}two-color`);
contEl contEl.addClass(`${pfx}editor-cont`).empty().append($el);
.addClass(`${pfx}editor-cont`)
.empty()
.append($el);
return this; return this;
} },
}); });

Loading…
Cancel
Save