Skip to content

Commit

Permalink
Merge branch 't/10370' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed May 17, 2013
2 parents 6d11cde + 33097b6 commit a4d3172
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion plugins/wysiwygarea/plugin.js
Expand Up @@ -318,8 +318,12 @@
setData: function( data, isSnapshot ) {
var editor = this.editor;

if ( isSnapshot )
if ( isSnapshot ) {
this.setHtml( data );
// Fire dataReady for the consistency with inline editors
// and because it makes sense. (#10370)
editor.fire( 'dataReady' );
}
else {
this._.isLoadingData = true;
editor._.dataStore = { id:1 };
Expand Down

0 comments on commit a4d3172

Please sign in to comment.