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
[ckeditor.git]
/
_source
/
plugins
/
tabletools
/
plugin.js
diff --git
a/_source/plugins/tabletools/plugin.js
b/_source/plugins/tabletools/plugin.js
index
3c4fd01
..
05b5e13
100644
(file)
--- a/
_source/plugins/tabletools/plugin.js
+++ b/
_source/plugins/tabletools/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2012, 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
@@
-275,15
+275,18
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
{
\r
cloneCol.push( map[ i ][ colIndex ] );
\r
var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ];
\r
{
\r
cloneCol.push( map[ i ][ colIndex ] );
\r
var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ];
\r
- nextCell && nextCol.push( nextCell );
\r
+ nextCol.push( nextCell );
\r
}
\r
\r
for ( i = 0; i < height; i++ )
\r
{
\r
var cell;
\r
}
\r
\r
for ( i = 0; i < height; i++ )
\r
{
\r
var cell;
\r
+
\r
+ if ( !cloneCol[ i ] )
\r
+ continue;
\r
+
\r
// Check whether there's a spanning column here, do not break it.
\r
if ( cloneCol[ i ].colSpan > 1
\r
// Check whether there's a spanning column here, do not break it.
\r
if ( cloneCol[ i ].colSpan > 1
\r
- && nextCol.length
\r
&& nextCol[ i ] == cloneCol[ i ] )
\r
{
\r
cell = cloneCol[ i ];
\r
&& nextCol[ i ] == cloneCol[ i ] )
\r
{
\r
cell = cloneCol[ i ];
\r
@@
-771,7
+774,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
CKEDITOR.plugins.tabletools =
\r
{
\r
\r
CKEDITOR.plugins.tabletools =
\r
{
\r
- requires : [ 'table', 'dialog', 'contextmenu' ],
\r
+ requires : [ 'table', 'dialog' ],
\r
\r
init : function( editor )
\r
{
\r
\r
init : function( editor )
\r
{
\r