Skip to content
Permalink
Browse files

Merge branch 't/12885'

  • Loading branch information...
pjasiun committed Feb 2, 2015
2 parents 6a8dc27 + 871366a commit a167f432a0cab02849aa11b1e90dc36015376175
Showing with 10 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +9 −3 core/editor.js
@@ -6,6 +6,7 @@ CKEditor 4 Changelog
Fixed Issues:

* [#12796](http://dev.ckeditor.com/ticket/12796): Fixed: [Indent List](http://ckeditor.com/addon/indentlist) plugin unwraps parent li elements.
* [#12885](http://dev.ckeditor.com/ticket/12885): Added missing getData parameter documentation.

Other Changes:

@@ -859,10 +859,16 @@
* if ( CKEDITOR.instances.editor1.getData() == '' )
* alert( 'There is no data available.' );
*
* @param {Boolean} internal If set to `true`, it will prevent firing the
* {@link CKEDITOR.editor#beforeGetData} and {@link CKEDITOR.editor#event-getData} events, so
* the real content of the editor will not be read and cached data will be returned. The method will work
* much faster, but this may result in the editor returning the data that is not up to date. This parameter
* should thus only be set to `true` when you are certain that the cached is up to date.
*
* @returns {String} The editor data.
*/
getData: function( noEvents ) {
!noEvents && this.fire( 'beforeGetData' );
getData: function( internal ) {
!internal && this.fire( 'beforeGetData' );

var eventData = this._.data;

@@ -877,7 +883,7 @@
eventData = { dataValue: eventData };

// Fire "getData" so data manipulation may happen.
!noEvents && this.fire( 'getData', eventData );
!internal && this.fire( 'getData', eventData );

return eventData.dataValue;
},

0 comments on commit a167f43

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