Changeset 1997

Timestamp:

2008-05-14 14:03:53 (8 months ago)

Author:

fredck

Message:

Fixed #1691 : Creation of links in Safari failed if there was no selection.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck_gecko.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fck_gecko.js

@@ -416 +416 @@
         var aCreatedLinks = new Array() ;
 
+        // Only for Safari, a collapsed selection may create a link. All other
+        // browser will have no links created. So, we check it here and return
+        // immediatelly, having the same cross browser behavior.
+        if ( FCKSelection.GetSelection().isCollapsed )
+                return aCreatedLinks ;
+
         FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ;
 
@@ -434 +440 @@
                         var oLink = oLinksInteractor.snapshotItem( i ) ;
                         oLink.href = url ;
-
-                        // It may happen that the browser (aka Safari) decides to use the
-                        // URL as the link content to not leave it empty. In this case,
-                        // let's reset it.
-                        if ( sTempUrl == oLink.innerHTML )
-                                oLink.innerHTML = '' ;
 
                         aCreatedLinks.push( oLink ) ;

FCKeditor/trunk/_whatsnew.html

@@ -91 +91 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1383">#1383</a>] Fixed an IE issue where 
                         pressing backspace may merge a hyperlink on the previous line with the text on the current line.</li> 
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1691">#1691</a>] Creation of links in Safari
+                        failed if there was no selection.</li>
         </ul>
         <h3>