Changeset 7554

Timestamp:

07/11/12 19:24:54 (10 months ago)

Author:

garry.yao

Message:

#9036: Fixed failed to find text with matchWord option checked, regression of [7395].

File:

• CKEditor/trunk/_source/plugins/find/dialogs/find.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/find/dialogs/find.js

@@ -156 +156 @@
                                                          || this._.walker._.end )
                                                         break;
-                                        }
+                                                }
                                         // Found a fresh text node.
                                         this.textNode = currentTextNode;
@@ -496 +496 @@
                                                                 head = cursors[ 0 ];
 
-                                                        var headWalker = new characterWalker( getRangeBeforeCursor( head ), true ),
-                                                                tailWalker = new characterWalker( getRangeAfterCursor( tail ), true );
+                                                        var rangeBefore = getRangeBeforeCursor( head ),
+                                                                rangeAfter = getRangeAfterCursor( tail );
+
+                                                        // The word boundary checks requires to trim the text nodes. (#9036)
+                                                        rangeBefore.trim();
+                                                        rangeAfter.trim();
+
+                                                        var headWalker = new characterWalker( rangeBefore, true ),
+                                                                tailWalker = new characterWalker( rangeAfter, true );
 
                                                         if ( ! ( isWordSeparator( headWalker.back().character )