Changeset 6931 for branches/2.4/expressoMail1_2/js/main.js

Timestamp:

08/03/12 15:57:28 (12 years ago)

Author:

eduardow

Message:

Ticket #2987 - Inconsistencia excluindo com tela modal aberta - teclas de atalho.

File:

• branches/2.4/expressoMail1_2/js/main.js (modified) (4 diffs)

branches/2.4/expressoMail1_2/js/main.js

@@ -3652 +3652 @@
                                                                 click   : function()
                                                                 {
-                                                                        importEmails.dialog("destroy");
+                                                                        importEmails.dialog("close").dialog("destroy");
                                                                 }
                                                          },
@@ -3702 +3702 @@
                                                                 }
                                                          }
-                                                ]
+                                                ], 
+            open: function(event, ui)  
+            { 
+                if(typeof(shortcut) != 'undefined') shortcut.disabled = true;  
+            }, 
+            close: function(event, ui)  
+            { 
+                if(typeof(shortcut) != 'undefined') shortcut.disabled = false;  
+            } 
                 });
 
@@ -3915 +3923 @@
                         modal: true,
                         resizable : false,
-                        close: function(event) {
-                                event.stopPropagation();
-                        },
+                        open: function(event, ui)  
+            { 
+                if(typeof(shortcut) != 'undefined') shortcut.disabled = true;  
+            }, 
+            close: function(event, ui)  
+            { 
+                event.stopPropagation(); 
+                if(typeof(shortcut) != 'undefined') shortcut.disabled = false;  
+            },
                         closeOnEscape: true
                 });
@@ -4035 +4049 @@
                                                                                 $( this ).dialog( "close" );
                                                                         }
-                                                                }
+                                                                }, 
+                                                    close:function(event, ui)  
+                                                    { 
+                                                        if(typeof(shortcut) != 'undefined') shortcut.disabled = false;  
+                                                    }, 
+                                                    open: function(event, ui)  
+                                                    { 
+                                                        if(typeof(shortcut) != 'undefined') shortcut.disabled = true;  
+                                                    } 
                                                         });
                                                         $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar");