Browse Source

Merge branch 'dev' of https://github.com/artf/grapesjs into dev

pull/600/head
Artur Arseniev 9 years ago
parent
commit
fa43ad3955
  1. 2
      src/commands/view/SelectComponent.js
  2. 6
      src/dom_components/model/Component.js
  3. 4
      src/editor/model/Editor.js

2
src/commands/view/SelectComponent.js

@ -274,7 +274,7 @@ module.exports = {
var $el = $(el);
var model = $el.data('model');
if(!model || (model && model.get('status') == 'selected')) {
if(!model || !model.get("hoverable") || model.get('status') == 'selected') {
return;
}

6
src/dom_components/model/Component.js

@ -62,6 +62,12 @@ module.exports = Backbone.Model.extend(Styleable).extend({
// Hide the component inside Layers
layerable: true,
// Allow component to be selected when clicked
selectable: true,
// Shows a highlight outline when hovering on the element if true
hoverable: true,
// This property is used by the HTML exporter as void elements do not
// have closing tag, eg. <br/>, <hr/>, etc.
void: false,

4
src/editor/model/Editor.js

@ -409,6 +409,10 @@ module.exports = Backbone.Model.extend({
model = $(el).data('model');
}
if (model && !model.get("selectable")) {
return;
}
this.set('selectedComponent', model, opts);
},

Loading…
Cancel
Save