Ticket #1485304: ie_html_signature_no_call_init.patch

program/js/editor.js

@@ -34 +34 @@
     content_css : skin_path + "/editor_content.css",
     external_image_list_url : "program/js/editor_images.js",
     spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : "Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv"),
-    rc_client: rcube_webmail_client
+    rc_client: rcube_webmail_client,
+    init_instance_callback : "rcmail_editor_callback"
   });
 }
 
+// react to real individual tinyMCE editor init
+function rcmail_editor_callback(editor)
+{
+   if (editor.editorId == 'compose-body'){
+        var input_from = rcube_find_object('_from');
+       if (input_from && input_from.type=='select-one')
+           rcmail.change_identity(input_from);
+   }
+}
+
 // Toggle between the HTML and Plain Text editors
 
 function rcmail_toggle_editor(toggler)

program/js/app.js

@@ -443 +443 @@
       this.init_address_input_events(input_bcc);
 
     // add signature according to selected identity
-    if (input_from && input_from.type=='select-one')
+    // if we have HTML editor, signature is added in callback
+    if (input_from && input_from.type=='select-one'
+          && rcube_find_object('_is_html').value != '1')
       this.change_identity(input_from);
 
     if (input_to && input_to.value=='')
@@ -4177 +4179 @@
   this.reset();
 
   }  // end class rcube_http_request
-
-
-// helper function to call the init method with a delay
-function call_init(o)
-  {
-    window.setTimeout('if (window[\''+o+'\'] && window[\''+o+'\'].init) { '+o+'.init(); }',
-                      bw.win ? 500 : 200);
-  }
-

program/include/rcube_template.php

@@ -65 +65 @@
         $javascript = 'var '.JS_OBJECT_NAME.' = new rcube_webmail();';
 
         // don't wait for page onload. Call init at the bottom of the page (delayed)
-        $javascript_foot = "if (window.call_init)\n call_init('".JS_OBJECT_NAME."');";
+        $javascript_foot = JS_OBJECT_NAME . ".init();";
 
         $this->add_script($javascript, 'head_top');
         $this->add_script($javascript_foot, 'foot');