Skip to content

Commit a81410a

Browse files
committed
Merge remote-tracking branch 'origin/MC-38807' into 2.4-develop-pr111
2 parents 4f1d406 + 636da0a commit a81410a

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

dev/tests/js/jasmine/tests/lib/mage/tinymce4Adapter.test.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
define([
77
'wysiwygAdapter',
8-
'underscore'
9-
], function (wysiwygAdapter, _) {
8+
'underscore',
9+
'tinymce4'
10+
], function (wysiwygAdapter, _, tinyMCE4) {
1011
'use strict';
1112

1213
var obj;
@@ -38,4 +39,12 @@ define([
3839
expect(_.size(obj.eventBus.arrEvents['open_browser_callback'])).toBe(1);
3940
});
4041
});
42+
43+
describe('"triggerSave" method', function () {
44+
it('Check method call.', function () {
45+
spyOn(tinyMCE4, 'triggerSave');
46+
obj.triggerSave();
47+
expect(tinyMCE4.triggerSave).toHaveBeenCalled();
48+
});
49+
});
4150
});

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,13 @@ define([
749749
*/
750750
addContentEditableAttributeBackToNonEditableNodes: function () {
751751
jQuery('.mceNonEditable', this.activeEditor().getDoc()).attr('contenteditable', false);
752+
},
753+
754+
/**
755+
* Calls the save method on all editor instances in the collection.
756+
*/
757+
triggerSave: function () {
758+
tinyMCE4.triggerSave();
752759
}
753760
};
754761

0 commit comments

Comments
 (0)