Browse Source

Prevent parent selection

pull/2634/head
Artur Arseniev 6 years ago
parent
commit
dba570782e
  1. 2314
      dist/grapes.js
  2. 7
      dist/grapes.min.js
  3. 2
      dist/grapes.min.js.map
  4. 2
      package-lock.json
  5. 7
      package.json
  6. 9
      src/commands/index.js

2314
dist/grapes.js

File diff suppressed because it is too large

7
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
dist/grapes.min.js.map

File diff suppressed because one or more lines are too long

2
package-lock.json

@ -1,6 +1,6 @@
{
"name": "grapesjs",
"version": "0.15.18",
"version": "0.16.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

7
package.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Free and Open Source Web Builder Framework",
"version": "0.15.18",
"version": "0.16.1",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",
@ -119,9 +119,10 @@
"docs:deploy": "docs/deploy.sh",
"lint": "eslint src",
"check": "npm run lint && npm run test",
"build": "npm run check && npm run v:patch && npm run build-dev && webpack --env=prod",
"build-n": "npm run check && npm run build:css && webpack --env=prod",
"build": "npm run check && npm run v:patch && npm run build-dev && npm run build-prod",
"build-n": "npm run check && npm run build:css && npm run build-prod",
"build-dev": "webpack --env=dev && npm run build:css && npm run build:locale",
"build-prod": "webpack --env=prod",
"build:css": "node-sass src/styles/scss/main.scss dist/css/grapes.min.css --output-style compressed",
"build:locale": "rm -rf ./locale && node scripts/build-locale.js && babel locale -d locale --copy-files --no-comments",
"v:patch": "npm version --no-git-tag-version patch",

9
src/commands/index.js

@ -131,6 +131,7 @@ export default () => {
const modes = ['absolute', 'translate'];
const mode = sel.get('dmode') || em.get('dmode');
const hideTlb = () => em.stopDefault(defComOptions);
const altMode = includes(modes, mode);
selAll.forEach(sel => sel.trigger('disable'));
if (!sel || !sel.get('draggable')) {
@ -152,12 +153,12 @@ export default () => {
ed.select(selAll);
sel.emitUpdate();
em.trigger(`${eventDrag}:end`, data);
};
// Dirty patch to prevent parent selection on drop
em.set('_cmpDrag', 1);
// Dirty patch to prevent parent selection on drop
(altMode || data.cancelled) && em.set('_cmpDrag', 1);
};
if (includes(modes, mode)) {
if (altMode) {
// TODO move grabbing func in editor/canvas from the Sorter
dragger = ed.runCommand('core:component-drag', {
guidesInfo: 1,

Loading…
Cancel
Save