vanilla ckeditor-3.6.5

[ckeditor.git] / _source / plugins / tabletools / plugin.js

diff --git a/_source/plugins/tabletools/plugin.js b/_source/plugins/tabletools/plugin.js
index 3c4fd01..520e11d 100644 (file)
--- 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
                {\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
+                       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
-                               && nextCol.length\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
-               requires : [ 'table', 'dialog', 'contextmenu' ],\r
+               requires : [ 'table', 'dialog' ],\r
 \r
                init : function( editor )\r
                {\r