Changeset 332

Timestamp:

2007-05-29 11:03:38 (17 months ago)

Author:

fredck

Message:

Fixed #520 : The "Select Field" properties dialog was not correctly handling select options with &, < and >.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_select/fck_select.js (modified) (3 diffs)
• editor/dialog/fck_select.html (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/dialog/fck_select/fck_select.js

@@ -62 +62 @@
         var oTxtValue   = document.getElementById( "txtValue" ) ;
 
-        oListText.options[ iIndex ].innerHTML   = oTxtText.value ;
+        oListText.options[ iIndex ].innerHTML   = HTMLEncode( oTxtText.value ) ;
         oListText.options[ iIndex ].value               = oTxtText.value ;
 
-        oListValue.options[ iIndex ].innerHTML  = oTxtValue.value ;
+        oListValue.options[ iIndex ].innerHTML  = HTMLEncode( oTxtValue.value ) ;
         oListValue.options[ iIndex ].value              = oTxtValue.value ;
 
@@ -116 +116 @@
 
         var oOption = combo.options[ iActualIndex ] ;
-        var sText       = oOption.innerHTML ;
+        var sText       = HTMLDecode( oOption.innerHTML ) ;
         var sValue      = oOption.value ;
 
@@ -163 +163 @@
                 combo.options.add( oOption ) ;
 
-        oOption.innerHTML = optionText.length > 0 ? optionText : ' ' ;
+        oOption.innerHTML = optionText.length > 0 ? HTMLEncode( optionText ) : ' ' ;
         oOption.value     = optionValue ;
 
         return oOption ;
 }
+
+function HTMLEncode( text )
+{
+        if ( !text )
+                return '' ;
+
+        text = text.replace( /&/g, '&' ) ;
+        text = text.replace( /</g, '&lt;' ) ;
+        text = text.replace( />/g, '&gt;' ) ;
+
+        return text ;
+}
+
+
+function HTMLDecode( text )
+{
+        if ( !text )
+                return '' ;
+
+        text = text.replace( /&gt;/g, '>' ) ;
+        text = text.replace( /&lt;/g, '<' ) ;
+        text = text.replace( /&amp;/g, '&' ) ;
+
+        return text ;
+}

FCKeditor/trunk/editor/dialog/fck_select.html

@@ -59 +59 @@
                 for ( var i = 0 ; i < oActiveEl.options.length ; i++ )
                 {
-                        var sText       = oActiveEl.options[i].innerHTML ;
+                        var sText       = HTMLDecode( oActiveEl.options[i].innerHTML ) ;
                         var sValue      = oActiveEl.options[i].value ;
 

FCKeditor/trunk/_whatsnew.html

@@ -108 +108 @@
                         form had a button named "submit" the "Save" command didn't work in Firefox.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/414">#414</a>] If tracing was 
-                globally enabled in Asp.net 2 then the Asp.Net connector did fail.</li>
+                globally enabled in Asp.Net 2.0 then the Asp.Net connector did fail.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/520">#520</a>] The "Select
+                        Field" properties dialog was not correctly handling select options with &amp;, &lt;
+                        and &gt;.</li>
         </ul>
         <h3>