Changeset 6910 for trunk/expressoMail1_2/js/main.js

Timestamp:

07/30/12 16:17:19 (12 years ago)

Author:

cristiano

Message:

Ticket #2987 - Inconsistência excluindo com tela modal aberta - teclas de atalho

File:

• trunk/expressoMail1_2/js/main.js (modified) (4 diffs)

trunk/expressoMail1_2/js/main.js

@@ -3682 +3682 @@
                                                                 click   : function()
                                                                 {
-                                                                        importEmails.dialog("destroy");
+                                                                        importEmails.dialog("close").dialog("destroy");
                                                                 }
                                                          },
@@ -3732 +3732 @@
                                                                 }
                                                          }
-                                                ]
+                                                ],
+                open: function(event, ui) 
+                {
+                    if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 
+                },
+                close: function(event, ui) 
+                {
+                    if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 
+                }
                 });
 
@@ -3941 +3949 @@
                         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
                 });
@@ -4061 +4075 @@
                                                                                 $( 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");