Changeset 1689

Timestamp:

03/13/08 11:24:40 (5 years ago)

Author:

martinkou

Message:

Fixed #1920 : Fixed SSL warning message when opening image and flash dialogs under HTTPS in IE6.

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/dialog/fck_flash.html (modified) (1 diff)
• editor/dialog/fck_image.html (modified) (1 diff)
• editor/dialog/fck_image/fck_image_preview.html (modified) (1 diff)

FCKeditor/trunk/_whatsnew.html

@@ -59 +59 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1934">#1934</a>] Fixed
                         JavaScript errors when calling Selection.EnsureSelection() in dialogs.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1920">#1920</a>] Fixed SSL
+                        warning message when opening image and flash dialogs under HTTPS in IE6.</li>
         </ul>
         <h3>

FCKeditor/trunk/editor/dialog/fck_flash.html

@@ -97 +97 @@
                                 <br />
                                 <input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
-                                <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
+                                <script type="text/javascript">
+                                        document.write( '<iframe name="UploadWindow" style="DISPLAY: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
+                                </script>
                         </form>
                 </div>

FCKeditor/trunk/editor/dialog/fck_image.html

@@ -165 +165 @@
                         <br />
                         <input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
-                        <iframe name="UploadWindow" style="display: none" src="javascript:void(0)"></iframe>
+                        <script type="text/javascript">
+                                document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
+                        </script>
                 </form>
         </div>

FCKeditor/trunk/editor/dialog/fck_image/fck_image_preview.html

@@ -54 +54 @@
         <div>
                 <a id="lnkPreview" onclick="return false;" style="cursor: default">
-                        <img id="imgPreview" src="javascript:void(0)" onload="window.parent.UpdateOriginal();"
+                        <img id="imgPreview" onload="window.parent.UpdateOriginal();"
                                 style="display: none" alt="" /></a>Lorem ipsum dolor sit amet, consectetuer adipiscing
                 elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus