Ticket #7616: ckeditor-7616.patch
File ckeditor-7616.patch, 2.4 KB (added by , 13 years ago) |
---|
-
_source/plugins/filebrowser/plugin.js
1 /*1 /* 2 2 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. 3 3 For licensing, see LICENSE.html or http://ckeditor.com/license 4 4 */ … … 174 174 params.langCode = editor.langCode; 175 175 176 176 var url = addQueryString( this.filebrowser.url, params ); 177 editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures 177 editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures, editor.config.filebrowserWindowName); 178 178 } 179 179 180 180 /* … … 502 502 */ 503 503 504 504 /** 505 * The windowName to use in the file browser popup window. 506 * @name CKEDITOR.config.filebrowserWindowName 507 * @since 3.5.4 508 * @type String 509 * @example 510 * config.filebrowserWindowName = 'CKEditorFileBrowser'; 511 */ 512 513 /** 505 514 * The width of the file browser popup window. It can be a number or a percent string. 506 515 * @name CKEDITOR.config.filebrowserWindowWidth 507 516 * @type Number|String -
_source/plugins/popup/plugin.js
1 /*1 /* 2 2 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. 3 3 For licensing, see LICENSE.html or http://ckeditor.com/license 4 4 */ … … 14 14 * @param {String} width Popup window width. 15 15 * @param {String} height Popup window height. 16 16 * @param {String} options Popup window features. 17 * @param {String} windowName Popup window name. 17 18 */ 18 popup : function( url, width, height, options )19 popup : function( url, width, height, options, windowName ) 19 20 { 20 21 width = width || '80%'; 21 22 height = height || '70%'; … … 41 42 ',top=' + top + 42 43 ',left=' + left; 43 44 44 var popupWindow = window.open( '', null, options, true );45 var popupWindow = window.open( '', windowName, options, true ); 45 46 46 47 // Blocked by a popup blocker. 47 48 if ( !popupWindow ) … … 56 57 } 57 58 catch ( e ) 58 59 { 59 popupWindow = window.open( url, null, options, true );60 popupWindow = window.open( url, windowName, options, true ); 60 61 } 61 62 62 63 return true;