X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Ftabletools%2Fplugin.js;h=520e11d11f2c870a7299ab0f5d518306e2635b98;hp=3c4fd01c3e453f15243129669e69133593010098;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hpb=6e682412d5cc0dfaedb376482e585bf2989c6863 diff --git a/_source/plugins/tabletools/plugin.js b/_source/plugins/tabletools/plugin.js index 3c4fd01..520e11d 100644 --- a/_source/plugins/tabletools/plugin.js +++ b/_source/plugins/tabletools/plugin.js @@ -275,15 +275,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { cloneCol.push( map[ i ][ colIndex ] ); var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ]; - nextCell && nextCol.push( nextCell ); + nextCol.push( nextCell ); } for ( i = 0; i < height; i++ ) { var cell; + + if ( !cloneCol[ i ] ) + continue; + // Check whether there's a spanning column here, do not break it. if ( cloneCol[ i ].colSpan > 1 - && nextCol.length && nextCol[ i ] == cloneCol[ i ] ) { cell = cloneCol[ i ]; @@ -771,7 +774,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license CKEDITOR.plugins.tabletools = { - requires : [ 'table', 'dialog', 'contextmenu' ], + requires : [ 'table', 'dialog' ], init : function( editor ) {