Ticket #3370: 3370.patch

_source/plugins/clipboard/dialogs/paste.js

@@ -5 +5 @@
 
 CKEDITOR.dialog.add( 'paste', function( editor )
 {
-        var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
+        var isCustomDomain = CKEDITOR.env.isCustomDomain();
 
         return {
                 title : editor.lang.clipboard.title,

_source/plugins/dialogui/plugin.js

@@ -597 +597 @@
                                         _.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';
 
                                         // Support for custom document.domain in IE.
-                                        var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
+                                        var isCustomDomain = CKEDITOR.env.isCustomDomain();
 
                                         var html = [
                                                 '<iframe' +

_source/plugins/preview/plugin.js

@@ -16 +16 @@
                 exec : function( editor )
                 {
                         var sHTML,
-                                isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
+                                isCustomDomain = CKEDITOR.env.isCustomDomain();
                         if ( editor.config.fullPage )
                                 sHTML = editor.getData();
                         else

_source/plugins/pastefromword/dialogs/pastefromword.js

@@ -193 +193 @@
                         if ( CKEDITOR.env.ie )
                                 container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' );
 
-                        var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
-                        if ( isCustomDomain )
+                        if ( CKEDITOR.env.isCustomDomain() )
                         {
                                 CKEDITOR._cke_htmlToLoad = this.definition.htmlToLoad;
                                 iframe.setAttribute( 'src',

CHANGES.html

@@ -47 +47 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3898">#3898</a> : Added validation for URL presentance in Image dialog.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3528">#3528</a> : Fixed Context Menu issue when triggered using Shift+F10.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4028">#4028</a> : Maximize control's tool tip was wrong once it is maximized.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3370">#3370</a> : Refactored use of CKEDITOR.env.isCustomDomain().</li>
         </ul>
         <h3>
                 CKEditor 3.0</h3>