Ticket #5308: 5308_4.patch

_source/plugins/filebrowser/plugin.js

@@ -174 +174 @@
                         params.langCode = editor.langCode;
 
                 var url = addQueryString( this.filebrowser.url, params );
-                editor.popup( url, width, height );
+                editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures );
         }
 
         /**
@@ -479 +479 @@
  * @example
  * config.filebrowserImageBrowseLinkUrl = '/browser/browse.php';
  */
+
+/**
+ * The "features" to use in the file browser popup window.
+ * @name CKEDITOR.config.filebrowserWindowFeatures
+ * @since 3.4.1
+ * @type String
+ * @default 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes'
+ * @example
+ * config.filebrowserWindowFeatures = 'resizable=yes,scrollbars=no';
+ */

_source/plugins/popup/plugin.js

@@ -3 +3 @@
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
-CKEDITOR.plugins.add( 'popup');
+CKEDITOR.plugins.add( 'popup' );
 
 CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 {
@@ -13 +13 @@
          * @param {String} url The url of the external file browser.
          * @param {String} width Popup window width.
          * @param {String} height Popup window height.
+         * @param {String} options Popup window features.
          */
-        popup : function( url, width, height )
+        popup : function( url, width, height, options )
         {
                 width = width || '80%';
                 height = height || '70%';
@@ -33 +34 @@
 
                 var top = parseInt( ( window.screen.height - height ) / 2, 10 ),
                         left = parseInt( ( window.screen.width  - width ) / 2, 10 ),
-                        options = 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes' +
+                        options = ( options || 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes' ) +
                         ',width='  + width +
                         ',height=' + height +
                         ',top='  + top +
@@ -57 +58 @@
                         popupWindow = window.open( url, null, options, true );
                 }
 
-                return true ;
+                return true;
         }
 });