Merge branch 'pm_wysiwyg'

workflow/engine/xmlform/outputdocs/outputdocs_Edit.xml

@@ -19,6 +19,7 @@
 <JS type="JavaScript"><![CDATA[
 
     function cancel(){
+        tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
         outputdocsEditor.remove();
     }
 

workflow/engine/xmlform/outputdocs/outputdocs_Options.xml

@@ -92,6 +92,7 @@ var outputdocsEditor;
   }
   
   function outputdocsSave( form ) {
+    tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
     form.action = '../outputdocs/outputdocs_Save';
     ajax_post( form.action, form, 'POST' );
     outputdocsEditor.remove();

workflow/engine/xmlform/processes/processes_FileEdit.xml

@@ -23,6 +23,7 @@
 <JS type="javascript" replacetags="1"><![CDATA[
 
 function cancel() {
+    tinyMCE.execCommand('mceRemoveControl',false,'form[fcontent]');
     oPanel.remove();
 }
 

workflow/engine/xmlform/processes/processes_FilesOptions.xml

@@ -109,6 +109,7 @@ function editFile(pro_uid, fileName){
 function saveFile(pro_uid, fileName){
     
     var fc64 = base64_encode(getField('fcontent').value);
+    tinyMCE.execCommand('mceRemoveControl',false,'form[fcontent]');
     fc64 = fc64.replace(/&/g, "@amp@");
     fc64 = fc64.replace(/\+/g, '%2B');