vanilla ckeditor-3.5.3

[ckeditor.git] / _source / plugins / filebrowser / plugin.js

diff --git a/_source/plugins/filebrowser/plugin.js b/_source/plugins/filebrowser/plugin.js
index e81baa8..799d68f 100644 (file)
--- a/_source/plugins/filebrowser/plugin.js
+++ b/_source/plugins/filebrowser/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -112,7 +112,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  */\r
 ( function()\r
 {\r
-       /**\r
+       /*\r
         * Adds (additional) arguments to given url.\r
         *\r
         * @param {String}\r
@@ -135,7 +135,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                return url + ( ( url.indexOf( "?" ) != -1 ) ? "&" : "?" ) + queryString.join( "&" );\r
        }\r
 \r
-       /**\r
+       /*\r
         * Make a string's first character uppercase.\r
         *\r
         * @param {String}\r
@@ -148,7 +148,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                return f + str.substr( 1 );\r
        }\r
 \r
-       /**\r
+       /*\r
         * The onlick function assigned to the 'Browse Server' button. Opens the\r
         * file browser and updates target field when file is selected.\r
         *\r
@@ -177,7 +177,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures );\r
        }\r
 \r
-       /**\r
+       /*\r
         * The onlick function assigned to the 'Upload' button. Makes the final\r
         * decision whether form is really submitted and updates target field when\r
         * file is uploaded.\r
@@ -202,7 +202,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                return true;\r
        }\r
 \r
-       /**\r
+       /*\r
         * Setups the file element.\r
         *\r
         * @param {CKEDITOR.ui.dialog.file}\r
@@ -223,16 +223,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                fileInput.filebrowser = filebrowser;\r
        }\r
 \r
-       /**\r
+       /*\r
         * Traverse through the content definition and attach filebrowser to\r
         * elements with 'filebrowser' attribute.\r
         *\r
         * @param String\r
         *            dialogName Dialog name.\r
-        * @param {CKEDITOR.dialog.dialogDefinitionObject}\r
+        * @param {CKEDITOR.dialog.definitionObject}\r
         *            definition Dialog definition.\r
         * @param {Array}\r
-        *            elements Array of {@link CKEDITOR.dialog.contentDefinition}\r
+        *            elements Array of {@link CKEDITOR.dialog.definition.content}\r
         *            objects.\r
         */\r
        function attachFileBrowser( editor, dialogName, definition, elements )\r
@@ -308,7 +308,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                }\r
        }\r
 \r
-       /**\r
+       /*\r
         * Updates the target element with the url of uploaded/selected file.\r
         *\r
         * @param {String}\r
@@ -333,10 +333,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                }\r
        }\r
 \r
-       /**\r
+       /*\r
         * Returns true if filebrowser is configured in one of the elements.\r
         *\r
-        * @param {CKEDITOR.dialog.dialogDefinitionObject}\r
+        * @param {CKEDITOR.dialog.definitionObject}\r
         *            definition Dialog definition.\r
         * @param String\r
         *            tabId The tab id where element(s) can be found.\r
@@ -388,6 +388,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                init : function( editor, pluginPath )\r
                {\r
                        editor._.filebrowserFn = CKEDITOR.tools.addFunction( setUrl, editor );\r
+                       editor.on( 'destroy', function () { CKEDITOR.tools.removeFunction( this._.filebrowserFn ); } );\r
                }\r
        } );\r
 \r
@@ -499,3 +500,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example\r
  * config.filebrowserWindowFeatures = 'resizable=yes,scrollbars=no';\r
  */\r
+\r
+/**\r
+ * The width of the file browser popup window. It can be a number or a percent string.\r
+ * @name CKEDITOR.config.filebrowserWindowWidth\r
+ * @type Number|String\r
+ * @default '80%'\r
+ * @example\r
+ * config.filebrowserWindowWidth = 750;\r
+ * @example\r
+ * config.filebrowserWindowWidth = '50%';\r
+ */\r
+\r
+/**\r
+ * The height of the file browser popup window. It can be a number or a percent string.\r
+ * @name CKEDITOR.config.filebrowserWindowHeight\r
+ * @type Number|String\r
+ * @default '70%'\r
+ * @example\r
+ * config.filebrowserWindowHeight = 580;\r
+ * @example\r
+ * config.filebrowserWindowHeight = '50%';\r
+ */\r