Changeset 4379

Timestamp:

05/12/11 16:19:38 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1578 - Corrigido o envio de mensagem com imagem no corpo do e-mail

Location:

branches/2.2/expressoMail1_2/js

Files:

• main.js (modified) (5 diffs)
• rich_text_editor.js (modified) (2 diffs)

branches/2.2/expressoMail1_2/js/main.js

@@ -1772 +1772 @@
         if (data.append != true || !data)
         {
-                RichTextEditor.saveFlag = -1;
+                RichTextEditor.saveFlag = 0;
                 if (! data.append)
                         if(data == 'Post-Content-Length')
@@ -1795 +1795 @@
         else
         {
-                RichTextEditor.saveFlag = 1;
                 openTab.imapUid[border_id] = data.msg_no;
                 openTab.imapBox[border_id] = data.folder_id;
@@ -1917 +1916 @@
                 watch_changes_in_msg(border_id);
                 write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
+                setTimeout( function(){ RichTextEditor.saveFlag = 1; }, 1000 );
         }
 }
@@ -1975 +1975 @@
 
 
-        if (is_ie){
+        if (is_ie)
+        {
                 var i = 0;
                 while (document.forms(i).name != "form_message_"+border_id){i++}
@@ -1981 +1982 @@
         }
         else
-                form = document.forms["form_message_"+border_id];
+        {    
+            form = document.forms["form_message_"+border_id];
+        }
+        
         form.appendChild(textArea);
         form.appendChild(input_folder);

branches/2.2/expressoMail1_2/js/rich_text_editor.js

@@ -463 +463 @@
         RichTextEditor.saveFlag = 0; // See if save function finished
         var save_link = document.getElementById("save_message_options_"+id);
-        //save_link.onclick = function () {};
         save_msg(id,true);
-        setTimeout("RichTextEditor.insertImgHtml("+id+")",1000);
-}
-
-cRichTextEditor.prototype.insertImgHtml = function (id){
-        if (RichTextEditor.saveFlag == 0)
-                setTimeout("RichTextEditor.insertImgHtml("+id+")",500);
+        RichTextEditor.insertImgHtml(id);
+}
+
+cRichTextEditor.prototype.insertImgHtml = function (id)
+{
+        if ( RichTextEditor.saveFlag == 0 )
+        {
+            setTimeout( function(){ RichTextEditor.insertImgHtml(id); },1000 );
+        }
         else
-                if (RichTextEditor.saveFlag == 1)
-                {
-                        this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=INBOX/'+draftsfolder+'&msg_num='+openTab.imapUid[id]+'&msg_part='+(openTab.countFile[id]+1));
-                        // this.editorCommand('Image', '.inc/gotodownload.php?msg_folder="+msg_folder+"&msg_number="+msg_number+"&idx_file="+idx_file+"&msg_part="+msg_part+params'));
-                        openTab.toPreserve[id] = true;
-                        save_msg(id,true);
-                }
+        {
+            if ( RichTextEditor.saveFlag == 1 )
+            {
+                var folderNameDraft = "INBOX" + cyrus_delimiter + draftsfolder;
+                this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=' + folderNameDraft + '&msg_num='+openTab.imapUid[id]+'&msg_part='+(openTab.countFile[id]+1));
+                openTab.toPreserve[id] = true;
+                save_msg(id,true);
+            }
+        }
 }
 
@@ -570 +574 @@
                 form_upload.style.left = "5px";
                 form_upload.name = get_lang("Upload File");
-                form_upload.style.width = "450px";
-                form_upload.style.height = "75px";
+                form_upload.style.width = "550px";
+                form_upload.style.height = "100px";
                 form_upload.innerHTML = get_lang('Select the desired image file')+':<br>'+
-                                                                '<input name="image_at" maxlength="255" size="50" id="inputFile_img" type="file"><br>' +
-                                                                '<input title="' + get_lang('Include') + '"  value="' + get_lang('Include') + '"' + 'type="button" onclick="RichTextEditor.addInputFile();">&nbsp;' +
-                                                                '<input title="' + get_lang('Close') + '"  value="' + get_lang('Close') + '"' +
-                                                                ' type="button" onclick="win.close()">';
+                                        '<input name="image_at" maxlength="255" size="50" id="inputFile_img" type="file"><br/><br/>' +
+                                        '<input title="' + get_lang('Include') + '"  value="' + get_lang('Include') + '"' + 'type="button" onclick="RichTextEditor.addInputFile();">&nbsp;' +
+                                        '<input title="' + get_lang('Close') + '"  value="' + get_lang('Close') + '"' +
+                                        ' type="button" onclick="win.close()">';
+                                    
                 form.appendChild(form_upload);