Visual: allow paragraph split inside annotations.

diff --git a/src/redakcja/static/css/html.scss b/src/redakcja/static/css/html.scss
index 881083a..d9886d4 100644 (file)
--- a/src/redakcja/static/css/html.scss
+++ b/src/redakcja/static/css/html.scss
@@ -327,6 +327,7 @@ div[x-node] > .uwaga {
 
         &.editing {
             display: block;
 
         &.editing {
             display: block;

+            background: #93ff93;

         }
     }
     
         }
     }
     

diff --git a/src/redakcja/static/js/wiki/caret.js b/src/redakcja/static/js/wiki/caret.js
index b2cf182..38848b0 100644 (file)
--- a/src/redakcja/static/js/wiki/caret.js
+++ b/src/redakcja/static/js/wiki/caret.js
@@ -151,10 +151,21 @@ class Caret {
     splitBlock() {
         let splitter = this.element;
         let parent, newParent, splitIndex, index;
     splitBlock() {
         let splitter = this.element;
         let parent, newParent, splitIndex, index;

-        
+

         while (!splitter.is('div[x-node]')) {
             parent = splitter.parent();
             splitIndex = parent.contents().index(splitter);
         while (!splitter.is('div[x-node]')) {
             parent = splitter.parent();
             splitIndex = parent.contents().index(splitter);

+
+            if (parent.is('[x-annotation-box]')) {
+                // We're splitting inside an inline-style annotation.
+                // Convert into a block-style annotation now.
+                let p = $('<div x-editable="true" x-node="akap">');
+                parent.contents().appendTo(p);
+                parent.empty();
+                parent.append(p);
+                parent = p;
+            }
+

             newParent = parent.clone();
             index = parent.contents().length - 1;
             while (index >= splitIndex) {
             newParent = parent.clone();
             index = parent.contents().length - 1;
             while (index >= splitIndex) {