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

Commit 0fd33b4

Browse files
committed
Fix injection, remove erroneous setTimeout
1 parent 41b8cff commit 0fd33b4

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/tinymce.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
*/
44
angular.module('ui.tinymce', [])
55
.value('uiTinymceConfig', {})
6-
.directive('uiTinymce', ['uiTinymceConfig', function ($rootScope, uiTinymceConfig) {
6+
.directive('uiTinymce', ['$rootScope', '$window', 'uiTinymceConfig', function ($rootScope, $window, uiTinymceConfig) {
77
uiTinymceConfig = uiTinymceConfig || {};
88
var generatedIds = 0;
99
return {
1010
priority: 10,
1111
require: 'ngModel',
1212
link: function (scope, elm, attrs, ngModel) {
13+
if (!$window.tinymce) {
14+
return;
15+
}
16+
1317
var expression, options, tinyInstance,
1418
updateView = function () {
1519
ngModel.$setViewValue(elm.val());
@@ -77,9 +81,7 @@ angular.module('ui.tinymce', [])
7781
};
7882
// extend options with initial uiTinymceConfig and options from directive attribute value
7983
angular.extend(options, uiTinymceConfig, expression);
80-
setTimeout(function() {
81-
tinymce.init(options);
82-
});
84+
tinymce.init(options);
8385

8486
ngModel.$render = function() {
8587
if (!tinyInstance) {

0 commit comments

Comments
 (0)