Changeset 1179 for FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html

Timestamp:

2007-12-05 10:28:42 (12 months ago)

Author:

martinkou

Message:

Merged the changesets from trunk since the creation of the floating dialog branch.

Files:

• FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html (modified) (6 diffs)

FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html

@@ -45 +45 @@
         idMap['CheckCase'] = 'chkCase' + tabCode ;
         idMap['CheckWord'] = 'chkWord' + tabCode ;
+
+        if ( tabCode == 'Replace' )
+                window.parent.SetAutoSize( true ) ;
 }
 
@@ -61 +64 @@
 
         // Show the appropriate tab at startup.
-        if ( dialogArguments.CustomValue == 'Find' )
+        if ( window.parent.name.search( 'Replace' ) == -1 )
+        {
                 window.parent.SetSelectedTab( 'Find' ) ;
+                window.parent.SetAutoSize( true ) ;
+        }
         else
                 window.parent.SetSelectedTab( 'Replace' ) ;
@@ -108 +114 @@
 function GetData( bookmark )
 {
-        var currentNode = oEditor.FCK.EditorDocument.documentElement;
-        for( var i = 0 ; i < bookmark.length ; i++ )
-        {
-                if ( currentNode.childNodes.length > bookmark[i] )
-                        currentNode = currentNode.childNodes.item( bookmark[i] ) ;
-                else if ( currentNode.nodeType == 3 )   // text node
+        var cursor = oEditor.FCK.EditorDocument.documentElement ;
+        for ( var i = 0 ; i < bookmark.length ; i++ )
+        {
+                var target = bookmark[i] ;
+                var currentIndex = -1 ;
+                if ( cursor.nodeType != 3 )
                 {
-                        var c = currentNode.nodeValue.charAt( bookmark[i] ) ;
-                        if ( i == bookmark.length - 1 )
-                                return c != "" ? c : null ;
-                        else
+                        for (var j = 0 ; j < cursor.childNodes.length ; j++ )
+                        {
+                                var candidate = cursor.childNodes[j] ;
+                                if ( candidate.nodeType == 3 &&
+                                                candidate.previousSibling &&
+                                                candidate.previousSibling.nodeType == 3 )
+                                        continue ;
+                                currentIndex++ ;
+                                if ( currentIndex == target )
+                                {
+                                        cursor = candidate ;
+                                        break ;
+                                }
+                        }
+                        if ( currentIndex < target )
                                 return null ;
                 }
                 else
-                        return null;
-        }
-        return currentNode ;
+                {
+                        if ( i != bookmark.length - 1 )
+                                return null ;
+                        while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 )
+                        {
+                                target -= cursor.length ;
+                                cursor = cursor.nextSibling ;
+                        }
+                        cursor = cursor.nodeValue.charAt( target ) ;
+                        if ( cursor == "" )
+                                cursor = null ;
+                }
+        }
+        return cursor ;
 }
 
@@ -132 +160 @@
         // See if there's anything further down the tree.
         var next = bookmark.concat( [0] ) ;
-
         if ( GetData( next ) != null )
                 return next ;
@@ -253 +280 @@
                         {
                                 if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] )
+                                {
                                         matcher.Reset();
+                                        matchBookmark = null ;
+                                }
                         }
                         else if ( data.charAt != undefined )
@@ -324 +354 @@
                 while ( focus && focus.nodeType != 1 )
                         focus = focus.parentNode ;
+
                 if ( focus )
-                focus.scrollIntoView( false ) ;
+                {
+                        if ( oEditor.FCKBrowserInfo.IsSafari )
+                                oEditor.FCKDomTools.ScrollIntoView( focus, false ) ;
+                        else
+                                focus.scrollIntoView( false ) ;
+                }
+
                 return true;
         }