Changeset 910d07e in github

Timestamp:

Aug 29, 2008 2:44:09 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

53bd8fa

Parents:

876b15d

Message:

• signature in html editor must be in <div> not <span>, because IE not allows to include block elements inside <span>
• if identity has no signature, replace previous with empty div

File:

• program/js/app.js (modified) (1 diff)

program/js/app.js

@@ -2061 +2061 @@
       var editor = tinyMCE.get('compose-body');
 
-      if (this.env.signatures && this.env.signatures[id])
-        {
-        // Append the signature as a span within the body
+      if (this.env.signatures)
+        {
+        // Append the signature as a div within the body
         var sigElem = editor.dom.get("_rc_sig");
+        var newsig = '';
+        var htmlsig = true;
+        
         if (!sigElem)
           {
-          sigElem = editor.getDoc().createElement("span");
+          sigElem = editor.getDoc().createElement("div");
           sigElem.setAttribute("id", "_rc_sig");
           editor.getBody().appendChild(sigElem);
           }
-        if (this.env.signatures[id]['is_html'])
-          {
-          sigElem.innerHTML = this.env.signatures[id]['text'];
-          }
+
+        if (this.env.signatures[id])
+          {
+          newsig = this.env.signatures[id]['text'];
+          htmlsig = this.env.signatures[id]['is_html'];
+          }
+
+        if (htmlsig)
+          sigElem.innerHTML = newsig;
         else
-          {
-          sigElem.innerHTML = '<pre>' + this.env.signatures[id]['text'] + '</pre>';
-          }
+          sigElem.innerHTML = '<pre>' + newsig + '</pre>';
         }
       }