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 9f824b0..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