vanilla ckeditor-3.6.3

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

diff --git a/_source/plugins/resize/plugin.js b/_source/plugins/resize/plugin.js
index 24ba09c..3fbec77 100644 (file)
--- a/_source/plugins/resize/plugin.js
+++ b/_source/plugins/resize/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -44,7 +44,8 @@ CKEDITOR.plugins.add( 'resize',
                                if ( resizeVertical )\r
                                        height =  Math.max( config.resize_minHeight, Math.min( internalHeight, config.resize_maxHeight ) );\r
 \r
-                               editor.resize( width, height );\r
+                               // DO NOT impose fixed size with single direction resize. (#6308)\r
+                               editor.resize( resizeHorizontal ? width : null, height );\r
                        }\r
 \r
                        function dragEndHandler ( evt )\r
@@ -110,8 +111,8 @@ CKEDITOR.plugins.add( 'resize',
 } );\r
 \r
 /**\r
- * The minimum editor width, in pixels, when resizing it with the resize handle.\r
- * Note: It fallbacks to editor's actual width if that's smaller than the default value.\r
+ * The minimum editor width, in pixels, when resizing the editor interface by using the resize handle.\r
+ * Note: It falls back to editor's actual width if it is smaller than the default value.\r
  * @name CKEDITOR.config.resize_minWidth\r
  * @type Number\r
  * @default 750\r
@@ -120,8 +121,8 @@ CKEDITOR.plugins.add( 'resize',
  */\r
 \r
 /**\r
- * The minimum editor height, in pixels, when resizing it with the resize handle.\r
- * Note: It fallbacks to editor's actual height if that's smaller than the default value.\r
+ * The minimum editor height, in pixels, when resizing the editor interface by using the resize handle.\r
+ * Note: It falls back to editor's actual height if it is smaller than the default value.\r
  * @name CKEDITOR.config.resize_minHeight\r
  * @type Number\r
  * @default 250\r
@@ -130,7 +131,7 @@ CKEDITOR.plugins.add( 'resize',
  */\r
 \r
 /**\r
- * The maximum editor width, in pixels, when resizing it with the resize handle.\r
+ * The maximum editor width, in pixels, when resizing the editor interface by using the resize handle.\r
  * @name CKEDITOR.config.resize_maxWidth\r
  * @type Number\r
  * @default 3000\r
@@ -139,7 +140,7 @@ CKEDITOR.plugins.add( 'resize',
  */\r
 \r
 /**\r
- * The maximum editor height, in pixels, when resizing it with the resize handle.\r
+ * The maximum editor height, in pixels, when resizing the editor interface by using the resize handle.\r
  * @name CKEDITOR.config.resize_maxHeight\r
  * @type Number\r
  * @default 3000\r
@@ -148,7 +149,7 @@ CKEDITOR.plugins.add( 'resize',
  */\r
 \r
 /**\r
- * Whether to enable the resizing feature. If disabled the resize handler will not be visible.\r
+ * Whether to enable the resizing feature. If this feature is disabled, the resize handle will not be visible.\r
  * @name CKEDITOR.config.resize_enabled\r
  * @type Boolean\r
  * @default true\r
@@ -157,8 +158,8 @@ CKEDITOR.plugins.add( 'resize',
  */\r
 \r
 /**\r
- * The directions to which the editor resizing is enabled. Possible values\r
- * are "both", "vertical" and "horizontal".\r
+ * The dimensions for which the editor resizing is enabled. Possible values\r
+ * are <code>both</code>, <code>vertical</code>, and <code>horizontal</code>.\r
  * @name CKEDITOR.config.resize_dir\r
  * @type String\r
  * @default 'both'\r