Skip to content
Permalink
Browse files

Merge branch 't/11490'

  • Loading branch information...
mlewand committed Jan 31, 2014
2 parents c017cf5 + 235eaf4 commit c96cd5502538ad61732250e914ad54ae2820f229
Showing with 10 additions and 2 deletions.
  1. +2 −1 CHANGES.md
  2. +8 −1 core/editor.js
@@ -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

@@ -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;
},

0 comments on commit c96cd55

Please sign in to comment.
You can’t perform that action at this time.