Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.6.1
[ckeditor.git]
/
_source
/
plugins
/
resize
/
plugin.js
diff --git
a/_source/plugins/resize/plugin.js
b/_source/plugins/resize/plugin.js
index
9f824b0
..
db4651e
100644
(file)
--- a/
_source/plugins/resize/plugin.js
+++ b/
_source/plugins/resize/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\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
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
}
\r
\r
function dragEndHandler ( evt )
\r