Merge branch 'master' of github.com:cipchk/ngx-tinymce

cipchk · Sep 29, 2022 · c6fc54f · c6fc54f
2 parents 90be201 + a19bd9e
commit c6fc54f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/src/tinymce.component.ts b/lib/src/tinymce.component.ts
@@ -128,7 +128,7 @@ export class TinymceComponent implements AfterViewInit, OnChanges, OnDestroy, Co
     if (defConfig.baseURL) {
       let url = '' + defConfig.baseURL;
       if (url.endsWith('/')) {
-        url = url.substr(0, url.length - 1);
+        url = url.substring(0, url.length - 1);
       }
       win.tinymce.baseURL = url;
     }
@@ -187,7 +187,15 @@ export class TinymceComponent implements AfterViewInit, OnChanges, OnDestroy, Co
     if (!this._instance) {
       return;
     }
-    this.ngZone.runOutsideAngular(() => this._instance.setMode(this._disabled ? 'readonly' : 'design'));
+    this.ngZone.runOutsideAngular(() => {
+      const mode = this._disabled ? 'readonly' : 'design';
+      // Compatible with 5
+      if (typeof this._instance.setMode === 'function') {
+        this._instance.setMode(mode);
+      } else {
+        this._instance.mode.set(mode);
+      }
+    });
   }
 
   ngAfterViewInit(): void {

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -31,7 +31,8 @@ import { StandaloneDemoComponent } from './standalone.component';
       { useHash: true },
     ),
     NgxTinymceModule.forRoot({
-      baseURL: '//cdnjs.cloudflare.com/ajax/libs/tinymce/5.7.1/',
+      // baseURL: '//cdnjs.cloudflare.com/ajax/libs/tinymce/5.7.1/',
+      baseURL: '//cdn.tiny.cloud/1/no-api-key/tinymce/6/',
     }),
   ],
   bootstrap: [AppComponent],