Changeset 135

Timestamp:

12/13/07 13:26:04 (16 years ago)

Author:

niltonneto

Message:

Correções de bug. Vide ocorrências no Trac para a versão 1.2201

Location:

trunk/expressoMail1_2

Files:

• index.php (modified) (1 diff)
• js/connector.js (modified) (3 diffs)
• js/main.js (modified) (2 diffs)
• js/shortcut.js (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoMail1_2/index.php

@@ -146 +146 @@
 <script src="js/connector.js?<?=$update_version?>" type="text/javascript"></script>
 <script src="../phpgwapi/js/dftree/dftree.js?<?=$update_version?>" type="text/javascript"></script>
-<script language="Javascript">init();</script>
+<script language="Javascript">connector.updateVersion = "<?=$update_version?>";init();</script>
 <!-----Expresso Mail - Version Updated:<?=$update_version?>-------->

trunk/expressoMail1_2/js/connector.js

@@ -40 +40 @@
                 this.oldX = 0;
                 this.oldY = 0;
+                this.updateVersion = "";
         }
         
@@ -449 +450 @@
                 if(is_ie) {
                 
-                        this.oxmlhttp.open("GET", "js/"+scriptPath+".js", false);
+                        this.oxmlhttp.open("GET", "js/"+scriptPath+".js?"+this.updateVersion, false);
             this.oxmlhttp.setRequestHeader('Content-Type','text/plain');
                         this.oxmlhttp.send(null);
@@ -457 +458 @@
                 }
                 else {
-                        script.src =  "js/"+scriptPath+".js";
+                        script.src =  "js/"+scriptPath+".js?"+this.updateVersion;
                 }
 

trunk/expressoMail1_2/js/main.js

@@ -194 +194 @@
                         if (msg_to_delete){
                                 if ( (msg_to_delete.style.backgroundColor != '') && (preferences.use_shortcuts == '1') )
-                                        select_msg('null', 'down');
+                                {
+                                        if (!select_msg('null', 'down'))
+                                                select_msg('null', 'up')
+                                }
                                 mail_msg.removeChild(msg_to_delete);
                         }
@@ -735 +738 @@
         var y = ((screen.height - 400) / 2) - 35;
         var window_print = window.open('','ExpressoMail','width='+print_width+',height=400,resizable=yes,scrollbars=yes,left='+x+',top='+y);
-                
+        if(window_print == null) {
+                alert(get_lang("The Anti Pop-Up is enabled. Allow this site (%1) for print.",document.location.hostname));
+                return;
+        }
+        
         while (1){
                 try{

trunk/expressoMail1_2/js/shortcut.js

@@ -237 +237 @@
                         if (all_messages[i].style.backgroundColor != '')
                         {
-                                delete_msgs('INBOX', all_messages[i].id, 'null');
+                                delete_msgs(get_current_folder(), all_messages[i].id, 'null');
                                 return;
                         }
@@ -323 +323 @@
                         if (all_messages[i].style.backgroundColor != '')
                         {
-                                if ( (keyboard_action == 'down') && (i+1 <= all_messages.length-1) )
+                                if (keyboard_action == 'down')
                                 {
-                                        all_messages[i].style.color = '';
-                                        all_messages[i].style.backgroundColor = '';
+                                        if (i+1 <= all_messages.length-1)
+                                        {
+                                                all_messages[i].style.color = '';
+                                                all_messages[i].style.backgroundColor = '';
                                 
-                                        all_messages[i+1].style.color = 'white';
-                                        all_messages[i+1].style.backgroundColor = '#5194d2';
+                                                all_messages[i+1].style.color = 'white';
+                                                all_messages[i+1].style.backgroundColor = '#5194d2';
+                                        }
+                                        else
+                                        {
+                                                return false;
+                                        }
                                 }
                                 else if ( (keyboard_action == 'up') && (i-1 >= 0) )