Changeset 5598
- Timestamp:
- 03/01/12 14:27:27 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/filters/filters.js
r5591 r5598 1 1 valid_save = function(){ 2 if( $('[name="name"]').attr("disabled") != "disabled")2 if(list_container.find('[name="name"]').attr("disabled") != "disabled") 3 3 { 4 if($.trim( $('[name="name"]').val()) == ""){4 if($.trim(list_container.find('[name="name"]').val()) == ""){ 5 5 alert("Nenhum nome preenchido"); 6 6 return false; 7 }else if($.trim( $('[name="name"]').val()) == "vacation"){7 }else if($.trim(list_container.find('[name="name"]').val()) == "vacation"){ 8 8 alert("Nome inválido, 'vacation' é uma palavra reservada"); 9 9 return false; … … 12 12 var error = false; 13 13 $.each(filter_list, function(index, value){ 14 if(filter_list[index].name == $('[name="name"]').val()){14 if(filter_list[index].name == list_container.find('[name="name"]').val()){ 15 15 alert("já existe um filtro com este nome"); 16 16 error = true; … … 24 24 } 25 25 var criteria = ""; 26 var criteria_list = $('[name="criteriaValue[]"]');26 var criteria_list = list_container.find('[name="criteriaValue[]"]'); 27 27 $.each(criteria_list, function(index, value){ 28 28 criteria += $.trim($(criteria_list[index]).val()); … … 32 32 return false; 33 33 } 34 if( $('[name="actionType[]"]:checked').parent().find("input:text, textarea").length){35 if($.trim( $('[name="actionType[]"]:checked').parent().find("input:text, textarea").val()) == ""){34 if(list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").length){ 35 if($.trim(list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").val()) == ""){ 36 36 alert("Preencha o valor da ação"); 37 37 return false; … … 655 655 close:function(event, ui) { 656 656 event.stopPropagation(); 657 if($(".cancel").length) 658 $(".cancel").trigger('click'); 659 //DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 657 if(list_container.find(".cancel").length) 658 list_container.find(".cancel").trigger('click'); 660 659 }, 661 660 open: function () { … … 680 679 681 680 $(".ui-dialog-buttonpane.ui-widget-content").css("background-color", "#E0EEEE"); 682 var zu= DataLayer.render( BASE_PATH + 'modules/filters/filter-list.ejs', DataLayer.get("filter:detail", true));683 list_container.html( zu).find(".button").button();681 var list = DataLayer.render( BASE_PATH + 'modules/filters/filter-list.ejs', DataLayer.get("filter:detail", true)); 682 list_container.html(list).find(".button").button(); 684 683 685 684 list_container.find(".rule-list").selectable({ … … 692 691 }); 693 692 694 $( ".menu-control .button" ).filter(".update").button({693 list_container.find( ".menu-control .button" ).filter(".update").button({ 695 694 icons: { 696 695 primary: "ui-icon-pencil" … … 715 714 isExact = details_container.find( 'input[name="isExact"]' ); 716 715 showDetails(filters); 717 var accord = $(".rule-details-container").accordion({autoHeight: false});718 $(".button").button().filter(".forth").click(function(){716 var accord = list_container.find(".rule-details-container").accordion({autoHeight: false}); 717 list_container.find(".button").button().filter(".forth").click(function(){ 719 718 accord.accordion('activate',1); 720 719 }).end().filter(".back").click(function(){ … … 733 732 }); 734 733 }else{ 735 $(".vacation-details-container").removeClass("hidden");736 $(".rule-details-container").addClass("hidden");737 $(".button").button().filter(".back").click(function(){734 list_container.find(".vacation-details-container").removeClass("hidden"); 735 list_container.find(".rule-details-container").addClass("hidden"); 736 list_container.find(".button").button().filter(".back").click(function(){ 738 737 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 739 738 }).end().filter(".submit").click(function(){ … … 785 784 }).end().removeClass("ui-button-icon-only"); 786 785 787 $(".button.add:first").click(function(){788 $(".dialog-head-buttonpane").addClass("hidden");786 list_container.parent().find(".button.add:first").click(function(){ 787 list_container.parent().find(".dialog-head-buttonpane").addClass("hidden"); 789 788 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', {folders : DataLayer.get("folder", true)},function(html){ 790 $(".expresso-window-filters").html(html);791 var accord = $(".rule-details-container").accordion({autoHeight: false});792 $(".button").button().filter(".forth").click(function(){789 list_container.html(html); 790 var accord = list_container.find(".rule-details-container").accordion({autoHeight: false}); 791 list_container.find(".button").button().filter(".forth").click(function(){ 793 792 accord.accordion('activate',1); 794 793 }).end().filter(".back").click(function(){ … … 806 805 }); 807 806 }); 808 $(".button.add.vacation").click(function(){809 $(".dialog-head-buttonpane").addClass("hidden");807 list_container.parent().find(".button.add.vacation").click(function(){ 808 list_container.parent().find(".dialog-head-buttonpane").addClass("hidden"); 810 809 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', {folders : DataLayer.get("folder", true)},function(html){ 811 $(".expresso-window-filters").html(html);812 $(".vacation-details-container").removeClass("hidden");813 $(".rule-details-container").addClass("hidden");814 $(".button").button().filter(".back").click(function(){810 list_container.html(html); 811 list_container.find(".vacation-details-container").removeClass("hidden"); 812 list_container.find(".rule-details-container").addClass("hidden"); 813 list_container.find(".button").button().filter(".back").click(function(){ 815 814 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 816 815 }).end().filter(".submit").click(function(){
Note: See TracChangeset
for help on using the changeset viewer.