Changeset 75 for trunk/expressoMail1_2/js/draw_api.js

Timestamp:

09/27/07 10:08:24 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/expressoMail1_2/js/draw_api.js (modified) (2 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -820 +820 @@
         div_other_options.innerHTML = option_mark_as + option_mark_as_unseen + option_mark_as_important + option_mark_as_normal + option_move + option_reply_to_all + option_reply_without_history + option_reply_to_all_without_history + option_source_msg;
         if (use_spam_filter) {
-                if(get_current_folder() == 'INBOX'+cyrus_delimiter+'Spam')
-                        div_other_options.innerHTML += ' | <span class="message_options" onclick="nospam(\'selected\',\'null\')";>'+get_lang("Not Spam")+'</span>';     
+                if(info_msg.msg_folder == 'INBOX'+cyrus_delimiter+'Spam')
+                        div_other_options.innerHTML += ' | <span class="message_options" onclick="nospam('+info_msg.msg_number+',\'null\', \''+info_msg.msg_folder+'\')";>'+get_lang("Not Spam")+'</span>';     
                 else
-                        div_other_options.innerHTML += ' | <span class="message_options" onclick="spam(\'null\', \'selected\',\'null\')";>'+get_lang("Spam")+'</span>'; 
+                        div_other_options.innerHTML += ' | <span class="message_options" onclick="spam(\''+info_msg.msg_folder+'\', '+info_msg.msg_number+',\'null\')";>'+get_lang("Spam")+'</span>';   
         }
         td_other_options.appendChild(div_other_options);
@@ -2134 +2134 @@
         if (use_spam_filter) {
                 if ( get_current_folder() == 'INBOX'+cyrus_delimiter+'Spam' )   {
-                        span_options.innerHTML += ' | <span title="'+get_lang("Not Spam")+'" class="message_options" onclick="nospam(\'selected\',\'null\')">'+get_lang("Not Spam")+'</span>';
+                        span_options.innerHTML += ' | <span title="'+get_lang("Not Spam")+'" class="message_options" onclick="nospam(\'selected\',\'null\',\'null\')">'+get_lang("Not Spam")+'</span>';
                 }
                 else {