Changeset 6931
- Timestamp:
- 08/03/12 15:57:28 (12 years ago)
- Location:
- branches/2.4/expressoMail1_2/js
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/expressoMail1_2/js/QuickCatalogSearch.js
r6754 r6931 800 800 $( "#amount-text" ).focus(); 801 801 event.stopPropagation(); 802 } 802 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 803 }, 804 open: function(event, ui) 805 { 806 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 807 } 803 808 }); 804 809 }); … … 814 819 $(this).bind('keydown'); 815 820 $(function() { 816 $( "#dialog:ui-dialog" ).dialog( "destroy" );821 $( "#dialog:ui-dialog" ).dialog("close").dialog( "destroy" ); 817 822 $( "#dialog-modal" ).dialog({ 818 823 resizable: false, … … 832 837 content.find(field_).focus(); 833 838 } 839 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 834 840 }, 835 841 open: function () { … … 837 843 $("#selectable li:first").focus(); 838 844 document.getElementById("amount-text").focus(); 845 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 839 846 }, 840 847 focus: function (event, ui) { -
branches/2.4/expressoMail1_2/js/QuickSearchUser.js
r6754 r6931 31 31 } 32 32 ], 33 beforeClose : function() 34 { 35 $(this).dialog("destroy"); 36 } 33 open: function(event, ui) 34 { 35 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 36 }, 37 close: function(event, ui) 38 { 39 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 40 $(this).dialog("destroy"); 41 } 37 42 }); 38 43 -
branches/2.4/expressoMail1_2/js/TreeS.js
r5744 r6931 32 32 click: function() 33 33 { 34 $(this).dialog(" destroy");34 $(this).dialog("close").dialog("destroy"); 35 35 div.removeChild( div.firstChild ); 36 36 }, … … 40 40 beforeClose : function() 41 41 { 42 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 42 43 $(this).dialog("destroy"); 43 44 div.removeChild( div.firstChild ); … … 54 55 else 55 56 { 56 57 if( Element('dftree_treeFolders') != null ) 57 58 { 58 59 $(div).dialog("destroy"); … … 65 66 } 66 67 } 68 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 67 69 } 68 70 }); -
branches/2.4/expressoMail1_2/js/ccQuickAdd.js
r6929 r6931 89 89 } 90 90 } 91 ] 91 ], 92 open: function(event, ui) 93 { 94 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 95 }, 96 close: function(event, ui) 97 { 98 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 99 } 92 100 }); 93 101 quickContact.next().css("background-color", "#E0EEEE").find("button").addClass("button").addClass("small"); -
branches/2.4/expressoMail1_2/js/common_functions.js
r6754 r6931 687 687 select_all_search_messages(false, 'content_id_'+currentTab); 688 688 event.stopPropagation(); 689 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 689 690 }, 691 open: function(event, ui) 692 { 693 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 694 }, 690 695 autoOpen:false, 691 696 dialogClass: 'dialog-configure-label' … … 740 745 select_all_search_messages(false, 'content_id_'+currentTab); 741 746 event.stopPropagation(); 747 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 742 748 }, 749 open: function(event, ui) 750 { 751 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 752 }, 743 753 autoOpen:false 744 754 }); -
branches/2.4/expressoMail1_2/js/draw_api.js
r6864 r6931 4469 4469 modal: true, 4470 4470 closeOnEscape:true, 4471 close:function(event, ui) {event.stopPropagation();}, 4471 close:function(event, ui) 4472 { 4473 event.stopPropagation(); 4474 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 4475 }, 4476 open: function(event, ui) 4477 { 4478 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 4479 }, 4472 4480 autoOpen:false 4473 4481 }); -
branches/2.4/expressoMail1_2/js/filter.js
r5526 r6931 474 474 style: "margin-top: -2.1em" 475 475 }, 476 ] 476 ], 477 open: function(event, ui) 478 { 479 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 480 }, 481 close: function(event, ui) 482 { 483 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 484 } 477 485 }); 478 486 }; -
branches/2.4/expressoMail1_2/js/main.js
r6867 r6931 3652 3652 click : function() 3653 3653 { 3654 importEmails.dialog(" destroy");3654 importEmails.dialog("close").dialog("destroy"); 3655 3655 } 3656 3656 }, … … 3702 3702 } 3703 3703 } 3704 ] 3704 ], 3705 open: function(event, ui) 3706 { 3707 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 3708 }, 3709 close: function(event, ui) 3710 { 3711 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 3712 } 3705 3713 }); 3706 3714 … … 3915 3923 modal: true, 3916 3924 resizable : false, 3917 close: function(event) { 3918 event.stopPropagation(); 3919 }, 3925 open: function(event, ui) 3926 { 3927 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 3928 }, 3929 close: function(event, ui) 3930 { 3931 event.stopPropagation(); 3932 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 3933 }, 3920 3934 closeOnEscape: true 3921 3935 }); … … 4035 4049 $( this ).dialog( "close" ); 4036 4050 } 4037 } 4051 }, 4052 close:function(event, ui) 4053 { 4054 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 4055 }, 4056 open: function(event, ui) 4057 { 4058 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 4059 } 4038 4060 }); 4039 4061 $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar"); -
branches/2.4/expressoMail1_2/js/search.js
r6754 r6931 107 107 //$(this).dialog("destroy"); 108 108 $('fieldset', div).remove(); 109 } 109 }, 110 close:function(event, ui) 111 { 112 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 113 }, 114 open: function(event, ui) 115 { 116 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 117 } 110 118 }); 111 119 … … 1599 1607 if( this.divElement != null ) 1600 1608 { 1601 $(this.divElement.parentNode).dialog(" destroy");1609 $(this.divElement.parentNode).dialog("close").dialog("destroy"); 1602 1610 this.modal.dialog("close"); 1603 1611 this.divElement.parentNode.removeChild(this.divElement); -
branches/2.4/expressoMail1_2/js/sharemailbox.js
r6884 r6931 206 206 beforeClose : function() 207 207 { 208 $(this).dialog("destroy");209 208 div.removeChild(div.firstChild); 210 } 209 }, 210 close:function(event, ui) 211 { 212 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 213 $(this).dialog("destroy"); 214 }, 215 open: function(event, ui) 216 { 217 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 218 } 211 219 }); 212 220 -
branches/2.4/expressoMail1_2/js/shortcut.js
r6754 r6931 7 7 shortcut = { 8 8 'all_shortcuts':{},//All the shortcuts are stored in this array 9 'disabled': false, 9 10 'add': function(shortcut_combination,callback,opt) { 10 11 //Provide a set of default options … … 41 42 } 42 43 44 if(shortcut.disabled === true) 45 return; 43 46 //Find Which key is pressed 44 47 if (e.keyCode) code = e.keyCode; -
branches/2.4/expressoMail1_2/js/wfolders.js
r5874 r6931 48 48 click : function() 49 49 { 50 winSaveFile.dialog(" destroy");50 winSaveFile.dialog("close"),dialog("destroy"); 51 51 } 52 52 }, … … 81 81 } 82 82 83 winSaveFile.dialog(" destroy");83 winSaveFile.dialog("close").dialog("destroy"); 84 84 } 85 85 } 86 ] 86 ], 87 close:function(event, ui) 88 { 89 if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 90 }, 91 open: function(event, ui) 92 { 93 if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 94 } 87 95 }); 88 96
Note: See TracChangeset
for help on using the changeset viewer.