diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/3rdParty/TinyMCE/tiny_mce.md5 | 2 | ||||
| -rw-r--r-- | framework/3rdParty/TinyMCE/tiny_mce.tar | bin | 5859328 -> 6231552 bytes | |||
| -rw-r--r-- | framework/3rdParty/readme.html | 2 | ||||
| -rw-r--r-- | framework/Web/Javascripts/source/prado/controls/htmlarea.js | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/framework/3rdParty/TinyMCE/tiny_mce.md5 b/framework/3rdParty/TinyMCE/tiny_mce.md5 index 0d077f97..48eb6ae9 100644 --- a/framework/3rdParty/TinyMCE/tiny_mce.md5 +++ b/framework/3rdParty/TinyMCE/tiny_mce.md5 @@ -1 +1 @@ -0b613955e5cfa7a3bd3585abe03232d9 tiny_mce.tar +b1cc9a3ca9783069a9435767a7dc6048 tiny_mce.tar diff --git a/framework/3rdParty/TinyMCE/tiny_mce.tar b/framework/3rdParty/TinyMCE/tiny_mce.tar Binary files differindex d7bf82bd..e8283608 100644 --- a/framework/3rdParty/TinyMCE/tiny_mce.tar +++ b/framework/3rdParty/TinyMCE/tiny_mce.tar diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html index 23c3e358..2855ba74 100644 --- a/framework/3rdParty/readme.html +++ b/framework/3rdParty/readme.html @@ -41,7 +41,7 @@ projects. </tr>
<tr>
<td><a href="TinyMCE">TinyMCE</a></td>
- <td><a href="http://tinymce.moxiecode.com/">TinyMCE Javascript Content Editor</a> (v3.4.2)</td>
+ <td><a href="http://tinymce.moxiecode.com/">TinyMCE Javascript Content Editor</a> (v3.5.6)</td>
<td><a href="TinyMCE/license.txt">GNU LESSER GENERAL PUBLIC LICENSE</a></td>
<td>System.Web.UI.WebControls.THtmlArea</td>
<td>TinyMCE is a powerful WYSIWYG editor control for web browsers such as MSIE or Mozilla that enables the user to edit HTML contents in a more user friendly way.</td>
diff --git a/framework/Web/Javascripts/source/prado/controls/htmlarea.js b/framework/Web/Javascripts/source/prado/controls/htmlarea.js index 56d4cf16..30bb82dd 100644 --- a/framework/Web/Javascripts/source/prado/controls/htmlarea.js +++ b/framework/Web/Javascripts/source/prado/controls/htmlarea.js @@ -72,7 +72,6 @@ Prado.WebUI.THtmlArea = Class.create(Prado.WebUI.Control, compressedScriptsLoaded: function() { Prado.WebUI.THtmlArea.tinyMCELoadState = 255; - tinymce.dom.Event._pageInit(); var wrapper; while(Prado.WebUI.THtmlArea.pendingRegistrations.length>0) if (wrapper = Prado.Registry.get(Prado.WebUI.THtmlArea.pendingRegistrations.pop())) |