asdasd
This commit is contained in:
@@ -509,7 +509,19 @@
|
||||
return false;
|
||||
};
|
||||
|
||||
<<<<<<< ours
|
||||
// 1) Selection im DOM suchen (bevorzugt)
|
||||
=======
|
||||
// 1) Bevorzugt: ausgewähltes Component-Element aus der View
|
||||
if (selected) {
|
||||
const selEl = (selected.getEl && selected.getEl()) || (selected.view && selected.view.el);
|
||||
if (selEl && (selEl.isContentEditable || (selEl.getAttribute && selEl.getAttribute('contenteditable') === 'true'))) {
|
||||
syncFromElement(selected, selEl, 'selected:view');
|
||||
}
|
||||
}
|
||||
|
||||
// 2) Fallback: Selection im DOM suchen
|
||||
>>>>>>> theirs
|
||||
if (!syncResult && doc && selectionEl && (selectionEl.isContentEditable || (selectionEl.getAttribute && selectionEl.getAttribute('contenteditable') === 'true'))) {
|
||||
const root = (selectionEl.closest && selectionEl.closest('[data-gjs-type="text"]')) || selectionEl;
|
||||
const id = root && root.getAttribute ? root.getAttribute('id') : null;
|
||||
|
||||
Reference in New Issue
Block a user