merged PR timdown/rangy#405

Author: pburrows

lib/rangy-classapplier.js

@@ -9,7 +9,7 @@
  *
  * Copyright 2019, Tim Down
  * Licensed under the MIT license.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Build date: 2 January 2019
  */
 (function(factory, root) {

lib/rangy-core.js

@@ -4,7 +4,7 @@
  *
  * Copyright 2019, Tim Down
  * Licensed under the MIT license.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Build date: 2 January 2019
  */
 
@@ -109,7 +109,7 @@
     };
 
     var api = {
-        version: "1.3.2",
+        version: "1.3.3",
         initialized: false,
         isBrowser: isBrowser,
         supported: true,

lib/rangy-highlighter.js

@@ -6,7 +6,7 @@
  *
  * Copyright 2019, Tim Down
  * Licensed under the MIT license.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Build date: 2 January 2019
  */
 (function(factory, root) {

lib/rangy-selectionsaverestore.js

@@ -9,7 +9,7 @@
  *
  * Copyright 2019, Tim Down
  * Licensed under the MIT license.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Build date: 2 January 2019
  */
 (function(factory, root) {

lib/rangy-serializer.js

@@ -10,7 +10,7 @@
  *
  * Copyright 2019, Tim Down
  * Licensed under the MIT license.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Build date: 2 January 2019
  */
 (function(factory, root) {

lib/rangy-textrange.js

@@ -26,7 +26,7 @@
  *
  * Copyright 2019, Tim Down
  * Licensed under the MIT license.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Build date: 2 January 2019
  */
 
@@ -1468,6 +1468,13 @@
                     currentChar = currentChar.toLowerCase();
                 }
 
+                // If there is a non-breaking space in the innerText, then replace with empty space " " so that it
+                // matches with the searchTerm. Based on the documentation, search should be performed on
+                // the visible text of the document
+                if (currentChar == "\u00a0") {
+                    currentChar = " ";
+                }
+
                 if (backward) {
                     chars.unshift(pos);
                     text = currentChar + text;

package.json

@@ -1,7 +1,7 @@
 {
     "name": "rangy-updated",
     "description": "A cross-browser DOM range and selection library, cloned from the original rangy repository, updated, and accepting PRs",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "author": {
         "name": "Patrick Burrows",
         "email": "pburrows@burrowscorp.com",

src/modules/rangy-textrange.js

@@ -1530,6 +1530,13 @@ rangy.createModule("TextRange", ["WrappedSelection"], function(api, module) {
                 currentChar = currentChar.toLowerCase();
             }
 
+            // If there is a non-breaking space in the innerText, then replace with empty space " " so that it
+            // matches with the searchTerm. Based on the documentation, search should be performed on
+            // the visible text of the document
+            if (currentChar == "\u00a0") {
+                currentChar = " ";
+            }
+
             if (backward) {
                 chars.unshift(pos);
                 text = currentChar + text;

test/textrangetests.js

@@ -920,6 +920,42 @@ xn.test.suite("Text Range module tests", function(s) {
         t.assertFalse(range.findText("Two", options));
     });
 
+    s.test("findText text with non-breaking space", function(t) {
+        t.el.innerHTML = 'One Two three';
+        var textNode = t.el.firstChild;
+        var range = rangy.createRange();
+        range.collapseToPoint(textNode, 0);
+
+        var scopeRange = rangy.createRange();
+        scopeRange.selectNodeContents(t.el);
+        var options = {
+            withinRange: scopeRange
+        };
+
+        t.assert(range.findText("Two ", options));
+        testRangeBoundaries(t, range, textNode, 4, textNode, 8);
+        range.collapse(false);
+        t.assertFalse(range.findText("Two", options));
+    });
+
+    s.test("findText text with non-breaking space and normal space", function(t) {
+        t.el.innerHTML = 'One Two  three';
+        var textNode = t.el.firstChild;
+        var range = rangy.createRange();
+        range.collapseToPoint(textNode, 0);
+
+        var scopeRange = rangy.createRange();
+        scopeRange.selectNodeContents(t.el);
+        var options = {
+            withinRange: scopeRange
+        };
+
+        t.assert(range.findText("Two  three", options));
+        testRangeBoundaries(t, range, textNode, 4, textNode, 14);
+        range.collapse(false);
+        t.assertFalse(range.findText("Two", options));
+    });
+
     s.test("findText simple text no wrap", function(t) {
         t.el.innerHTML = 'Two One Two three';
         var textNode = t.el.firstChild;