From f0e73a868a2a010697efcc1fa6f7edae60408761 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 21 Sep 2017 15:12:56 +0200 Subject: [PATCH] Add the possibility to select parent component --- index.html | 20 ++++++++++---------- src/commands/index.js | 2 +- src/commands/view/SelectParent.js | 9 +++++++++ src/dom_components/model/Component.js | 6 ++++++ 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 src/commands/view/SelectParent.js diff --git a/index.html b/index.html index b8870339f8..51a4ca9566 100755 --- a/index.html +++ b/index.html @@ -1037,15 +1037,7 @@

Insert title here

sectors: [{ name: 'General', open: false, - buildProps: ['opacity', 'float', 'display', 'position', 'top', 'right', 'left', 'bottom'], - properties: [{ - type: 'slider', - property: 'opacity', - defaults: 1, - step: 0.01, - max: 1, - min:0, - }] + buildProps: ['float', 'display', 'position', 'top', 'right', 'left', 'bottom'] },{ name: 'Dimension', open: false, @@ -1070,7 +1062,15 @@

Insert title here

},{ name: 'Extra', open: false, - buildProps: ['transition', 'perspective', 'transform'], + buildProps: ['opacity', 'transition', 'perspective', 'transform'], + properties: [{ + type: 'slider', + property: 'opacity', + defaults: 1, + step: 0.01, + max: 1, + min:0, + }] },{ name: 'Flex', open: false, diff --git a/src/commands/index.js b/src/commands/index.js index d7616ff0a3..c9218e231a 100644 --- a/src/commands/index.js +++ b/src/commands/index.js @@ -100,6 +100,7 @@ module.exports = () => { defaultCommands['open-blocks'] = require('./view/OpenBlocks'); defaultCommands['open-assets'] = require('./view/OpenAssets'); defaultCommands['show-offset'] = require('./view/ShowOffset'); + defaultCommands['select-parent'] = require('./view/SelectParent'); defaultCommands.fullscreen = require('./view/Fullscreen'); defaultCommands.preview = require('./view/Preview'); defaultCommands.resize = require('./view/Resize'); @@ -117,7 +118,6 @@ module.exports = () => { ed.select(null); sel.destroy(); ed.trigger('change:canvasOffset'); - //ed.refresh();//change:canvasOffset }, }; diff --git a/src/commands/view/SelectParent.js b/src/commands/view/SelectParent.js new file mode 100644 index 0000000000..2629f7fee5 --- /dev/null +++ b/src/commands/view/SelectParent.js @@ -0,0 +1,9 @@ +module.exports = { + + run(editor) { + const comp = editor.getSelected(); + const coll = comp && comp.collection; + coll && coll.parent && editor.select(coll.parent); + } + +}; diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js index d675d6d683..0f6a4620ce 100644 --- a/src/dom_components/model/Component.js +++ b/src/dom_components/model/Component.js @@ -190,6 +190,12 @@ module.exports = Backbone.Model.extend(Styleable).extend({ var model = this; if(!model.get('toolbar')) { var tb = []; + if(model.collection) { + tb.push({ + attributes: {class: 'fa fa-arrow-up'}, + command: 'select-parent', + }); + } if(model.get('draggable')) { tb.push({ attributes: {class: 'fa fa-arrows'},