Changeset 5548 for trunk/prototype/modules/mail/js
- Timestamp:
- 02/24/12 15:37:35 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/mail/js/followupflag.js
r5547 r5548 275 275 var alarmDate = false; 276 276 var doneDate = false; 277 277 var folder_name; 278 var folders = []; 279 var messages = []; 278 280 for (var i=0; i < selectedMessageIds.length; i++ ){ 281 if (currentTab == 0) { 282 folder_name = current_folder; 283 }else{ 284 var id_border = currentTab.replace(/[a-zA-Z_]+/, ""); 285 var tr = Element(selectedMessageIds[i]+'_s'+id_border); 286 folder_name = tr.getAttribute('name'); 287 } 279 288 var messageNumber = selectedMessageIds[i]; 289 folders.push(folder_name); 290 280 291 //var followupflag = DataLayer.get('followupflag', followupflagId.toString()), 281 292 var idFollowupflagged = winElement.find('.id-followup').val(); … … 283 294 uid : User.me.id, 284 295 followupflagId : followupflagId, 285 folderName : current_folder,296 folderName : folder_name, 286 297 messageNumber : messageNumber, 287 298 //alarmDeadline : winElement.find('[name="alarmDate"]').datepicker("getDate"), … … 313 324 314 325 $('#td_message_followup_' + messageNumber + ', ' + 315 '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 316 326 '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 317 327 DataLayer.put('followupflagged', followupflagged); 318 328 } … … 322 332 winElement.find('.id-followup').val(id); 323 333 }); 324 325 //onceOpenedHeadersMessages[current_folder][followupflagged.messageNumber]['followupflagged']['followupflag'] = {};326 334 var extend = DataLayer.get('followupflagged', { 327 filter: ['AND', ['IN', 'messageNumber', selectedMessageIds], [' =', 'folderName', current_folder]],criteria: {deepness: 1}});335 filter: ['AND', ['IN', 'messageNumber', selectedMessageIds], ['IN', 'folderName', folders]],criteria: {deepness: 1}}); 328 336 if(extend != "" || extend != 'undefined' || extend != []){ 329 337 for(var ex = 0; ex < extend.length; ex++){ 330 onceOpenedHeadersMessages[current_folder][extend[ex].messageNumber]['followupflagged'] = {}; 331 DataLayer.merge(onceOpenedHeadersMessages[current_folder][extend[ex].messageNumber]['followupflagged'], extend[ex]); 338 if(onceOpenedHeadersMessages[extend[ex].folderName]){ 339 if(onceOpenedHeadersMessages[extend[ex].folderName][extend[ex].messageNumber]){ 340 onceOpenedHeadersMessages[extend[ex].folderName][extend[ex].messageNumber]['followupflagged'] = {}; 341 DataLayer.merge(onceOpenedHeadersMessages[extend[ex].folderName][extend[ex].messageNumber]['followupflagged'], extend[ex]); 342 } 343 } 344 332 345 } 333 346 } else { … … 338 351 .filter('.menu-configure-followupflag .delete').click(function(){ 339 352 for(i = 0; i < selectedMessageIds.length; i++){ 353 var folder_name; 354 if (currentTab == 0) { 355 folder_name = current_folder; 356 }else{ 357 var id_border = currentTab.replace(/[a-zA-Z_]+/, ""); 358 var tr = Element(selectedMessageIds[i]+'_s'+id_border); 359 folder_name = tr.getAttribute('name'); 360 } 340 361 var messageNumber = selectedMessageIds[i]; 341 var flag_id = onceOpenedHeadersMessages[current_folder][messageNumber]['followupflagged'].id; 342 var flagged = $('#td_message_followup_' + messageNumber + ', ' + '#td_message_followup_search_' + messageNumber).find(".flag-edited"); 343 DataLayer.remove('followupflagged', flag_id); 344 flagged.css("background", '#cccccc'); 345 flagged.find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 362 if(onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged']){ 363 var flag_id = onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id; 364 DataLayer.remove('followupflagged', flag_id); 365 $('#td_message_followup_' + messageNumber + ', ' + 366 '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC'); 367 $('#td_message_followup_' + messageNumber + ', ' + 368 '#td_message_followup_search_' + messageNumber).find(".flag-edited") 369 .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 370 } 346 371 } 347 372 DataLayer.commit();
Note: See TracChangeset
for help on using the changeset viewer.