Skip to content

Commit

Permalink
Merge pull request tinymce#4 in TINYMCE/tinymce-vue from feature/WEBS…
Browse files Browse the repository at this point in the history
…ITE-1547 to master

* commit 'cab37623c896dc3f00446e0a82d9ed0fe07e8b3c':
  2.1.0
  WEBSITE-1547: Changelog
  WEBSITE-1547: Changed the CDN URL to use cdn.tiny.cloud
  • Loading branch information
SimonFc committed Jun 6, 2019
2 parents 8d634f9 + cab3762 commit 8a6352e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.1.0
* Changed the CDN URL to use `cdn.tiny.cloud`

# 2.0.0
* Changed default cloudChannel to `'5'`.

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tinymce/tinymce-vue",
"version": "2.0.0",
"version": "2.1.0",
"description": "Official TinyMCE Vue Component",
"private": false,
"repository": {
Expand Down
5 changes: 2 additions & 3 deletions src/components/Editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,9 @@ export const Editor: ThisTypedComponentOptionsWithRecordProps<Vue, {}, {}, {}, I
} else if (this.element && this.element.ownerDocument) {
const doc = this.element.ownerDocument;
const channel = this.$props.cloudChannel ? this.$props.cloudChannel : '5';
const apiKey = this.$props.apiKey ? this.$props.apiKey : '';
const url = `https://cloud.tinymce.com/${channel}/tinymce.min.js?apiKey=${apiKey}`;
const apiKey = this.$props.apiKey ? this.$props.apiKey : 'no-api-key';

ScriptLoader.load(scriptState, doc, url, initialise(this));
ScriptLoader.load(scriptState, doc, `https://cdn.tiny.cloud/1/${apiKey}/tinymce/${channel}/tinymce.min.js`, initialise(this));
}
},
beforeDestroy() {
Expand Down

0 comments on commit 8a6352e

Please sign in to comment.