Merge branch 't/10339'

ckeditor · May 28, 2013 · 7a702d8 · 7a702d8
2 parents 030ede2 + 1e8cd57
commit 7a702d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,7 @@ CKEditor 4 Changelog
 
 * [#10389](http://dev.ckeditor.com/ticket/10389): Invalid closing tag </tr> in a sample "Text and Table" template.
 * [#9761](http://dev.ckeditor.com/ticket/9761): Update BACKSPACE key state in blockedKeystrokes when using editor.setReadOnly().
+* [#10339](http://dev.ckeditor.com/ticket/10339): Error thrown when inserting custom element.
 
 ## CKEditor 4.1.1
 

diff --git a/core/editable.js b/core/editable.js
@@ -1009,9 +1009,9 @@
 			// DATA PROCESSING
 
 			// Select range and stop execution.
-			if ( data ) {
-				processDataForInsertion( that, data );
-
+			// If data has been totally emptied after the filtering,
+			// any insertion is pointless (#10339).
+			if ( data && processDataForInsertion( that, data ) ) {
 				// DATA INSERTION
 				insertDataIntoRange( that );
 			}
@@ -1153,6 +1153,8 @@
 			}
 
 			that.dataWrapper = wrapper;
+
+			return data;
 		}
 
 		function insertDataIntoRange( that ) {