Commit 5f24ae0bbcd43254691798f949ceb8fe752ac557

  • avatar
  • dBsooner's Stuff <dbsooner @del…ge.vision5.com>
  • Fri Mar 05 23:59:33 CET 2010
3 Ported, 2 updated.
email/email-replies-forwards-multi-mod.patch
(108 / 0)
  
1diff --git a/usr/palm/applications/com.palm.app.email/app/controllers/compose-assistant.js b/usr/palm/applications/com.palm.app.email/app/controllers/compose-assistant.js
2index e4f2e91..0df6e82 100644
3--- a/usr/palm/applications/com.palm.app.email/app/controllers/compose-assistant.js
4+++ b/usr/palm/applications/com.palm.app.email/app/controllers/compose-assistant.js
5@@ -1212,6 +1212,6 @@ ComposeAssistant.replaceURIs = function(originalText, email) {
6 ComposeAssistant.kForwardAction = 'forward';
7 ComposeAssistant.kAppMenuHighPriority = $L('Set as High Priority');
8 ComposeAssistant.kAppMenuNormalPriority = $L('Set as Normal Priority');
9-ComposeAssistant.kEmptySignatureRegex = /<span id="signature"><div style="font-family: arial, sans-serif; font-size: 12px;color: #999999;">[<br>]*<\/div>[<br>]*<\/span>/
10+ComposeAssistant.kEmptySignatureRegex = /<span id="signature"><div style="font-family: Calibri, sans-serif; font-size: 15px;color: #999999;"><\/span>/
11 ComposeAssistant.kForwardDraftDelimeter = "<span id='FORWARD_DRAFT_TEXT' class='display:none'></span>";
12
13diff --git a/usr/palm/applications/com.palm.app.email/app/models/Email.js b/usr/palm/applications/com.palm.app.email/app/models/Email.js
14index 7a69e15..55f2e79 100644
15--- a/usr/palm/applications/com.palm.app.email/app/models/Email.js
16+++ b/usr/palm/applications/com.palm.app.email/app/models/Email.js
17@@ -159,7 +159,7 @@ var Email = Class.create({
18 if (r.displayName === r.address)
19 toStr = r.displayName;
20 else
21- toStr = "#{displayName} <#{address}>".interpolate(r);
22+ toStr = "#{displayName}".interpolate(r);
23 toAddressList.push(toStr);
24 }
25 } else if (r.role === EmailRecipient.roleCc) {
26@@ -168,7 +168,7 @@ var Email = Class.create({
27 if (r.displayName === r.address)
28 ccStr = r.displayName;
29 else
30- ccStr = "#{displayName} <#{address}>".interpolate(r);
31+ ccStr = "#{displayName}".interpolate(r);
32 ccAddressList.push(ccStr);
33 }
34 }
35@@ -180,17 +180,16 @@ var Email = Class.create({
36 this.text += $L("<b>From:</b> ") + "#{displayName}".interpolate(fromObj).escapeHTML() + "<br/>";
37 }
38 else {
39- this.text += $L("<b>From:</b> ") + "#{displayName} <#{address}>".interpolate(fromObj).escapeHTML() + "<br/>"
40+ this.text += $L("<b>From:</b> ") + "#{displayName}".interpolate(fromObj).escapeHTML() + "<br/>"
41 };
42- this.text += $L("<b>Date:</b> ") + Mojo.Format.formatDate(new Date(parseInt(original.timeStamp)), {date:'medium', time:'short'}) + "<br/>";
43- this.text += $L("<b>Subject:</b> #{summary}").interpolate(original) + "<br/>";
44+ this.text += $L("<b>Sent:</b> ") + Mojo.Format.formatDate(new Date(parseInt(original.timeStamp)), {date:'full', time:'short'}) + "<br/>";
45 if (toAddressList.length > 0) {
46 this.text += $L("<b>To:</b> ") + "#{list}".interpolate({list:toAddressList.join("; ")}).escapeHTML() + "<br/>";
47 }
48 if (ccAddressList.length > 0) {
49- this.text += $L("<b>CC:</b> ") + "#{list}".interpolate({list:ccAddressList.join("; ")}).escapeHTML() + "<br/>";
50+ this.text += $L("<b>Cc:</b> ") + "#{list}".interpolate({list:ccAddressList.join("; ")}).escapeHTML() + "<br/>";
51 }
52- this.text += "<br/>";
53+ this.text += $L("<b>Subject:</b> #{summary}").interpolate(original) + "<br/>";
54 } else {
55
56 // reply case. Integrate header info with sentence
57@@ -201,12 +200,36 @@ var Email = Class.create({
58 };
59 if (original.timeStamp) {
60 // <Month (short version)> <Day>,<Year> at <time>
61- strArgs.monthDate = Mojo.Format.formatDate(new Date(parseInt(original.timeStamp, 10)), {date:'medium', time:'short'});
62- this.text += $L("On #{monthDate}, #{displayName} <#{address}> wrote: ").interpolate(strArgs).escapeHTML();
63+ if (fromObj.displayName === fromObj.address) {
64+ this.text += $L("<b>From:</b> ") + "#{displayName}".interpolate(fromObj).escapeHTML() + "<br/>";
65+ }
66+ else {
67+ this.text += $L("<b>From:</b> ") + "#{displayName}".interpolate(fromObj).escapeHTML() + "<br/>"
68+ };
69+ this.text += $L("<b>Sent:</b> ") + Mojo.Format.formatDate(new Date(parseInt(original.timeStamp)), {date:'full', time:'short'}) + "<br/>";
70+ if (toAddressList.length > 0) {
71+ this.text += $L("<b>To:</b> ") + "#{list}".interpolate({list:toAddressList.join("; ")}).escapeHTML() + "<br/>";
72+ }
73+ if (ccAddressList.length > 0) {
74+ this.text += $L("<b>Cc:</b> ") + "#{list}".interpolate({list:ccAddressList.join("; ")}).escapeHTML() + "<br/>";
75+ }
76+ this.text += $L("<b>Subject:</b> #{summary}").interpolate(original) + "<br/>";
77 } else {
78- this.text += $L("#{displayName} <#{address}> wrote: ").interpolate(strArgs).escapeHTML();
79+ if (fromObj.displayName === fromObj.address) {
80+ this.text += $L("<b>From:</b> ") + "#{displayName}".interpolate(fromObj).escapeHTML() + "<br/>";
81+ }
82+ else {
83+ this.text += $L("<b>From:</b> ") + "#{displayName}".interpolate(fromObj).escapeHTML() + "<br/>"
84+ };
85+ this.text += $L("<b>Sent:</b> ") + Mojo.Format.formatDate(new Date(parseInt(original.timeStamp)), {date:'full', time:'short'}) + "<br/>";
86+ if (toAddressList.length > 0) {
87+ this.text += $L("<b>To:</b> ") + "#{list}".interpolate({list:toAddressList.join("; ")}).escapeHTML() + "<br/>";
88 }
89- this.text += "<br><br>";
90+ if (ccAddressList.length > 0) {
91+ this.text += $L("<b>Cc:</b> ") + "#{list}".interpolate({list:ccAddressList.join("; ")}).escapeHTML() + "<br/>";
92+ }
93+ this.text += $L("<b>Subject:</b> #{summary}").interpolate(original) + "<br/>";
94+ }
95 }
96 this.originalText = original.text;
97 } else {
98@@ -380,8 +403,8 @@ Email.getPriorityClass = function(priority) {
99 return priority;
100 }
101
102-Email.kSignaturePlaceholder = "<span style='font-family:Prelude, Verdana, san-serif;'><br><br></span><span id='signature'></span>";
103-Email.kReplyForwardSetupElems = "<br><br>" + Email.kSignaturePlaceholder + "<span style='color:navy; font-family:Prelude, Verdana, san-serif; '><hr align='left' style='width:75%'/>";
104+Email.kSignaturePlaceholder = "<span style='font-family:Prelude, Calibri, san-serif; font-size:15px; color:#1F497D;'><br></span><span id='signature'></span>";
105+Email.kReplyForwardSetupElems = "<span style='font-family:Prelude, Calibri, san-serif; font-size:15px;'>" + Email.kSignaturePlaceholder + "<hr align='left' style='width:75%'/>";
106
107 Email.kSubjectPrefixRe = $L("Re: ");
108 Email.kSubjectPrefixFw = $L("Fw: ");
messaging/messaging-timestamps-builtin.patch
(25 / 0)
  
1diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
2index 84e13e3..f64d3d7 100644
3--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
4+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
5@@ -1484,16 +1484,16 @@ var ChatviewAssistant = Class.create({
6
7 // if the INCOMING message was sent longer than 10 minutes before it arrived on device,
8 // add sent date to indicate that this delay happened
9- if (!ChatFlags.isOutgoing(msg.flags) && msg.deviceTimeStamp && msg.timeStamp && (msg.deviceTimeStamp - msg.timeStamp) > (600000)) {
10+// if (!ChatFlags.isOutgoing(msg.flags) && msg.deviceTimeStamp && msg.timeStamp && (msg.deviceTimeStamp - msg.timeStamp) > (600000)) {
11 d.setTime(msg.timeStamp);
12 var sentTimeStamp = d;
13
14 // Only show the message sent time if it is less than two days old
15 // from when it arrived on device
16- if (today - msg.timeStamp <= 172800000) { //172800000 = (1000*60*60*24*2)
17+// if (today - msg.timeStamp <= 172800000) { //172800000 = (1000*60*60*24*2)
18 msg.timeStampDeltaMsg = new Template($L("Message Sent: #{dateTime}")).evaluate({dateTime:Mojo.Format.formatDate(sentTimeStamp,'short')});
19- }
20- }
21+// }
22+// }
23
24 if (msg.callbackNumber) {
25 //msg.callbackNumber = PalmSystem.runTextIndexer(msg.callbackNumber);
phone/phone-open-to-call-log.patch
(61 / 0)
  
1diff --git a/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js b/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js
2index aa92cd0..c96be23 100644
3--- a/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js
4+++ b/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js
5@@ -188,20 +188,14 @@ AppAssistant.prototype.handleLaunch = function(params){
6 if(PalmSystem.isMinimal)
7 return
8 else
9- this.showDialpad();
10+ this.showCallLog(); // start up to call log instead of dialpad
11 }
12 } else {
13
14 if (!(this.telephonyEventListener.isPendingOrActive())) {
15 if (this.initialLaunch === false) {
16 QDLogger.log( "handleLaunch", "no args, no calls: focusing stage");
17- var appControl = Mojo.Controller.getAppController();
18- var stageController = appControl.getStageController(this.stageName);
19-
20- if (!stageController) {
21- this.showDialpad();
22- }
23-
24+ this.showCallLog(); // just show call log here
25 this.focusStage();
26 } else {
27 QDLogger.log( "handleLaunch", "initial launch, so doing nothing");
28@@ -499,7 +493,7 @@ AppAssistant.prototype.showCallLog = function(type, keepHidden){
29
30 sc.pushScene({
31 name: sceneName,
32- transition: Mojo.Transition.crossFade,
33+ transition: Mojo.Transition.none, // we don't need the transition
34 templateModel: {
35 voicemailCount: voicemailCount,
36 voicemailCountDisplayClass: voicemailCountDisplayClass
37@@ -522,6 +516,8 @@ AppAssistant.prototype.showCallLog = function(type, keepHidden){
38 if ( type == "missed" ) {
39 stageController.delegateToSceneAssistant("onMissedCallsTap", true);
40 }
41+ stageController.delegateToSceneAssistant("closeDrawer"); // need this so drawers don't get stuck
42+ pushLogScene(stageController); // make sure we go to all calls list
43 }
44 }
45 };
46@@ -773,14 +769,7 @@ AppAssistant.prototype.popActiveCall = function(params) {
47 if (stageController !== undefined) {
48 this.sceneStack = [];
49 stageController.popScenesTo();
50- if (this.backToCalllog) {
51- if(this.calllogType == "missed")
52- this.showCallLog("missed", true);
53- else
54- this.showCallLog("", true);
55- }
56- else
57- this.showDialpad(null, true);
58+ this.showCallLog("", true); // return to call log when call ended
59 } else {
60 QDLogger.log( "popActiveCall", "undefined stage");
61 }