Ticket #7659: 7659.patch

_dev/msajax.js

@@ -4 +4 @@
 */
 
 // The following script is used in CKEditorControl:OnPreRender
+if (typeof CKEDITOR != 'undefined' && document.getElementById('{0}'))
+        document.getElementById('{0}').style.visibility = 'hidden';
+
 var CKEditor_Controls = [],
         CKEditor_Init = [];
 
@@ -15 +18 @@
         } 
         else {
                 var e = CKEDITOR.instances[cID];
-                if (inUpdatePanel) 
+                if (inUpdatePanel) {
                         e.destroy();
+                        document.getElementById(d).style.visibility = 'hidden';
+                }
                 else
                         e.updateElement();
         }

CKEditor.NET/CKEditorControl.cs

@@ -1024 +1024 @@
                         // Sys.Application.add_load does not work on browsers != IE
                         // 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,'&lt;').replace(/>/g,'&gt;');}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(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');}if(typeof CKEDITOR!='undefined')for(var i=0;i<f.length;i++)f[i].call(this);};window.pageLoad=function(i,j){if(j.get_isPartialLoad())setTimeout(h,0);if(g&&typeof g=='function')g.call(this,i,j);};setTimeout(h,0);};if(window.addEventListener)window.addEventListener('load',d,false);else if(window.attachEvent)window.attachEvent('onload',d);})();
+                        scriptInit += string.Format(@"if(typeof CKEDITOR !='undefined' && document.getElementById('{0}')) document.getElementById('{0}').style.visibility = 'hidden';
+", this.ClientID);
+                        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,'&lt;').replace(/>/g,'&gt;');}else{var g=CKEDITOR.instances[d];if(e){g.destroy(); document.getElementById(d).style.visibility = 'hidden';}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(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');}if(typeof CKEDITOR!='undefined')for(var i=0;i<f.length;i++)f[i].call(this);};window.pageLoad=function(i,j){if(j.get_isPartialLoad())setTimeout(h,0);if(g&&typeof g=='function')g.call(this,i,j);};setTimeout(h,0);};if(window.addEventListener)window.addEventListener('load',d,false);else if(window.attachEvent)window.attachEvent('onload',d);})();
 ";
                         this.RegisterStartupScript(this.GetType(), "CKEditorForNet", scriptInit, true);
                         this.RegisterStartupScript(this.GetType(), this.ClientID + @"_addControl", string.Format(@"CKEditor_Controls.push('{0}');