Ticket #1948: 1948.patch
File 1948.patch, 2.0 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
108 108 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1832">#1832</a>] Calling 109 109 FCK.InsertHtml() in non-IE browsers would now activate the document processor 110 110 as expected.</li> 111 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1948">#1948</a>] Some 112 CSS rules are reset to dialog elements to avoid conflict with the page CSS.</li> 111 113 </ul> 112 114 <h3> 113 115 Version 2.6 Beta 1</h3> -
editor/_source/internals/fckdialog.js
74 74 topDocument.scrollHeight || 0 ) - 1 + 'px' 75 75 } ) ; 76 76 } 77 78 var resetStyles = function( element ) 79 { 80 element.style.cssText = 'margin:0;' + 81 'padding:0;' + 82 'border:0;' + 83 'background-color:transparent;' + 84 'background-image:none;' ; 85 } 77 86 78 87 return { 79 88 SelectionData : null, … … 138 147 139 148 // Setup the IFRAME that will hold the dialog. 140 149 var dialog = topDocument.createElement( 'iframe' ) ; 150 resetStyles( dialog ) ; 141 151 dialog.src = FCKConfig.BasePath + 'fckdialog.html' ; 142 152 143 153 // Dummy URL for testing whether the code in fckdialog.js alone leaks memory. … … 201 211 { 202 212 // Setup the DIV that will be used to cover. 203 213 cover = topDocument.createElement( 'div' ) ; 214 resetStyles( cover ) ; 204 215 FCKDomTools.SetElementStyles( cover, 205 216 { 206 217 'position' : 'absolute', … … 216 227 if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 ) 217 228 { 218 229 var iframe = topDocument.createElement( 'iframe' ) ; 230 resetStyles( iframe ) ; 219 231 iframe.hideFocus = true ; 220 232 iframe.frameBorder = 0 ; 221 233 iframe.src = FCKTools.GetVoidUrl() ;