lakelib 0.2.2 → 0.2.4

package/lib/lake.js

@@ -3484,7 +3484,7 @@ class Dropdown {
         </button>
       </div>
     `);
-        this.menuNode = query('<ul class="lake-popup lake-dropdown-menu lake-custom-properties" />');
+        this.menuNode = query('<ul class="lake-popup lake-dropdown-menu" />');
         if (config.tabIndex !== undefined) {
             const titleNode = this.node.find('.lake-dropdown-title');
             titleNode.attr('tabindex', config.tabIndex.toString());
@@ -3780,7 +3780,7 @@ class BoxToolbar {
         this.items = config.items;
         this.locale = config.locale || i18nObject('en-US');
         this.placement = config.placement || 'top';
-        this.container = query('<div class="lake-popup lake-box-toolbar lake-custom-properties" />');
+        this.container = query('<div class="lake-popup lake-box-toolbar" />');
     }
     appendDivider() {
         this.container.append('<div class="lake-toolbar-divider" />');
@@ -5108,22 +5108,28 @@ function removePreviousOrNextZWS(node) {
         nextNode.remove();
     }
 }
-// Returns an element copied from each last child of the descendants of the specified node.
-function copyNestedMarks$1(node) {
-    if (!node.isMark) {
-        return null;
+// Returns a nested mark copied from ancestors of the specified node.
+function getNestedMark$1(node) {
+    let parent = node;
+    if (parent.isText) {
+        parent = parent.parent();
     }
-    let newMark = node.clone();
-    let child = node.last();
-    while (child.length > 0) {
-        if (child.isMark) {
-            const newChild = child.clone();
-            newMark.append(newChild);
-            newMark = newChild;
+    let mark = null;
+    while (parent.length > 0) {
+        if (!parent.isMark) {
+            break;
         }
-        child = child.last();
+        if (mark) {
+            const newMark = parent.clone();
+            newMark.append(mark);
+            mark = newMark;
+        }
+        else {
+            mark = parent.clone();
+        }
+        parent = parent.parent();
     }
-    return newMark;
+    return mark;
 }
 // Returns the topmost mark element or the closest element with the same tag name as the specified node.
 function getUpperMark(node, tagName) {
@@ -5171,23 +5177,26 @@ function addMark(range, value) {
         removeBreak(block);
         // https://en.wikipedia.org/wiki/Zero-width_space
         const zeroWidthSpace = new Nodes(document.createTextNode('\u200B'));
-        const parts = splitMarks(range);
-        if (parts.start) {
-            const newMark = copyNestedMarks$1(parts.start);
-            if (newMark) {
-                if (newMark.name === tagName) {
-                    newMark.css(cssProperties);
-                    valueNode = newMark;
-                }
-                else {
-                    const deepestMark = getDeepElement(newMark);
-                    deepestMark.append(zeroWidthSpace);
-                    valueNode.append(newMark);
+        const newMark = getNestedMark$1(range.startNode);
+        splitMarks(range);
+        if (newMark) {
+            let child = newMark;
+            while (child.length > 0) {
+                if (child.name === tagName) {
+                    child.css(cssProperties);
                 }
+                child = child.first();
+            }
+            if (newMark.name === tagName) {
+                valueNode = newMark;
+            }
+            else {
+                valueNode.append(newMark);
             }
         }
         if (valueNode.text() === '') {
-            valueNode.append(zeroWidthSpace);
+            const deepestMark = getDeepElement(valueNode);
+            deepestMark.append(zeroWidthSpace);
         }
         insertNode(range, valueNode);
         removePreviousOrNextZWS(valueNode);
@@ -5227,30 +5236,32 @@ function removeEmptyMarks$1(node) {
         }
     }
 }
-// Returns an element copied from each last child of the descendants of the specified node.
-function copyNestedMarks(node, tagName) {
+// Returns a nested mark copied from each last child of the descendants of the specified node.
+function getNestedMark(node, tagName) {
     if (!node.isMark || !tagName) {
         return null;
     }
-    let newMark = node.clone();
-    let child = node.last();
+    let mark = null;
+    let deepestMark = null;
+    let child = node;
     while (child.length > 0) {
-        if (child.isMark && child.name !== tagName) {
-            const newChild = child.clone();
-            newMark.append(newChild);
-            newMark = newChild;
-        }
-        child = child.last();
-    }
-    if (newMark.name === tagName) {
-        if (newMark.first().length > 0) {
-            newMark = newMark.first();
+        if (!child.isMark) {
+            break;
         }
-        else {
-            return null;
+        if (child.name !== tagName) {
+            if (deepestMark) {
+                const newMark = child.clone();
+                deepestMark.append(newMark);
+                deepestMark = newMark;
+            }
+            else {
+                mark = child.clone();
+                deepestMark = mark;
+            }
         }
+        child = child.last();
     }
-    return newMark;
+    return mark;
 }
 // Removes the specified marks from the range.
 function removeMark(range, value) {
@@ -5277,7 +5288,7 @@ function removeMark(range, value) {
             removeEmptyMarks$1(parts.end);
         }
         const zeroWidthSpace = new Nodes(document.createTextNode('\u200B'));
-        const newMark = copyNestedMarks(parts.start, tagName);
+        const newMark = getNestedMark(parts.start, tagName);
         if (!newMark) {
             parts.start.after(zeroWidthSpace);
             removeEmptyMarks$1(parts.start);
@@ -5441,7 +5452,7 @@ function removeBox(range) {
     return box;
 }
 
-var version = "0.2.2";
+var version = "0.2.4";
 
 // Returns the attributes of the element as an key-value object.
 function getAttributes(node) {
@@ -6189,7 +6200,6 @@ class Editor {
         this.container = query('<div class="lake-container" />');
         this.overlayContainer = query('<div class="lake-overlay" />');
         this.readonly = this.config.readonly;
-        this.root.addClass('lake-custom-properties');
         this.container.attr({
             contenteditable: this.readonly ? 'false' : 'true',
             spellcheck: this.config.spellcheck ? 'true' : 'false',
@@ -6545,7 +6555,6 @@ class Editor {
         this.event.removeAllListeners();
         this.history.event.removeAllListeners();
         this.root.off();
-        this.root.removeClass('lake-custom-properties');
         this.root.empty();
         document.removeEventListener('copy', this.copyListener);
         if (!this.readonly) {
@@ -7237,7 +7246,6 @@ class Toolbar {
             this.placement = config.placement;
         }
         this.container = query('<div class="lake-toolbar" />');
-        this.root.addClass('lake-custom-properties');
     }
     appendDivider() {
         this.container.append('<div class="lake-toolbar-divider" />');
@@ -7426,7 +7434,6 @@ class Toolbar {
         for (const dropdown of this.dropdownList) {
             dropdown.unmount();
         }
-        this.root.removeClass('lake-custom-properties');
         this.container.remove();
     }
 }
@@ -9447,7 +9454,7 @@ class LinkPopup {
         this.config = config || {};
         this.locale = this.config.locale || i18nObject('en-US');
         this.container = query(safeTemplate `
-      <div class="lake-popup lake-link-popup lake-custom-properties">
+      <div class="lake-popup lake-link-popup">
         <div class="lake-row">${this.locale.link.url()}</div>
         <div class="lake-row lake-url-row">
           <input type="text" name="url" />
@@ -10026,7 +10033,7 @@ class Menu {
         this.items = config.items;
         this.onShow = config.onShow || emptyCallback$2;
         this.onHide = config.onHide || emptyCallback$2;
-        this.container = query('<ul class="lake-popup lake-menu lake-custom-properties" />');
+        this.container = query('<ul class="lake-popup lake-menu" />');
     }
     appendItemNode(itemNode) {
         itemNode.on('mouseenter', () => {