Merge branch 'master' into develop

This commit is contained in:
josdejong 2013-02-12 09:25:34 +01:00
commit f2bd180790
1 changed files with 3 additions and 3 deletions

View File

@ -585,11 +585,11 @@ jsoneditor.JSONEditor.prototype._onUndo = function () {
jsoneditor.JSONEditor.prototype._onRedo = function () {
if (this.history) {
// redo last action
editor.history.redo();
this.history.redo();
// trigger change callback
if (editor.options.change) {
editor.options.change();
if (this.options.change) {
this.options.change();
}
}
};