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

Commit 15c64f1

Browse files
asaarnakdeeg
authored andcommitted
feat: allow use of tinymce init promise
Fixes #264 Closes #280 Closes #287
1 parent cfb2899 commit 15c64f1

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ angular.module('ui.tinymce', [])
55
.value('uiTinymceConfig', {})
66
.directive('uiTinymce', ['$rootScope', '$compile', '$timeout', '$window', '$sce', 'uiTinymceConfig', function($rootScope, $compile, $timeout, $window, $sce, uiTinymceConfig) {
77
uiTinymceConfig = uiTinymceConfig || {};
8-
var generatedIds = 0;
98
var ID_ATTR = 'ui-tinymce';
109
if (uiTinymceConfig.baseUrl) {
1110
tinymce.baseURL = uiTinymceConfig.baseUrl;
@@ -52,7 +51,7 @@ angular.module('ui.tinymce', [])
5251
}
5352

5453
// generate an ID
55-
attrs.$set('id', ID_ATTR + '-' + generatedIds++);
54+
attrs.$set('id', ID_ATTR + '-' + (new Date().valueOf()));
5655

5756
expression = {};
5857

@@ -138,8 +137,14 @@ angular.module('ui.tinymce', [])
138137
if (options.baseURL){
139138
tinymce.baseURL = options.baseURL;
140139
}
141-
tinymce.init(options);
142-
toggleDisable(scope.$eval(attrs.ngDisabled));
140+
var maybeInitPromise = tinymce.init(options);
141+
if(maybeInitPromise && typeof maybeInitPromise.then === 'function') {
142+
maybeInitPromise.then(function() {
143+
toggleDisable(scope.$eval(attrs.ngDisabled));
144+
});
145+
} else {
146+
toggleDisable(scope.$eval(attrs.ngDisabled));
147+
}
143148
});
144149

145150
ngModel.$formatters.unshift(function(modelValue) {

0 commit comments

Comments
 (0)