Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html (revision 6738)
+++ /CKEditor.NET/trunk/CHANGES.html (revision 6739)
@@ -79,4 +79,5 @@
#7558 : Custom toolbar does not work.
#7660 : Problem with toggling the visible status.
+ #7659 : Plain textarea is shown when toggling CKEditor.
#7302 : It is impossible to customize the editor inside a master page and if attributes are placed in front of the control ID.
#7590 : Error in Visual Studio when trying to reset values in the Properties window.
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs (revision 6738)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs (revision 6739)
@@ -1026,6 +1026,5 @@
// http://msdn.microsoft.com/en-us/library/bb386417.aspx
// Check _dev/msajax.js for an uncompressed version (available in CKEditor.Net downloaded from SVN).
- scriptInit += @"var CKEditor_Controls=[],CKEditor_Init=[];function CKEditor_TextBoxEncode(d,e){if(typeof CKEDITOR=='undefined'||typeof CKEDITOR.instances[d]=='undefined'){var f=document.getElementById(d); if(f) f.value=f.value.replace(//g,'>');}else{var g=CKEDITOR.instances[d];if(e)g.destroy();else g.updateElement();}};(function(){var d=function(){var e=CKEditor_Controls,f=CKEditor_Init,g=window.pageLoad,h=function(){for(var i=e.length;i--;){var j=document.getElementById(e[i]);if(j&&j.value&&(j.value.indexOf('<')==-1||j.value.indexOf('>')==-1))j.value=j.value.replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&');}if(typeof CKEDITOR!='undefined')for(var i=0;i/g,'>');}else{var g=CKEDITOR.instances[d];if(e){g.destroy();f=document.getElementById(d);if(f)f.style.visibility='hidden';}else g.updateElement();}};(function(){if(typeof CKEDITOR!='undefined'){var d=document.getElementById('" + this.ClientID + @"');if(d)d.style.visibility='hidden';}var e=function(){var f=CKEditor_Controls,g=CKEditor_Init,h=window.pageLoad,i=function(){for(var j=f.length;j--;){var k=document.getElementById(f[j]);if(k&&k.value&&(k.value.indexOf('<')==-1||k.value.indexOf('>')==-1))k.value=k.value.replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&');}if(typeof CKEDITOR!='undefined')for(var j=0;j/g, '>');
@@ -16,6 +17,10 @@
else {
var e = CKEDITOR.instances[cID];
- if (inUpdatePanel)
+ if (inUpdatePanel) {
e.destroy();
+ control = document.getElementById(cID);
+ if (control)
+ control.style.visibility = 'hidden';
+ }
else
e.updateElement();
@@ -25,4 +30,11 @@
(function()
{
+ if (typeof CKEDITOR != 'undefined')
+ {
+ var control = document.getElementById('{0}');
+ if (control)
+ control.style.visibility = 'hidden';
+ }
+
var onload = function()
{