Ticket #5319: 5319_2.patch

_source/plugins/find/dialogs/find.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
 (function()
 {
-        function guardDomWalkerNonEmptyTextNode( node )
+        function nonEmptyText( node )
         {
                 return ( node.type == CKEDITOR.NODE_TEXT && node.getLength() > 0 );
         }
@@ -13 +13 @@
         /**
          * Elements which break characters been considered as sequence.
         */
-        function checkCharactersBoundary ( node )
+        function nonCharactersBoundary ( node )
         {
-                var dtd = CKEDITOR.dtd;
-                return node.isBlockBoundary(
-                        CKEDITOR.tools.extend( {}, dtd.$empty, dtd.$nonEditable ) );
+                return !( node.type == CKEDITOR.NODE_ELEMENT && node.isBlockBoundary(
+                        CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$empty, CKEDITOR.dtd.$nonEditable ) ) );
         }
 
         /**
@@ -84 +83 @@
                 {
                         var walker =
                                 new CKEDITOR.dom.walker( range );
-                        walker[ 'evaluator' ] = guardDomWalkerNonEmptyTextNode;
+                        walker.guard = matchWord ? nonCharactersBoundary : null;
+                        walker[ 'evaluator' ] = nonEmptyText;
                         walker.breakOnFalse = true;
 
                         this._ = {
@@ -145 +145 @@
 
                                                 // Marking as match character boundaries.
                                                 if ( !currentTextNode
-                                                   && checkCharactersBoundary( this._.walker.current ) )
+                                                   && !nonCharactersBoundary( this._.walker.current ) )
                                                         this._.matchBoundary = true;
 
                                         }