cronapp-lib-js 2.8.0 → 2.8.4

package/dist/js/tinymce/plugins/angular-ui-tinymce/dist/tinymce.min.js

@@ -129,7 +129,7 @@ angular.module('ui.tinymce', [])
               scope.$eval(ngAttrs.ngRemove);
             }
           });
-          
+
           let getContentTimeout = undefined;
           if (ngAttrs.ngNodeChange) { ed.on('NodeChange', function () { scope.$eval(ngAttrs.ngNodeChange); }); }
           if (ngAttrs.ngCronChange) { ed.on('change', function () { scope.$eval(ngAttrs.ngCronChange); }); }
@@ -214,22 +214,38 @@ angular.module('ui.tinymce', [])
         return viewValue ? $sce.getTrustedHtml(viewValue) : '';
       });
 
-      ngModel.$render = function() {
-        ensureInstance();
+      let isTinyMCEVisible = () => {
+        return (tinyInstance && angular.element(tinyInstance.contentAreaContainer).is(':visible'));
+      }
 
-        var viewValue = ngModel.$viewValue ?
-            $sce.getTrustedHtml(ngModel.$viewValue) : '';
-
-        // instance.getDoc() check is a guard against null value
-        // when destruction & recreation of instances happen
-        if (tinyInstance &&
-            tinyInstance.getDoc()
-        ) {
-          tinyInstance.setContent(viewValue);
-          // Triggering change event due to TinyMCE not firing event &
-          // becoming out of sync for change callbacks
-          tinyInstance.fire('change');
+      let whenVisible = async () => {
+        let promise = new Promise(resolve => {
+          let wait = () => (isTinyMCEVisible() && resolve()) || ($timeout(() => wait()));
+          wait();
+        });
+        return promise;
+      };
+
+      let forceContentAndWatch = (instance, value) => {
+        if (instance && instance.getDoc()) {
+          instance.setContent(value);
+          instance.fire('change');
+          instance.fire('blur');
         }
+
+        if (instance && !instance.watch) {
+          scope.$watch(() => isTinyMCEVisible(), () => ngModel.$render());
+          instance.watch = true;
+        }
+      };
+
+      let getViewValue = (model) => {
+        return model.$viewValue ? $sce.getTrustedHtml(model.$viewValue) : '';
+      }
+
+      ngModel.$render =  function() {
+        ensureInstance();
+        whenVisible().then(() => forceContentAndWatch(tinyInstance, getViewValue(ngModel)))
       };
 
       attrs.$observe('disabled', toggleDisable);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-lib-js",
-  "version": "2.8.0",
+  "version": "2.8.4",
   "description": "Javascript library for CronApp's projects",
   "main": "index.js",
   "scripts": {