Ticket #4058: 4058_2.patch
File 4058_2.patch, 2.8 KB (added by , 15 years ago) |
---|
-
_source/plugins/wysiwygarea/plugin.js
216 216 iframe, 217 217 isLoadingData, 218 218 isPendingFocus, 219 frameLoaded, 219 220 fireMode; 220 221 221 222 // Support for custom document.domain in IE. … … 229 230 if ( fieldset ) 230 231 fieldset.remove(); 231 232 233 frameLoaded = 0; 232 234 // The document domain must be set within the src 233 235 // attribute; 234 236 // Defer the script execution until iframe … … 262 264 263 265 if ( CKEDITOR.env.gecko ) 264 266 { 267 // Double checking the iframe will be loaded properly(#4058). 268 iframe.on( 'load', function( ev ) 269 { 270 ev.removeListener(); 271 contentDomReady( iframe.$.contentWindow ); 272 } ); 273 265 274 // Accessibility attributes for Firefox. 266 275 mainElement.setAttributes( 267 276 { … … 307 316 '<script id="cke_actscrpt" type="text/javascript">' + 308 317 'window.onload = function()' + 309 318 '{' + 310 // Remove this script from the DOM.311 'var s = document.getElementById( "cke_actscrpt" );' +312 's.parentNode.removeChild( s );' +313 314 319 // Call the temporary function for the editing 315 320 // boostrap. 316 321 'window.parent.CKEDITOR._["contentDomReady' + editor.name + '"]( window );' + … … 320 325 // Editing area bootstrap code. 321 326 var contentDomReady = function( domWindow ) 322 327 { 323 delete CKEDITOR._[ 'contentDomReady' + editor.name ]; 328 if ( frameLoaded ) 329 return; 330 else 331 frameLoaded = 1; 324 332 325 333 var domDocument = domWindow.document, 326 334 body = domDocument.body; 327 335 336 // Remove this script from the DOM. 337 var script = domDocument.getElementById( "cke_actscrpt" ); 338 script.parentNode.removeChild( script ); 339 340 delete CKEDITOR._[ 'contentDomReady' + editor.name ]; 341 328 342 body.spellcheck = !editor.config.disableNativeSpellChecker; 329 343 330 344 if ( CKEDITOR.env.ie ) -
CHANGES.html
197 197 <li><a href="http://dev.fckeditor.net/ticket/3622">#3622</a> : The toolbar in the v2 198 198 skin was wrapping improperly in some languages.</li> 199 199 <li><a href="http://dev.fckeditor.net/ticket/4119">#4119</a> : Unable to edit image link with image dialog.</li> 200 <li><a href="http://dev.fckeditor.net/ticket/4058">#4058</a> : [FF3.5] wysiwyg mode is sometimes not been activated.</li> 200 201 </ul> 201 202 <h3> 202 203 CKEditor 3.0 RC</h3>