Don't allow <ins> or <del> blocks to include other html tags

Author: Bill Long

angular-rich-text-diff.js

@@ -27,19 +27,52 @@ var AngularRichTextDiff;
             this.dmp.diff_cleanupSemantic(diffs);
             var diffOutput = '';
             for (var x = 0; x < diffs.length; x++) {
-                var outputString = this.convertDiffableBackToHtml(diffs[x][1]);
-                if (diffs[x][0] === 1) {
-                    // This is an add
-                    diffOutput += '<ins>' + outputString + '</ins>';
-                } else if (diffs[x][0] === -1) {
-                    // This is a delete
-                    diffOutput += '<del>' + outputString + '</del>';
+                diffs[x][1] = this.insertTagsForOperation(diffs[x][1], diffs[x][0]);
+                diffOutput += this.convertDiffableBackToHtml(diffs[x][1]);
+            }
+
+            this.$scope.diffOutput = this.$sce.trustAsHtml(diffOutput);
+        };
+
+        RichTextDiffController.prototype.insertTagsForOperation = function (diffableString, operation) {
+            var openTag = '';
+            var closeTag = '';
+            if (operation === 1) {
+                openTag = '<ins>';
+                closeTag = '</ins>';
+            } else if (operation === -1) {
+                openTag = '<del>';
+                closeTag = '</del>';
+            } else {
+                return diffableString;
+            }
+
+            var outputString = openTag;
+            var isOpen = true;
+            for (var x = 0; x < diffableString.length; x++) {
+                if (diffableString.charCodeAt(x) < this.unicodeRangeStart) {
+                    // We just hit a regular character. If tag is not open, open it.
+                    if (!isOpen) {
+                        outputString += openTag;
+                        isOpen = true;
+                    }
+
+                    outputString += diffableString[x];
                 } else {
-                    diffOutput += outputString;
+                    // We just hit one of our mapped unicode characters. Close our tag.
+                    if (isOpen) {
+                        outputString += closeTag;
+                        isOpen = false;
+                    }
+
+                    outputString += diffableString[x];
                 }
             }
 
-            this.$scope.diffOutput = this.$sce.trustAsHtml(diffOutput);
+            if (isOpen)
+                outputString += closeTag;
+
+            return outputString;
         };
 
         RichTextDiffController.prototype.convertHtmlToDiffableString = function (htmlString) {

angular-rich-text-diff.ts

@@ -38,19 +38,51 @@ module AngularRichTextDiff {
             this.dmp.diff_cleanupSemantic(diffs);
             var diffOutput = '';
             for (var x = 0; x < diffs.length; x++) {
-                var outputString = this.convertDiffableBackToHtml(diffs[x][1]);
-                if (diffs[x][0] === 1) {
-                    // This is an add
-                    diffOutput += '<ins>' + outputString + '</ins>';
-                } else if (diffs[x][0] === -1) {
-                    // This is a delete
-                    diffOutput += '<del>' + outputString + '</del>';
+                diffs[x][1] = this.insertTagsForOperation(diffs[x][1], diffs[x][0]);
+                diffOutput += this.convertDiffableBackToHtml(diffs[x][1]);
+            }
+
+            this.$scope.diffOutput = this.$sce.trustAsHtml(diffOutput);
+        }
+
+        insertTagsForOperation(diffableString: string, operation: number): string {
+            var openTag = '';
+            var closeTag = '';
+            if (operation === 1) {
+                openTag = '<ins>';
+                closeTag = '</ins>';
+            } else if (operation === -1) {
+                openTag = '<del>';
+                closeTag = '</del>';
+            } else {
+                return diffableString;
+            }
+
+            var outputString = openTag;
+            var isOpen = true;
+            for (var x = 0; x < diffableString.length; x++) {
+                if (diffableString.charCodeAt(x) < this.unicodeRangeStart) {
+                    // We just hit a regular character. If tag is not open, open it.
+                    if (!isOpen) {
+                        outputString += openTag;
+                        isOpen = true;
+                    }
+
+                    outputString += diffableString[x];
                 } else {
-                    diffOutput += outputString;
+                    // We just hit one of our mapped unicode characters. Close our tag.
+                    if (isOpen) {
+                        outputString += closeTag;
+                        isOpen = false;
+                    }
+
+                    outputString += diffableString[x];
                 }
             }
 
-            this.$scope.diffOutput = this.$sce.trustAsHtml(diffOutput);
+            if (isOpen) outputString += closeTag;
+
+            return outputString;
         }
 
         convertHtmlToDiffableString(htmlString: string): string {

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-rich-text-diff",
   "main": "angular-rich-text-diff.js",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "authors": [
     "Bill Long <bill@blackout.us>"
   ],