Ticket #5689: 5689.patch
File 5689.patch, 1.3 KB (added by , 14 years ago) |
---|
-
_source/core/env.js
75 75 76 76 isCustomDomain : function() 77 77 { 78 if ( !this.ie ) 79 return false; 80 78 81 var domain = document.domain, 79 82 hostname = window.location.hostname; 80 83 81 return this.ie &&84 return 82 85 domain != hostname && 83 86 domain != ( '[' + hostname + ']' ); // IPv6 IP support (#5434) 84 87 } -
_source/plugins/wysiwygarea/plugin.js
323 323 ' allowTransparency="true"' + 324 324 '></iframe>' ); 325 325 326 // #5689 327 if (document.location.protocol == 'chrome:') CKEDITOR.event.useCapture = true; 328 326 329 // With FF, it's better to load the data on iframe.load. (#3894,#4058) 327 330 iframe.on( 'load', function( ev ) 328 331 { … … 337 340 doc.close(); 338 341 }); 339 342 343 // #5689 344 if (document.location.protocol == 'chrome:') CKEDITOR.event.useCapture = false; 345 340 346 mainElement.append( iframe ); 341 347 }; 342 348