Merge branch 't/11490'

ckeditor · Jan 31, 2014 · c96cd55 · c96cd55
2 parents c017cf5 + 235eaf4
commit c96cd55
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,7 +5,8 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
- * [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not cancelled anymore after editing has been triggered.
+* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed issue with menubuttons panel showing in source mode.
+* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not cancelled anymore after editing has been triggered.
 
 ## CKEditor 4.3.2
 

diff --git a/core/editor.js b/core/editor.js
@@ -782,7 +782,14 @@
 		 * @returns {CKEDITOR.dom.elementPath}
 		 */
 		elementPath: function( startNode ) {
-			startNode = startNode || this.getSelection().getStartElement();
+			if ( !startNode ) {
+				var sel = this.getSelection();
+				if ( !sel )
+					return null;
+
+				startNode = sel.getStartElement();
+			}
+
 			return startNode ? new CKEDITOR.dom.elementPath( startNode, this.editable() ) : null;
 		},