Browse Source

Stop using `dragContent` in Droppable and add activeOnRender

pull/758/head
Artur Arseniev 8 years ago
parent
commit
3b07616692
  1. 8
      src/block_manager/view/BlockView.js
  2. 10
      src/utils/Droppable.js

8
src/block_manager/view/BlockView.js

@ -4,7 +4,12 @@ import { on, off, hasDnd } from 'utils/mixins';
module.exports = Backbone.View.extend({
events: {
mousedown: 'startDrag',
dragstart: 'handleDragStart'
dragstart: 'handleDragStart',
dragend: 'handleDragEnd'
},
handleDragEnd(ev) {
console.log('handleDragEnd');
},
initialize(o, config = {}) {
@ -36,7 +41,6 @@ module.exports = Backbone.View.extend({
const isObj = isObject(content);
const type = isObj ? 'text/json' : 'text';
const data = isObj ? JSON.stringify(content) : content;
console.log('handleDragStart', data);
// Note: data are not available on dragenter for security reason
ev.dataTransfer.setData(type, data);
},

10
src/utils/Droppable.js

@ -36,7 +36,6 @@ export default class Droppable {
// force out like in BlockView
const sorter = this.sorter;
cancel && (sorter.moved = 0);
//em.set('dragContent', '');
sorter.endMove();
em.trigger('canvas:dragend', ev);
}
@ -71,7 +70,14 @@ export default class Droppable {
itemSel: '*',
pfx: 'gjs-',
onStart: () => em.stopDefault(),
onEndMove: () => em.runDefault(),
onEndMove: model => {
em.runDefault();
if (model && model.get && model.get('activeOnRender')) {
model.trigger('active');
model.set('activeOnRender', 0);
}
},
document: canvas.getFrameEl().contentDocument
});
const content = this.getContentByData(dt).content || '<br>';

Loading…
Cancel
Save