Merge branch 't/8916'

ckeditor · Sep 6, 2012 · 18c156a · 18c156a
2 parents fd028cc + 62a3b8b
commit 18c156a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/core/dom/elementpath.js b/core/dom/elementpath.js
@@ -141,7 +141,7 @@ CKEDITOR.dom.elementPath.prototype = {
 			};
 		else if ( CKEDITOR.tools.isArray( query ) )
 			evaluator = function( node ) {
-				query.indexOf( node.getName() ) > -1;
+				return query.indexOf( node.getName() ) > -1;
 			};
 		else if ( typeof query == 'function' )
 			evaluator = query;

diff --git a/core/editable.js b/core/editable.js
@@ -528,7 +528,16 @@
 
 								evt.data.preventDefault();
 							}
-
+							// BACKSPACE/DEL pressed at the start/end of table cell.
+							else if ( ( parent = path.contains( [ 'td', 'th', 'caption' ] ) ) &&
+								      range.checkBoundaryOfElement( parent, rtl ? CKEDITOR.START : CKEDITOR.END ) ) {
+								next = parent[ rtl ? 'getPreviousSourceNode' : 'getNextSourceNode' ]( 1, CKEDITOR.NODE_ELEMENT );
+								if ( next && !next.isReadOnly() && range.root.contains( next ) ) {
+									range[ rtl ? 'moveToElementEditEnd' : 'moveToElementEditStart' ]( next );
+									range.select();
+									evt.data.preventDefault();
+								}
+							}
 						}
 
 					}