Browse Source

Improve hover in SelectComponent command. Fixes #1448

pull/1518/head
Artur Arseniev 8 years ago
parent
commit
605bd415bf
  1. 11
      src/commands/view/SelectComponent.js
  2. 17
      src/dom_components/view/ComponentView.js

11
src/commands/view/SelectComponent.js

@ -65,7 +65,16 @@ module.exports = {
onHover(e) {
e.stopPropagation();
let trg = e.target;
let model = $(trg).data('model');
let $el = $(trg);
let model = $el.data('model');
if (!model) {
let parent = $el.parent();
while (!model && parent) {
model = parent.data('model');
parent = parent.parent();
}
}
// Adjust tools scroll top
if (!this.adjScroll) {

17
src/dom_components/view/ComponentView.js

@ -314,23 +314,6 @@ module.exports = Backbone.View.extend({
for (var i = 0, len = childNodes.length; i < len; i++) {
container.appendChild(childNodes.shift());
}
// If the children container is not the same as the component
// (so likely fetched with getChildrenSelector()) is necessary
// to disable pointer-events for all nested components as they
// might prevent the component to be selected
if (container !== this.el) {
var disableNode = el => {
var children = Array.prototype.slice.call(el.children);
children.forEach(el => {
el.style['pointer-events'] = 'none';
if (container !== el) {
disableNode(el);
}
});
};
disableNode(this.el);
}
},
renderAttributes() {

Loading…
Cancel
Save