Ticket #7616: ckeditor-7616.patch

_source/plugins/filebrowser/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -174 +174 @@
                         params.langCode = editor.langCode;
 
                 var url = addQueryString( this.filebrowser.url, params );
-                editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures );
+                editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures, editor.config.filebrowserWindowName);
         }
 
         /*
@@ -502 +502 @@
  */
 
 /**
+ * The windowName to use in the file browser popup window.
+ * @name CKEDITOR.config.filebrowserWindowName
+ * @since 3.5.4
+ * @type String
+ * @example
+ * config.filebrowserWindowName = 'CKEditorFileBrowser';
+ */
+
+/**
  * The width of the file browser popup window. It can be a number or a percent string.
  * @name CKEDITOR.config.filebrowserWindowWidth
  * @type Number|String

_source/plugins/popup/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -14 +14 @@
          * @param {String} width Popup window width.
          * @param {String} height Popup window height.
          * @param {String} options Popup window features.
+         * @param {String} windowName Popup window name.
          */
-        popup : function( url, width, height, options )
+        popup : function( url, width, height, options, windowName )
         {
                 width = width || '80%';
                 height = height || '70%';
@@ -41 +42 @@
                         ',top='  + top +
                         ',left=' + left;
 
-                var popupWindow = window.open( '', null, options, true );
+                var popupWindow = window.open( '', windowName, options, true );
 
                 // Blocked by a popup blocker.
                 if ( !popupWindow )
@@ -56 +57 @@
                 }
                 catch ( e )
                 {
-                        popupWindow = window.open( url, null, options, true );
+                        popupWindow = window.open( url, windowName, options, true );
                 }
 
                 return true;