From dab9963e92a3d9c7f40c06965ad878164dacfe69 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Thu, 16 Aug 2012 10:30:40 +0000
Subject: updated tinyMCE to 3.5.6

---
 framework/3rdParty/TinyMCE/tiny_mce.md5            |   2 +-
 framework/3rdParty/TinyMCE/tiny_mce.tar            | Bin 5859328 -> 6231552 bytes
 framework/3rdParty/readme.html                     |   2 +-
 .../Javascripts/source/prado/controls/htmlarea.js  |   1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'framework')

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
index d7bf82bd..e8283608 100644
Binary files a/framework/3rdParty/TinyMCE/tiny_mce.tar and b/framework/3rdParty/TinyMCE/tiny_mce.tar differ
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()))
-- 
cgit v1.2.3