X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fresize%2Fplugin.js;h=3fbec77c64201da06be73542e0a780bb814d00e7;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=24ba09ca7361d41b650616d700ea89d78eda595b;hpb=4e90e78dc97789709ee7404359a5517540c27553;p=ckeditor.git

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