Skip to content

Commit

Permalink
Do not fail if initializing with another language or external script
Browse files Browse the repository at this point in the history
  • Loading branch information
frapell committed Aug 9, 2018
1 parent b3708f7 commit 84499a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ New features:

Bug fixes:

- TinyMCE: Do not fail if initializing with another language or external script
https://github.com/plone/Products.CMFPlone/issues/2425
[frapell]

- Get rid of obsolete ``X-UA-Compatible`` header.
[hvelarde]

Expand Down
4 changes: 0 additions & 4 deletions mockup/patterns/tinymce/pattern.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,6 @@ define([
tinymce.init(tinyOptions);
self.tiny = tinymce.get(self.tinyId);

if (self.tiny !== null){
self.tiny.initialized = true;
}

/* tiny really should be doing this by default
* but this fixes overlays not saving data */
var $form = self.$el.parents('form');
Expand Down

0 comments on commit 84499a9

Please sign in to comment.