Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Commit 0f1c5a8

Browse files
Lucas Granbergdeeg
Lucas Granberg
authored andcommitted
enhancement: ensure uiTinymceConfig.setup is called
Allows the setup function in uiTinymceConfig to be called if there is one. Closes #254 Closes #255
1 parent fd0dc39 commit 0f1c5a8

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"tinymce-dist": "~4.3.0"
2121
},
2222
"devDependencies": {
23-
"angular-mocks": "~1.x"
23+
"angular-mocks": "~1.4.x"
2424
}
2525
}

dist/tinymce.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/tinymce.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ angular.module('ui.tinymce', [])
104104
element.remove();
105105
});
106106

107+
if (uiTinymceConfig.setup) {
108+
uiTinymceConfig.setup(ed, {
109+
updateView: updateView
110+
});
111+
}
112+
107113
if (expression.setup) {
108114
expression.setup(ed, {
109115
updateView: updateView

0 commit comments

Comments
 (0)