Merge pull request #3416 from reysu47/develop

Bug fix for custom color issue and add image exception issue.
summernote · Oct 13, 2019 · 2967f27 · 2967f27
2 parents 0a0d4f8 + cb7f902
commit 2967f27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/js/base/core/range.js b/src/js/base/core/range.js
@@ -507,14 +507,16 @@ class WrappedRange {
       topAncestor = rng.sc.childNodes[rng.so > 0 ? rng.so - 1 : 0];
     }
 
-    // siblings not in paragraph
-    let inlineSiblings = dom.listPrev(topAncestor, dom.isParaInline).reverse();
-    inlineSiblings = inlineSiblings.concat(dom.listNext(topAncestor.nextSibling, dom.isParaInline));
-
-    // wrap with paragraph
-    if (inlineSiblings.length) {
-      const para = dom.wrap(lists.head(inlineSiblings), 'p');
-      dom.appendChildNodes(para, lists.tail(inlineSiblings));
+    if (topAncestor) {
+      // siblings not in paragraph
+      let inlineSiblings = dom.listPrev(topAncestor, dom.isParaInline).reverse();
+      inlineSiblings = inlineSiblings.concat(dom.listNext(topAncestor.nextSibling, dom.isParaInline));
+
+      // wrap with paragraph
+      if (inlineSiblings.length) {
+        const para = dom.wrap(lists.head(inlineSiblings), 'p');
+        dom.appendChildNodes(para, lists.tail(inlineSiblings));
+      }
     }
 
     return this.normalize();

diff --git a/src/js/base/module/Buttons.js b/src/js/base/module/Buttons.js
@@ -190,7 +190,7 @@ export default class Buttons {
           click: (event) => {
             event.stopPropagation();
 
-            const $parent = $('.' + className);
+            const $parent = $('.' + className).find('.show');
             const $button = $(event.target);
             const eventName = $button.data('event');
             let value = $button.attr('data-value');