Merge branch 't/11124b' into major

ckeditor · Nov 12, 2013 · 94c0a56 · 94c0a56
2 parents 509c10d + 84a51bf
commit 94c0a56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -54,6 +54,7 @@ Fixed Issues:
 * [#11110](http://dev.ckeditor.com/ticket/11110): Fixed iframe and flash object being incorrectly pasted in certain conditions.
 * [#11129](http://dev.ckeditor.com/ticket/11129): Pagebreak is lost when loading data.
 * [#11123](http://dev.ckeditor.com/ticket/11123): Firefox: widget is destroyed after being dragged outside `body`.
+* [#11124](http://dev.ckeditor.com/ticket/11124): Fixed elements path on editor using divarea.
 
 ## CKEditor 4.3 Beta
 

diff --git a/plugins/elementspath/plugin.js b/plugins/elementspath/plugin.js
@@ -153,12 +153,13 @@
 				namesList = [],
 				filters = elementsPath.filters,
 				isContentEditable = true,
-				name,
-				elementsChain = selection.getStartElement().getParents(),
-				chainLength = elementsChain.length;
+
+				// Use elementPath to consider children of editable only (#11124).
+				elementsChain = editor.elementPath().elements,
+				name;
 
 			// Starts iteration from body element, skipping html.
-			for ( var j = 1; j < chainLength; j++ ) {
+			for ( var j = elementsChain.length; j--; ) {
 				var element = elementsChain[ j ],
 					ignore = 0;