Browse Source

Merge branch 'dev' into selectable-components

pull/562/head
Artur Arseniev 9 years ago
committed by GitHub
parent
commit
12032f6383
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/commands/view/SelectComponent.js
  2. 3
      src/dom_components/model/Component.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;
}

3
src/dom_components/model/Component.js

@ -65,6 +65,9 @@ module.exports = Backbone.Model.extend(Styleable).extend({
// 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,

Loading…
Cancel
Save