New method: get range from rendered result

BowlingX · Oct 22, 2015 · 2029191 · 2029191
1 parent 90f817a
commit 2029191
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 7 deletions.
diff --git a/src/main/Rendering.js b/src/main/Rendering.js
@@ -60,11 +60,6 @@ class Rendering extends RenderingEvents {
 
         super(options, document);
 
-        /**
-         * @type {Document}
-         */
-        this.document = document;
-
         /**
          * ID of rendering, will be set on each element that is part of it
          * @type {String}
@@ -524,11 +519,15 @@ class Rendering extends RenderingEvents {
             this._markTextSameNode(startContainer, startOffset, endOffset);
         } else {
             const result = this._markTextDifferentNode(startContainer, endContainer, startOffset, endOffset);
+            const index = this.wrapperNodes.indexOf(result.endT);
+            // remove endContainer, to keep order:
+            this.wrapperNodes.splice(index, 1);
             if (!outer) {
                 this.wrapSiblings(result.startT.nextSibling, endContainer);
             } else {
                 this.walk(result.startT, endContainer, contextContainer);
             }
+            this.wrapperNodes.push(result.endT);
         }
     }
 

diff --git a/src/main/RenderingEvents.js b/src/main/RenderingEvents.js
@@ -53,6 +53,35 @@ export default class RenderingEvents extends EventEmitter {
         this.wrapperNodes = [];
 
         this._registerEvents(document);
+
+        /**
+         * @type {Document}
+         */
+        this.document = document;
+    }
+
+    /**
+     * Constructs a new Range from rendered result
+     * @returns {Range}
+     */
+    get range() {
+        const range = this.document.createRange();
+        const textNodes = [];
+
+        this.wrapperNodes.forEach((wrapper) => {
+            Util.walkTextNodes(wrapper, (node) => {
+                textNodes.push(node);
+            });
+        });
+
+        if(textNodes.length > 0) {
+            const lastTextNode = textNodes[textNodes.length - 1];
+            range.setStart(textNodes[0], 0);
+            range.setEnd(lastTextNode, lastTextNode.length);
+            return range;
+        }
+
+        return null;
     }
 
     /**

diff --git a/src/main/modules/Site.js b/src/main/modules/Site.js
@@ -62,7 +62,7 @@ document.addEventListener("DOMContentLoaded", function () {
             return;
         }
 
-        tooltip.createTooltip(this.wrapperNodes[0], this.result.text);
+        tooltip.createTooltip(this.wrapperNodes[0], this.result.text, false);
 
         setTimeout(function () {
             if (tooltip.getCurrentTarget()) {

diff --git a/src/main/util/Util.js b/src/main/util/Util.js
@@ -428,7 +428,6 @@ class Util {
         });
     }
 
-
     /**
      * @param {Node} container
      * @param {Number} thisIndex

diff --git a/src/test/Marklib.js b/src/test/Marklib.js
@@ -42,6 +42,9 @@ describe("Test some wrappings", () => {
             endContainerPath: 'html>body>div>div>p:nth-of-type(4);0'
         };
 
+        expect(marklib.range.startOffset).toEqual(0);
+        expect(marklib.range.endOffset).toEqual(0);
+
         expect(result.serialize()).toEqual(expectedResult);
     });
 
@@ -64,6 +67,8 @@ describe("Test some wrappings", () => {
             startContainerPath: 'html>body>div>div>p:nth-of-type(1);0',
             endContainerPath: 'html>body>div>div>p:nth-of-type(1);0'
         };
+        expect(marklib.range.startOffset).toEqual(0);
+        expect(marklib.range.endOffset).toEqual(0);
 
         expect(result.serialize()).toEqual(rangeResult);