Browse Source

Prevent errors on body hover. Closes #2974

pull/2997/head
Artur Arseniev 6 years ago
parent
commit
78a1d3ed97
  1. 6
      src/commands/view/SelectComponent.js
  2. 2
      src/utils/dom.js

6
src/commands/view/SelectComponent.js

@ -7,7 +7,7 @@ import {
isTaggableNode, isTaggableNode,
getViewEl getViewEl
} from 'utils/mixins'; } from 'utils/mixins';
import { isVisible } from 'utils/dom'; import { isVisible, isDoc } from 'utils/dom';
import ToolbarView from 'dom_components/view/ToolbarView'; import ToolbarView from 'dom_components/view/ToolbarView';
import Toolbar from 'dom_components/model/Toolbar'; import Toolbar from 'dom_components/model/Toolbar';
@ -116,7 +116,7 @@ export default {
// Get first valid model // Get first valid model
if (!model) { if (!model) {
let parent = $el.parent(); let parent = $el.parent();
while (!model && parent.length > 0) { while (!model && parent.length && !isDoc(parent[0])) {
model = parent.data('model'); model = parent.data('model');
parent = parent.parent(); parent = parent.parent();
} }
@ -292,7 +292,7 @@ export default {
if (!model) { if (!model) {
let parent = $el.parent(); let parent = $el.parent();
while (!model && parent.length > 0) { while (!model && parent.length && !isDoc(parent[0])) {
model = parent.data('model'); model = parent.data('model');
parent = parent.parent(); parent = parent.parent();
} }

2
src/utils/dom.js

@ -8,6 +8,8 @@ const KEY_CHILD = 'children';
export const motionsEv = export const motionsEv =
'transitionend oTransitionEnd transitionend webkitTransitionEnd'; 'transitionend oTransitionEnd transitionend webkitTransitionEnd';
export const isDoc = el => el && el.nodeType === 9;
export const isVisible = el => { export const isVisible = el => {
return ( return (
el && !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length) el && !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length)

Loading…
Cancel
Save