Changeset 1062

Timestamp:

2007-11-03 11:59:38 (2 years ago)

Author:

alfonsoml

Message:

Fix for #1496. Improve the handling of image map areas.

Location:

FCKeditor/trunk/editor/_source/internals

Files:

• fck.js (modified) (1 diff)
• fckregexlib.js (modified) (1 diff)
• fckxhtml_ie.js (modified) (2 diffs)
• fckxhtml.js (modified) (1 diff)

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

@@ -287 +287 @@
                 html = html.replace( FCKRegexLib.ProtectUrlsImg , '$& _fcksavedurl=$1' ) ;
 
+                // <AREA> href
+                html = html.replace( FCKRegexLib.ProtectUrlsArea        , '$& _fcksavedurl=$1' ) ;
+
                 return html ;
         },

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

@@ -75 +75 @@
 ProtectUrlsImg  : /<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 ProtectUrlsA    : /<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectUrlsArea : /<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 
 Html4DocType    : /HTML 4\.0 Transitional/i ,

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

@@ -139 +139 @@
 }
 
-// IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually.
-FCKXHtml.TagProcessors['area'] = function( node, htmlNode )
-{
-        if ( ! node.attributes.getNamedItem( 'coords' ) )
-        {
-                var sCoords = htmlNode.getAttribute( 'coords', 2 ) ;
-                if ( sCoords && sCoords != '0,0,0' )
-                        FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ;
-        }
-
-        if ( ! node.attributes.getNamedItem( 'shape' ) )
-        {
-                var sShape = htmlNode.getAttribute( 'shape', 2 ) ;
-                if ( sShape && sShape.length > 0 )
-                        FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ;
-        }
-
-        return node ;
-}
-
 FCKXHtml.TagProcessors['label'] = function( node, htmlNode )
 {
@@ -207 +187 @@
         return node ;
 }
+
+// Fix behavior for IE, it doesn't read back the .name on newly created maps 
+FCKXHtml.TagProcessors['map'] = function( node, htmlNode )
+{
+        if ( ! node.attributes.getNamedItem( 'name' ) )
+        {
+                var name = htmlNode.name ;
+                if ( name )
+                        FCKXHtml._AppendAttribute( node, 'name', name ) ;
+        }
+
+        node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+        return node ;
+}

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

@@ -453 +453 @@
                 node.removeAttribute( 'spellcheck' ) ;
                 return node ;
-        }
+        },
+
+        area : function( node, htmlNode )
+        {
+                var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+                if ( sSavedUrl != null )
+                        FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ;
+
+                // IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually.
+                if ( FCKBrowserInfo.IsIE )
+                {
+                        if ( ! node.attributes.getNamedItem( 'coords' ) )
+                        {
+                                var sCoords = htmlNode.getAttribute( 'coords', 2 ) ;
+                                if ( sCoords && sCoords != '0,0,0' )
+                                        FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ;
+                        }
+
+                        if ( ! node.attributes.getNamedItem( 'shape' ) )
+                        {
+                                var sShape = htmlNode.getAttribute( 'shape', 2 ) ;
+                                if ( sShape && sShape.length > 0 )
+                                        FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ;
+                        }
+                }
+
+                return node ;
+        }
+
 } ;