Changeset 7373 for sandbox/2.5.0-expresso1/expressoMail1_2/js
- Timestamp:
- 10/09/12 09:36:06 (12 years ago)
- Location:
- sandbox/2.5.0-expresso1/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.0-expresso1/expressoMail1_2/js/MAExpressoPattern.js
r7146 r7373 1312 1312 if(taglist != null){ 1313 1313 var tagdata = ""; 1314 var flag_draft = false;1314 //var flag_draft = false; 1315 1315 1316 1316 //first message to tag data 1317 1317 if(expresso_mail_archive.taglist == ""){ 1318 //Draft folder, are "draft" 1318 1319 //Marcosw inicio - código comentado para evitar inconsistência de flags quando mensagens passam pela pasta rascunhos 1320 /* 1321 Draft folder, are "draft" 1319 1322 if(expresso_mail_archive.folder_destination == 'drafts'){ 1320 1323 flag_draft = true; … … 1368 1371 } 1369 1372 else 1370 tagdata += '<remove value="draft"/>'; 1371 1373 tagdata += '<remove value="draft"/>'; 1374 */ 1375 //Marcosw fim 1376 1372 1377 //Trash folder, are "deleted"" 1373 1378 if(expresso_mail_archive.folder_destination == 'trash'){ … … 1377 1382 tagdata += '<remove value="deleted"/>'; 1378 1383 1379 if(!flag_draft){ 1380 var action; 1381 if (op == 0) 1382 action = 'add'; 1383 else 1384 action = 'remove'; 1385 1386 //object data -used at archieve op 1387 if (typeof(taglist) == 'object'){ 1388 for(var x in taglist[0]){ 1389 if (x != 'importance'){ 1390 if(( x != 'unseen') && ( x != 'answered')){ 1391 if((taglist[0][x] != '') && (taglist[0][x] != ' ') && (taglist[0][x] != null) && (x != 'msgid')) 1392 tagdata += '<'+action+' value="'+x+'"/>'; 1393 } 1394 else{ 1395 if( x == 'unseen'){ 1396 if (taglist[0][x] == ' ') 1397 tagdata += '<'+action+' value="seen"/>'; 1398 else 1399 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1400 tagdata += '<'+action+' value="unseen"/>'; 1401 } 1402 if( x == 'answered'){ 1403 if (taglist[0][x] == ' ') 1404 tagdata += '<'+action+' value="unanswered"/>'; 1405 else 1406 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1407 tagdata += '<'+action+' value="answered"/>'; 1408 } 1409 } 1384 //Marcosw inicio - código comentado para evitar inconsistência de flags quando mensagens passam pela pasta rascunhos 1385 //if(!flag_draft){ 1386 //Marcosw fim 1387 1388 var action; 1389 if (op == 0) 1390 action = 'add'; 1391 else 1392 action = 'remove'; 1393 1394 //object data -used at archieve op 1395 if (typeof(taglist) == 'object'){ 1396 for(var x in taglist[0]){ 1397 if (x != 'importance'){ 1398 if(( x != 'unseen') && ( x != 'answered')){ 1399 if((taglist[0][x] != '') && (taglist[0][x] != ' ') && (taglist[0][x] != null) && (x != 'msgid')) 1400 tagdata += '<'+action+' value="'+x+'"/>'; 1410 1401 } 1411 1402 else{ 1412 if((taglist[0][x] != '') && (taglist[0][x] != ' ')){ 1413 switch (taglist[0][x].toLowerCase()){ 1414 case 'high': 1415 tagdata += '<'+action+' value="importance_high"/>'; 1416 tagdata += '<'+action+' value="flagged"/>'; 1417 break; 1418 default: 1419 tagdata += '<'+action+' value="importance_normal"/>'; 1420 tagdata += '<'+action+' value="unflagged"/>'; 1421 break; 1422 } 1423 1424 } 1425 //if no importance data received, defaults is "Normal" 1426 else{ 1427 tagdata += '<add value="importance_normal"/>'; 1428 tagdata += '<add value="unflagged"/>'; 1429 } 1403 if( x == 'unseen'){ 1404 if (taglist[0][x] == ' ') 1405 tagdata += '<'+action+' value="seen"/>'; 1406 else 1407 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1408 tagdata += '<'+action+' value="unseen"/>'; 1409 } 1410 if( x == 'answered'){ 1411 if (taglist[0][x] == ' ') 1412 tagdata += '<'+action+' value="unanswered"/>'; 1413 else 1414 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1415 tagdata += '<'+action+' value="answered"/>'; 1416 } 1430 1417 } 1431 1418 } 1432 } 1433 //string data - used to tag a message when reading it (unseen and important, by now) 1434 else{ 1435 if(taglist.indexOf(",") != -1){ 1436 var vet_tags = taglist.split(","); 1437 for(var k=0; k<vet_tags.length; k++){ 1438 tagdata += '<'+action+' value="'+vet_tags[k]+'"/>'; 1439 } 1440 } 1441 else 1442 tagdata += '<'+action+' value="'+taglist+'"/>'; 1443 } 1444 } 1419 else{ 1420 if((taglist[0][x] != '') && (taglist[0][x] != ' ')){ 1421 switch (taglist[0][x].toLowerCase()){ 1422 case 'high': 1423 tagdata += '<'+action+' value="importance_high"/>'; 1424 tagdata += '<'+action+' value="flagged"/>'; 1425 break; 1426 default: 1427 tagdata += '<'+action+' value="importance_normal"/>'; 1428 tagdata += '<'+action+' value="unflagged"/>'; 1429 break; 1430 } 1431 1432 } 1433 //if no importance data received, defaults is "Normal" 1434 else{ 1435 tagdata += '<add value="importance_normal"/>'; 1436 tagdata += '<add value="unflagged"/>'; 1437 } 1438 } 1439 } 1440 } 1441 //string data - used to tag a message when reading it (unseen and important, by now) 1442 else{ 1443 if(taglist.indexOf(",") != -1){ 1444 var vet_tags = taglist.split(","); 1445 for(var k=0; k<vet_tags.length; k++){ 1446 tagdata += '<'+action+' value="'+vet_tags[k]+'"/>'; 1447 } 1448 } 1449 else 1450 tagdata += '<'+action+' value="'+taglist+'"/>'; 1451 } 1452 1453 //Marcosw inicio - código comentado para evitar inconsistência de flags quando mensagens passam pela pasta rascunhos 1454 //} 1455 //Marcosw fim 1456 1445 1457 if(tagdata != ""){ 1446 1458 var tobject = '<tag>' … … 1457 1469 var endpoint = expresso_mail_archive.taglist.lastIndexOf("<"); 1458 1470 1459 //Draft folder, are "draft" 1471 //Marcosw inicio - código comentado para evitar inconsistência de flags quando mensagens passam pela pasta rascunhos 1472 /* 1473 Draft folder, are "draft" 1460 1474 if(expresso_mail_archive.folder_destination == 'drafts'){ 1461 1475 flag_draft = true; … … 1514 1528 else 1515 1529 tagdata += '<remove value="draft"/>'; 1516 1530 */ 1531 //Marcosw fim 1532 1517 1533 //Trash folder, are "deleted"" 1518 1534 if(expresso_mail_archive.folder_destination == 'trash'){ … … 1522 1538 tagdata += '<remove value="deleted"/>'; 1523 1539 1524 if(!flag_draft){ 1525 var action; 1526 if (op == 0) 1527 action = 'add'; 1540 //Marcosw inicio - código comentado para evitar inconsistência de flags quando mensagens passam pela pasta rascunhos 1541 //if(!flag_draft){ 1542 //Marcosw fim 1543 1544 var action; 1545 if (op == 0) 1546 action = 'add'; 1547 else 1548 action = 'remove'; 1549 1550 //object data -used at archieve op 1551 if (typeof(taglist) == 'object'){ 1552 for(var x in taglist[0]){ 1553 if (x != 'importance'){ 1554 if(( x != 'unseen') && ( x != 'answered')){ 1555 if((taglist[0][x] != '') && (taglist[0][x] != ' ') && (taglist[0][x] != null) && (x != 'msgid')) 1556 tagdata += '<'+action+' value="'+x+'"/>'; 1557 } 1558 1559 else{ 1560 if( x == 'unseen'){ 1561 if (taglist[0][x] == ' ') 1562 tagdata += '<'+action+' value="seen"/>'; 1563 else 1564 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1565 tagdata += '<'+action+' value="unseen"/>'; 1566 } 1567 if( x == 'answered'){ 1568 if (taglist[0][x] == ' ') 1569 tagdata += '<'+action+' value="unanswered"/>'; 1570 else 1571 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1572 tagdata += '<'+action+' value="answered"/>'; 1573 } 1574 } 1575 } 1576 else{ 1577 if((taglist[0][x] != '') && (taglist[0][x] != ' ')){ 1578 switch (taglist[0][x].toLowerCase()){ 1579 case 'important': 1580 tagdata += '<'+action+' value="importance_high"/>'; 1581 tagdata += '<'+action+' value="flagged"/>'; 1582 break; 1583 default: 1584 tagdata += '<'+action+' value="importance_normal"/>'; 1585 tagdata += '<'+action+' value="unflagged"/>'; 1586 break; 1587 } 1588 1589 } 1590 //if no importance data received, defaults is "Normal" 1591 else{ 1592 tagdata += '<add value="importance_normal"/>'; 1593 tagdata += '<add value="unflagged"/>'; 1594 } 1595 } 1596 } 1597 } 1598 //string data - used to tag a message 1599 else{ 1600 if(taglist.indexOf(",") != -1){ 1601 var vet_tags = taglist.split(","); 1602 for(var k=0; k<vet_tags.length; k++){ 1603 tagdata += '<'+action+' value="'+vet_tags[k]+'"/>'; 1604 } 1605 } 1528 1606 else 1529 action = 'remove'; 1530 1531 //object data -used at archieve op 1532 if (typeof(taglist) == 'object'){ 1533 for(var x in taglist[0]){ 1534 if (x != 'importance'){ 1535 if(( x != 'unseen') && ( x != 'answered')){ 1536 if((taglist[0][x] != '') && (taglist[0][x] != ' ') && (taglist[0][x] != null) && (x != 'msgid')) 1537 tagdata += '<'+action+' value="'+x+'"/>'; 1538 } 1539 1540 else{ 1541 if( x == 'unseen'){ 1542 if (taglist[0][x] == ' ') 1543 tagdata += '<'+action+' value="seen"/>'; 1544 else 1545 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1546 tagdata += '<'+action+' value="unseen"/>'; 1547 } 1548 if( x == 'answered'){ 1549 if (taglist[0][x] == ' ') 1550 tagdata += '<'+action+' value="unanswered"/>'; 1551 else 1552 if((taglist[0][x] != '') && (taglist[0][x] != null)) 1553 tagdata += '<'+action+' value="answered"/>'; 1554 } 1555 } 1556 1557 1558 1559 } 1560 else{ 1561 if((taglist[0][x] != '') && (taglist[0][x] != ' ')){ 1562 switch (taglist[0][x].toLowerCase()){ 1563 case 'important': 1564 tagdata += '<'+action+' value="importance_high"/>'; 1565 tagdata += '<'+action+' value="flagged"/>'; 1566 break; 1567 default: 1568 tagdata += '<'+action+' value="importance_normal"/>'; 1569 tagdata += '<'+action+' value="unflagged"/>'; 1570 break; 1571 } 1572 1573 } 1574 //if no importance data received, defaults is "Normal" 1575 else{ 1576 tagdata += '<add value="importance_normal"/>'; 1577 tagdata += '<add value="unflagged"/>'; 1578 } 1579 } 1580 } 1581 } 1582 //string data - used to tag a message 1583 else{ 1584 if(taglist.indexOf(",") != -1){ 1585 var vet_tags = taglist.split(","); 1586 for(var k=0; k<vet_tags.length; k++){ 1587 tagdata += '<'+action+' value="'+vet_tags[k]+'"/>'; 1588 } 1589 } 1590 else 1591 tagdata += '<'+action+' value="'+taglist+'"/>'; 1592 } 1593 } 1607 tagdata += '<'+action+' value="'+taglist+'"/>'; 1608 } 1609 1610 //Marcosw inicio - código comentado para evitar inconsistência de flags quando mensagens passam pela pasta rascunhos 1611 //} 1612 //Marcosw fim 1594 1613 1595 1614 if(tagdata != ""){ -
sandbox/2.5.0-expresso1/expressoMail1_2/js/messages_controller.js
r7340 r7373 275 275 else{ 276 276 //user has preference to "save" delete messasge on trash folder, so move it to there 277 if (((preferences.save_deleted_msg == true)) && (folder != expresso_mail_archive.specialfolders.trash)){ 277 //Marcosw inicio - removido "messages_" da string folder para evitar inconsistência 278 if (((preferences.save_deleted_msg == true)) && (folder.replace('messages_','') != expresso_mail_archive.specialfolders.trash)){ 279 //Marcosw fim 278 280 expresso_mail_archive.createFolder("","Trash"); 279 281 expresso_mail_archive.folder_destination = 'trash';
Note: See TracChangeset
for help on using the changeset viewer.