Changeset 5542
- Timestamp:
- 02/24/12 09:23:33 (12 years ago)
- Location:
- trunk/prototype/modules/filters
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/filters/edit-filter.ejs
r5539 r5542 96 96 <input type="radio" name="actionType[]" value="fileinto" /> 97 97 <label>Arquivar na pasta</label> 98 <!-- 99 Aguardando o problema do form do DataLayer ser resolvido. 100 --> 98 101 <select name="valueFileInto"> 99 <option value="INBOX">Caixa de entrada</option> 100 <option value="INBOX/Sent">Enviados</option> 102 <%for(var i=0; i < data.folders.length; i++){ 103 if(/^INBOX/.test(data.folders[i].id)){ %> 104 <option value="<%= data.folders[i].id%>"><%= data.folders[i].commonName%></option> 105 <% 106 } 107 } 108 %> 101 109 </select> 102 110 <!-- <input type="text" name="actionParameter[]" /> --> … … 110 118 <input type="radio" name="actionType[]" value="setflag" /> 111 119 <label>Marcar como</label> 120 <!-- 121 Aguardando o problema do form do DataLayer ser resolvido. 122 --> 112 123 <select name="valueSetFlag"> 113 124 <option value="flagged">Importante</option> -
trunk/prototype/modules/filters/filters.js
r5539 r5542 219 219 /* 220 220 var raster = function( html ){ 221 //alert("método raster\nParâmetro a seguir"); 222 //alert(html); 221 223 container = $('body.expressomail-module-container').append( html ).find(".expresso-window-container"); 224 //alert("método raster 1"); 225 //alert(container); 222 226 list_container = container.find(".rule-list-container"); 227 //alert("método raster 2"); 223 228 details_container = container.find(".rule-details-container"); 229 //alert("método raster 3"); 224 230 vacation_container = container.find(".vacation-details-container"); 231 //alert("método raster 4"); 225 232 form = container.find("form"); 226 233 234 //alert("método raster 5"); 227 235 criterias = details_container.find( 'fieldset input[name="criteriaType[]"]' ); 236 //alert("método raster 6"); 228 237 actions = details_container.find( 'fieldset input[name="actionType[]"]' ); 238 //alert("método raster 7"); 229 239 nameObj = details_container.find( 'input[name="name"]' ); 240 //alert("método raster 8"); 230 241 isExact = details_container.find( 'input[name="isExact"]' ); 242 //alert("método raster 9"); 231 243 formatter(); 244 //alert("método raster 10"); 232 245 container = container.dialog({ 233 246 width:700, … … 250 263 autoOpen: false 251 264 }); 265 //alert("método raster 11"); 252 266 details_container.accordion({autoHeight: false}); 253 267 268 //alert("método raster 12"); 254 269 DataLayer.render( BASE_PATH + 'api/templates/folderselect.ejs', 'folder:select', function( html ){ 255 270 details_container.find(".select-folderlist").append( html ); 256 271 }); 257 272 273 //alert("método raster 13"); 258 274 container.find(".button").button() 259 275 … … 283 299 284 300 }); 301 //alert("método raster 14"); 285 302 details_container.find( ".menu-container" ) 286 303 … … 421 438 422 439 }); 440 //alert("método raster 15"); 423 441 vacation_container.find( ".menu-container" ) 424 442 .find(".button.back").click(function(event){ … … 438 456 return( false ); 439 457 }); 458 //alert("método raster 16"); 440 459 } 441 460 … … 603 622 //var vamo_ver = DataLayer.render(BASE_PATH + 'modules/filters/filters.ejs', {}); 604 623 //raster(vamo_ver); 624 //alert(vamo_ver); 605 625 var v = DataLayer.render( BASE_PATH + 'modules/filters/filters.ejs', {}); 606 626 raster(v); … … 615 635 DataLayer.render( BASE_PATH + 'modules/filters/filter-list.ejs', 'filter:detail', reraster ); 616 636 //var v = DataLayer.get("filter:detail"); 637 638 //alert(v); 617 639 // ------------------------------------------------------------ 618 640 // ------------------------------------------------------------ … … 683 705 } 684 706 } 685 686 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', {},function(html){ 707 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', {folders : DataLayer.get("folder", true)},function(html){ 687 708 var details_container = $(".expresso-window-filters").html(html); 688 form = container.find("form"); 689 criterias = details_container.find( 'fieldset input[name="criteriaType[]"]' ); 690 actions = details_container.find( 'fieldset input[name="actionType[]"]' ); 691 nameObj = details_container.find( 'input[name="name"]' ); 692 isExact = details_container.find( 'input[name="isExact"]' ); 693 showDetails(filters); 694 var accord = $(".rule-details-container").accordion({autoHeight: false}); 695 $(".button").button().filter(".forth").click(function(){ 696 accord.accordion('activate',1); 697 }).end().filter(".back").click(function(){ 698 accord.accordion('activate',0); 699 }).end().filter(".cancel").click(function(){ 700 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 701 }).end().filter(".submit").click(function(){ 702 if(nameObj) 703 nameObj.attr("disabled", "false"); 704 $(this).submit(); 705 DataLayer.commit( 'filter' ); 706 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 707 }); 709 if(filters.name != "vacation"){ 710 form = container.find("form"); 711 criterias = details_container.find( 'fieldset input[name="criteriaType[]"]' ); 712 actions = details_container.find( 'fieldset input[name="actionType[]"]' ); 713 nameObj = details_container.find( 'input[name="name"]' ); 714 isExact = details_container.find( 'input[name="isExact"]' ); 715 showDetails(filters); 716 var accord = $(".rule-details-container").accordion({autoHeight: false}); 717 $(".button").button().filter(".forth").click(function(){ 718 accord.accordion('activate',1); 719 }).end().filter(".back").click(function(){ 720 accord.accordion('activate',0); 721 }).end().filter(".cancel").click(function(){ 722 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 723 }).end().filter(".submit").click(function(){ 724 if(nameObj) 725 nameObj.attr("disabled", "false"); 726 $(this).submit(); 727 DataLayer.commit( 'filter' ); 728 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 729 }); 730 }else{ 731 $(".vacation-details-container").removeClass("hidden"); 732 $(".rule-details-container").addClass("hidden"); 733 $(".button").button().filter(".back").click(function(){ 734 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 735 }).end().filter(".submit").click(function(){ 736 $(this).submit(); 737 DataLayer.commit( 'filter' ); 738 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 739 }); 740 details_container.find('[name="vacation"]').val(filters.actions[0].parameter); 741 } 708 742 }); 709 743 }).end() … … 749 783 $(".button.add:first").click(function(){ 750 784 $(".dialog-head-buttonpane").addClass("hidden"); 751 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', { },function(html){785 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', {folders : DataLayer.get("folder", true)},function(html){ 752 786 $(".expresso-window-filters").html(html); 753 787 var accord = $(".rule-details-container").accordion({autoHeight: false}); … … 768 802 $(".button.add.vacation").click(function(){ 769 803 $(".dialog-head-buttonpane").addClass("hidden"); 770 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', { },function(html){804 DataLayer.render( BASE_PATH + 'modules/filters/edit-filter.ejs', {folders : DataLayer.get("folder", true)},function(html){ 771 805 $(".expresso-window-filters").html(html); 772 806 $(".vacation-details-container").removeClass("hidden");
Note: See TracChangeset
for help on using the changeset viewer.