Browse Source

Remove 'component:dragging' and add 'component:dragEnd[:before]'

pull/79/merge
Artur Arseniev 9 years ago
parent
commit
435e1331cf
  1. 2
      bower.json
  2. 4
      dist/grapes.min.js
  3. 2
      package.json
  4. 9
      src/utils/Sorter.js

2
bower.json

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Open source Web Template Editor", "description": "Open source Web Template Editor",
"version": "0.5.18", "version": "0.5.19",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",
"main": [ "main": [

4
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Open source Web Template Editor", "description": "Open source Web Template Editor",
"version": "0.5.18", "version": "0.5.19",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",

9
src/utils/Sorter.js

@ -613,7 +613,10 @@ define(function(require) {
* @param {Object} pos Object with position coordinates * @param {Object} pos Object with position coordinates
* */ * */
move: function(dst, src, pos) { move: function(dst, src, pos) {
if (this.em) this.em.trigger('component:dragging', [dst, src, pos]); var em = this.em;
if (em) em.trigger('component:dragEnd:before', [dst, src, pos]);
var warns = [];
var modelToDrop, modelTemp;
var index = pos.index; var index = pos.index;
var model = $(src).data('model'); var model = $(src).data('model');
var $dst = $(dst); var $dst = $(dst);
@ -667,7 +670,6 @@ define(function(require) {
if(targetCollection && droppable && accepted && draggable) { if(targetCollection && droppable && accepted && draggable) {
index = pos.method === 'after' ? index + 1 : index; index = pos.method === 'after' ? index + 1 : index;
var modelToDrop, modelTemp;
var opts = {at: index, noIncrement: 1}; var opts = {at: index, noIncrement: 1};
if(!this.dropContent){ if(!this.dropContent){
modelTemp = targetCollection.add({}, opts); modelTemp = targetCollection.add({}, opts);
@ -688,7 +690,6 @@ define(function(require) {
this.prevTarget = null; this.prevTarget = null;
return created; return created;
} else { } else {
var warns = [];
if(!targetCollection){ if(!targetCollection){
warns.push('target collection not found'); warns.push('target collection not found');
} }
@ -703,6 +704,8 @@ define(function(require) {
} }
console.warn('Invalid target position: ' + warns.join(', ')); console.warn('Invalid target position: ' + warns.join(', '));
} }
if (em)
em.trigger('component:dragEnd', [targetCollection, modelToDrop, warns]);
}, },
/** /**

Loading…
Cancel
Save