diff --git a/src/canvas/index.js b/src/canvas/index.js index 7397b3c4a..c60a7ce11 100644 --- a/src/canvas/index.js +++ b/src/canvas/index.js @@ -29,8 +29,7 @@ * @module Canvas */ -import { hasDnd, getElement, getViewEl } from 'utils/mixins'; -import Droppable from 'utils/Droppable'; +import { getElement, getViewEl } from 'utils/mixins'; import defaults from './config/config'; import Canvas from './model/Canvas'; import canvasView from './view/CanvasView'; @@ -572,10 +571,6 @@ export default () => { fr && fr.stopAutoscroll(); }, - postRender() { - if (hasDnd(c.em)) this.droppable = new Droppable(c.em); - }, - /** * Set zoom value * @param {Number} value The zoom value, from 0 to 100 diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js index bf308db25..bdf042951 100644 --- a/src/canvas/view/FrameView.js +++ b/src/canvas/view/FrameView.js @@ -2,6 +2,7 @@ import Backbone from 'backbone'; import { bindAll, isString, debounce, isUndefined } from 'underscore'; import CssRulesView from 'css_composer/view/CssRulesView'; import ComponentView from 'dom_components/view/ComponentView'; +import Droppable from 'utils/Droppable'; import { appendVNodes, empty, @@ -10,7 +11,7 @@ import { createCustomEvent, motionsEv } 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({ tagName: 'iframe', @@ -397,6 +398,7 @@ export default Backbone.View.extend({ ); this._toggleEffects(1); + this.droppable = hasDnd(em) && new Droppable(em, this.wrapper.el); model.trigger('loaded'); },