Browse Source

Setup Droppable from FrameView

pull/3411/head
Artur Arseniev 5 years ago
parent
commit
c856e59455
  1. 7
      src/canvas/index.js
  2. 4
      src/canvas/view/FrameView.js

7
src/canvas/index.js

@ -29,8 +29,7 @@
* @module Canvas * @module Canvas
*/ */
import { hasDnd, getElement, getViewEl } from 'utils/mixins'; import { getElement, getViewEl } from 'utils/mixins';
import Droppable from 'utils/Droppable';
import defaults from './config/config'; import defaults from './config/config';
import Canvas from './model/Canvas'; import Canvas from './model/Canvas';
import canvasView from './view/CanvasView'; import canvasView from './view/CanvasView';
@ -572,10 +571,6 @@ export default () => {
fr && fr.stopAutoscroll(); fr && fr.stopAutoscroll();
}, },
postRender() {
if (hasDnd(c.em)) this.droppable = new Droppable(c.em);
},
/** /**
* Set zoom value * Set zoom value
* @param {Number} value The zoom value, from 0 to 100 * @param {Number} value The zoom value, from 0 to 100

4
src/canvas/view/FrameView.js

@ -2,6 +2,7 @@ import Backbone from 'backbone';
import { bindAll, isString, debounce, isUndefined } from 'underscore'; import { bindAll, isString, debounce, isUndefined } from 'underscore';
import CssRulesView from 'css_composer/view/CssRulesView'; import CssRulesView from 'css_composer/view/CssRulesView';
import ComponentView from 'dom_components/view/ComponentView'; import ComponentView from 'dom_components/view/ComponentView';
import Droppable from 'utils/Droppable';
import { import {
appendVNodes, appendVNodes,
empty, empty,
@ -10,7 +11,7 @@ import {
createCustomEvent, createCustomEvent,
motionsEv motionsEv
} from 'utils/dom'; } from 'utils/dom';
import { on, off, setViewEl, getPointerEvent } from 'utils/mixins'; import { on, off, setViewEl, hasDnd, getPointerEvent } from 'utils/mixins';
export default Backbone.View.extend({ export default Backbone.View.extend({
tagName: 'iframe', tagName: 'iframe',
@ -397,6 +398,7 @@ export default Backbone.View.extend({
); );
this._toggleEffects(1); this._toggleEffects(1);
this.droppable = hasDnd(em) && new Droppable(em, this.wrapper.el);
model.trigger('loaded'); model.trigger('loaded');
}, },

Loading…
Cancel
Save