Changeset 5664 for trunk/prototype/modules/mail/js/followupflag.js
- Timestamp:
- 03/07/12 16:01:39 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/mail/js/followupflag.js
r5660 r5664 165 165 var saveFollowupflagged = function(){ 166 166 var idFollowupflagged = winElement.find('[name="followupflagId"]').val(); 167 if(idFollowupflagged.length > 0){ 168 idFollowupflagged = idFollowupflagged.split(','); 169 } else { 170 idFollowupflagged = false; 167 idFollowupflagged = idFollowupflagged.split(','); 168 for(x=0; x<idFollowupflagged.length; x++){ 169 (idFollowupflagged[x] == "false") ? idFollowupflagged[x] = false : idFollowupflagged; 171 170 } 172 171 for(i=0; i<selectedMessageIds.length; i++){ … … 197 196 isDone: isDone, 198 197 backgroundColor : backgroundColor 199 }, !!idFollowupflagged ? {id: idFollowupflagged[i]} : {});198 }, !!idFollowupflagged[i] ? {id: idFollowupflagged[i]} : {}); 200 199 201 200 if (alarmDate = winElement.find('[name="alarmDate"]').datepicker("getDate")) { … … 243 242 followupflags = DataLayer.get('followupflagged',{criteria:{order: 'id'}}, true); 244 243 var id = followupflags[followupflags.length - 1].id; 245 winElement.find('[name="followupflagId"]').val(id );244 winElement.find('[name="followupflagId"]').val(idFollowupflagged[i]); 246 245 winElement.find('.menu-configure-followupflag .delete').button("option", "disabled", false); 247 246 updateCacheFollowupflag(selectedMessageIds, folders, true); … … 291 290 if(current_folder == folder_name){ 292 291 $('#td_message_followup_' + messageNumber + ', ' + 293 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC') .attr('title', '');;292 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC'); 294 293 $('#td_message_followup_' + messageNumber + ', ' + 295 294 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited") 296 295 .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 297 296 }else{ 298 $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC') .attr('title', '');;297 $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC'); 299 298 $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited") 300 299 .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); … … 429 428 if (!it.enable) continue; 430 429 431 var alarmInRange = DataLayer.get('followupflagged', {filter: ['AND', ['>', it.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).toString('yyyy-MM-dd 00:00:00')], ['<', it.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).addHours(24).toString('yyyy-MM-dd 00:00:00')]], criteria: {deepness: 1}});430 var alarmInRange = DataLayer.get('followupflagged', {filter: ['AND', ['>', it.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).toString('yyyy-MM-dd 00:00:00')], ['<', toIterate.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).addHours(24).toString('yyyy-MM-dd 00:00:00')]], criteria: {deepness: 1}}); 432 431 if(alarmInRange.length > 0){ 433 432 for(var i=0; i<alarmInRange.length; i++){ 434 433 var date = Date.parseExact(alarmInRange[i].alarmDeadline, 'yyyy-MM-dd hh:mm:ss'); 435 if(date) 436 alarmInRange[i].alarmDeadline = date.toString('hh:mm'); 434 alarmInRange[i].alarmDeadline = date.toString('hh:mm'); 437 435 } 438 436 var caption = (alarmInRange.length == 1) ? … … 459 457 'vcenter_short_message': false, 460 458 'position': ['right - 20', 'bottom - ' + offsetHeight.toString() ], 461 'custom_class': 'right-bottom followupflag-alarm' 459 'custom_class': 'right-bottom followupflag-alarm', 462 460 }).dialog; 463 461
Note: See TracChangeset
for help on using the changeset viewer.