Changeset 210

Timestamp:

2007-03-14 14:22:47 (3 years ago)

Author:

fredck

Message:

Fixed #209 : Links and images URLs will now be correctly preserved with Netscape 7.1.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck.js (modified) (1 diff)
• editor/_source/internals/fckregexlib.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -266 +266 @@
         {
                 // <A> href
-                html = html.replace( FCKRegexLib.ProtectUrlsA   , '$1$4$2$3$5$2 _fcksavedurl=$2$3$5$2' ) ;
+                html = html.replace( FCKRegexLib.ProtectUrlsA   , '$& _fcksavedurl=$1' ) ;
 
                 // <IMG> src
-                html = html.replace( FCKRegexLib.ProtectUrlsImg , '$1$4$2$3$5$2 _fcksavedurl=$2$3$5$2' ) ;
+                html = html.replace( FCKRegexLib.ProtectUrlsImg , '$& _fcksavedurl=$1' ) ;
 
                 return html ;

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

@@ -76 +76 @@
 // them. We have to do all in one, otherwhise we will have problems with URLs
 // like "thumbnail.php?src=someimage.jpg" (SF-BUG 1554141).
-ProtectUrlsImg  : /(?:(<img(?=\s).*?\ssrc=)("|')(.*?)\2)|(?:(<img\s.*?src=)([^"'][^ >]+))/gi ,
-ProtectUrlsA    : /(?:(<a(?=\s).*?\shref=)("|')(.*?)\2)|(?:(<a\s.*?href=)([^"'][^ >]+))/gi ,
+ProtectUrlsImg  : /<img(?=\s).*?\ssrc=((?:("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectUrlsA    : /<a(?=\s).*?\shref=((?:("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 
 Html4DocType    : /HTML 4\.0 Transitional/i ,

FCKeditor/trunk/_whatsnew.html

@@ -111 +111 @@
                         is set to a block tag (p or div), the desired block creation in now enforced, instead
                         of copying the current block (which is still the behavior of the simple enter).</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/209">#209</a>] Links and
+                        images URLs will now be correctly preserved with Netscape 7.1.</li>
         </ul>
         <h3>