Ticket #7616: ckeditor-7616.patch

File ckeditor-7616.patch, 2.4 KB (added by Sergiy Shyrkov, 10 years ago)

Attached the patch (ckeditor-7616.patch) against current trunk (last revision was 6829)

  • _source/plugins/filebrowser/plugin.js

     
    1 /*
     1/*
    22Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
    33For licensing, see LICENSE.html or http://ckeditor.com/license
    44*/
     
    174174                        params.langCode = editor.langCode;
    175175
    176176                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);
    178178        }
    179179
    180180        /*
     
    502502 */
    503503
    504504/**
     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/**
    505514 * The width of the file browser popup window. It can be a number or a percent string.
    506515 * @name CKEDITOR.config.filebrowserWindowWidth
    507516 * @type Number|String
  • _source/plugins/popup/plugin.js

     
    1 /*
     1/*
    22Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
    33For licensing, see LICENSE.html or http://ckeditor.com/license
    44*/
     
    1414         * @param {String} width Popup window width.
    1515         * @param {String} height Popup window height.
    1616         * @param {String} options Popup window features.
     17         * @param {String} windowName Popup window name.
    1718         */
    18         popup : function( url, width, height, options )
     19        popup : function( url, width, height, options, windowName )
    1920        {
    2021                width = width || '80%';
    2122                height = height || '70%';
     
    4142                        ',top='  + top +
    4243                        ',left=' + left;
    4344
    44                 var popupWindow = window.open( '', null, options, true );
     45                var popupWindow = window.open( '', windowName, options, true );
    4546
    4647                // Blocked by a popup blocker.
    4748                if ( !popupWindow )
     
    5657                }
    5758                catch ( e )
    5859                {
    59                         popupWindow = window.open( url, null, options, true );
     60                        popupWindow = window.open( url, windowName, options, true );
    6061                }
    6162
    6263                return true;
© 2003 – 2021 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy