Browse Source

Avoid native HTML5 D&D with draggableComponents disabled. Closes #4099

pull/4134/head
Artur Arseniev 5 years ago
parent
commit
f81bcf26d1
  1. 7
      src/dom_components/view/ComponentView.js
  2. 2
      src/utils/Sorter.js

7
src/dom_components/view/ComponentView.js

@ -46,7 +46,7 @@ export default Backbone.View.extend({
this.initComponents({ avoidRender: 1 }); this.initComponents({ avoidRender: 1 });
this.events = { this.events = {
...this.events, ...this.events,
...(this.__isDraggable() && { dragstart: 'handleDragStart' }), dragstart: 'handleDragStart',
}; };
this.delegateEvents(); this.delegateEvents();
!modelOpt.temporary && this.init(this._clbObj()); !modelOpt.temporary && this.init(this._clbObj());
@ -107,8 +107,9 @@ export default Backbone.View.extend({
}, },
handleDragStart(event) { handleDragStart(event) {
event.preventDefault(); if (!this.__isDraggable()) return false;
event.stopPropagation(); event.stopPropagation();
event.preventDefault();
this.em.get('Commands').run('tlb-move', { this.em.get('Commands').run('tlb-move', {
target: this.model, target: this.model,
event, event,
@ -290,7 +291,7 @@ export default Backbone.View.extend({
const defaultAttr = { const defaultAttr = {
'data-gjs-type': type || 'default', 'data-gjs-type': type || 'default',
...(this.__isDraggable() ? { draggable: true } : {}), ...(this.__isDraggable() && { draggable: true }),
...(highlightable ? { 'data-highlightable': 1 } : {}), ...(highlightable ? { 'data-highlightable': 1 } : {}),
...(textable ...(textable
? { ? {

2
src/utils/Sorter.js

@ -44,7 +44,7 @@ export default Backbone.View.extend({
this.document = o.document || document; this.document = o.document || document;
this.$document = $(this.document); this.$document = $(this.document);
this.dropContent = null; this.dropContent = null;
this.em = o.em || ''; this.em = o.em || null;
this.dragHelper = null; this.dragHelper = null;
this.canvasRelative = o.canvasRelative || 0; this.canvasRelative = o.canvasRelative || 0;
this.selectOnEnd = !o.avoidSelectOnEnd; this.selectOnEnd = !o.avoidSelectOnEnd;

Loading…
Cancel
Save