Fix OpMergeParagraph to not remove empty text:p of annotations' text

Author: Friedrich W. H. Kossebau

ChangeLog.md

@@ -1,3 +1,12 @@
+# Changes between 0.5.6 and 0.5.7
+
+## WebODF
+
+### Fixes
+
+* Fix breaking all empty annotations on merging the paragraph they are contained in with the one before ([#877](https://github.com/kogmbh/WebODF/pull/877)))
+
+
 # Changes between 0.5.5 and 0.5.6
 
 ## WebODF

webodf/lib/ops/OpMergeParagraph.js

@@ -22,7 +22,7 @@
  * @source: https://github.com/kogmbh/WebODF/
  */
 
-/*global ops, runtime, odf, core, Node*/
+/*global ops, runtime, odf, core, Node, NodeFilter*/
 
 /**
  * Merges two adjacent paragraphs together into the first paragraph. The destination paragraph
@@ -68,10 +68,13 @@ ops.OpMergeParagraph = function OpMergeParagraph() {
     /**
      * Returns true if the supplied node is an ODF grouping element with no content
      * @param {!Node} element
-     * @return {!boolean}
+     * @return {!number}
      */
-    function isEmptyGroupingElement(element) {
-        return odfUtils.isGroupingElement(element) && odfUtils.hasNoODFContent(element);
+    function filterEmptyGroupingElementToRemove(element) {
+        if (odf.OdfUtils.isInlineRoot(element)) {
+            return NodeFilter.FILTER_SKIP;
+        }
+        return odfUtils.isGroupingElement(element) && odfUtils.hasNoODFContent(element) ? NodeFilter.FILTER_REJECT : NodeFilter.FILTER_ACCEPT;
     }
 
     /**
@@ -93,7 +96,7 @@ ops.OpMergeParagraph = function OpMergeParagraph() {
                 // Empty spans need to be cleaned up on merge, as remove text only removes things that contain text content
                 // Child is moved across before collapsing so any foreign sub-elements are collapsed up the chain next to
                 // the destination location
-                domUtils.removeUnwantedNodes(child, isEmptyGroupingElement);
+                domUtils.removeUnwantedNodes(child, filterEmptyGroupingElementToRemove);
             }
             child = source.firstChild;
         }

webodf/tests/ops/operationtests.xml

@@ -528,6 +528,29 @@
   </ops>
   <after><office:text><text:p text:style-name="A">abcdefgh</text:p></office:text></after>
  </test>
+ <test name="MergeParagraphWithEmptyAnnotationText inside">
+  <before><office:text><text:p text:style-name="A">ab</text:p><text:p text:style-name="B">c<office:annotation office:name="alice_1">
+    <dc:creator e:memberid="Alice">Alice</dc:creator>
+    <dc:date>2013-08-05T12:34:07.061Z</dc:date>
+    <text:list>
+     <text:list-item>
+      <text:p></text:p>
+     </text:list-item>
+    </text:list>
+   </office:annotation>d</text:p></office:text></before>
+  <ops>
+   <op optype="MergeParagraph" destinationStartPosition="0" sourceStartPosition="3" paragraphStyleName="A"/>
+  </ops>
+  <after><office:text><text:p text:style-name="A">abc<office:annotation office:name="alice_1">
+    <dc:creator e:memberid="Alice">Alice</dc:creator>
+    <dc:date>2013-08-05T12:34:07.061Z</dc:date>
+    <text:list>
+     <text:list-item>
+      <text:p></text:p>
+     </text:list-item>
+    </text:list>
+   </office:annotation>d</text:p></office:text></after>
+ </test>
  <test name="RemoveAndMerge">
   <before><office:text><text:p text:style-name="A">abc<text:span text:style-name="B">d</text:span></text:p><text:p text:style-name="C"><text:span text:style-name="D">efgh</text:span></text:p></office:text></before>
   <ops>