Skip to content

Commit c96cd55

Browse files
committed
Merge branch 't/11490'
2 parents c017cf5 + 235eaf4 commit c96cd55

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ CKEditor 4 Changelog
55

66
Fixed Issues:
77

8-
* [#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.
8+
* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed issue with menubuttons panel showing in source mode.
9+
* [#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.
910

1011
## CKEditor 4.3.2
1112

core/editor.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,14 @@
782782
* @returns {CKEDITOR.dom.elementPath}
783783
*/
784784
elementPath: function( startNode ) {
785-
startNode = startNode || this.getSelection().getStartElement();
785+
if ( !startNode ) {
786+
var sel = this.getSelection();
787+
if ( !sel )
788+
return null;
789+
790+
startNode = sel.getStartElement();
791+
}
792+
786793
return startNode ? new CKEDITOR.dom.elementPath( startNode, this.editable() ) : null;
787794
},
788795

0 commit comments

Comments
 (0)