Commit d58beb6273cddb22e1490cee695435e3025332f8
-
- Daniel Beames <dbeames @beames…ptop.(none)>
- Diff rendering mode:
- inline
- side by side
| 1 | Calendar: Allow Location field to wrap on multiple lines. | ||
| 2 | Index: /usr/palm/applications/com.palm.app.calendar/app/controllers/edit-assistant.js | ||
| 3 | =================================================================== | ||
| 4 | --- .orig/usr/palm/applications/com.palm.app.calendar/app/controllers/edit-assistant.js | ||
| 5 | +++ /usr/palm/applications/com.palm.app.calendar/app/controllers/edit-assistant.js | ||
| 6 | @@ -516,7 +516,8 @@ var EditAssistant = Class.create({ | ||
| 7 | var tfAttrs2 = { | ||
| 8 | modelProperty: 'location', | ||
| 9 | hintText: $L('Event location'), | ||
| 10 | - acceptBack:true | ||
| 11 | + acceptBack:true, | ||
| 12 | + multiline:true | ||
| 13 | |||
| 14 | }; | ||
| 15 | this.locationmodel = { |
| 1 | --- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 2 | +++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 3 | @@ -1347,7 +1347,7 @@ | ||
| 4 | if (ChatFlags.isOutgoing(msg.flags)) { | ||
| 5 | tmpClass.push("my-chat"); | ||
| 6 | // Disabling MY avatar because we are not doing this for 1.0 2008-11-05 | ||
| 7 | - //msg.avatar = this.myAvatar || 'images/my-avatar.png'; | ||
| 8 | + msg.avatar = this.myAvatar || '/media/internal/my-avatar.png'; | ||
| 9 | } else { | ||
| 10 | tmpClass.push("their-chat"); | ||
| 11 | msg.avatar = this.avatarHash[msg.fromAddress] || this.contactAvatar || "images/list-view-default-avatar.png"; | ||
| 12 | --- .orig/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 13 | +++ /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 14 | @@ -645,7 +645,7 @@ | ||
| 15 | width: 255px; | ||
| 16 | } | ||
| 17 | .my-chat .message-container { | ||
| 18 | - width: 280px; | ||
| 19 | + width: 275px; | ||
| 20 | } | ||
| 21 | .chat-entry .chat-balloon { | ||
| 22 | min-height: 26px; | ||
| 23 | @@ -659,7 +659,10 @@ | ||
| 24 | font-size:14px; | ||
| 25 | } | ||
| 26 | |||
| 27 | -.my-chat .chat-balloon-wrapper, | ||
| 28 | +.my-chat .chat-balloon-wrapper { | ||
| 29 | + padding-left: 40px; | ||
| 30 | + word-wrap: break-word !important; | ||
| 31 | +} | ||
| 32 | .their-chat .chat-balloon-wrapper { | ||
| 33 | padding: 1px 0; | ||
| 34 | font-size: 18px; | ||
| 35 | @@ -674,8 +674,16 @@ | ||
| 36 | } | ||
| 37 | |||
| 38 | /* Disabling MY avatar because we are not doing this for 1.0 2008-11-05*/ | ||
| 39 | -.my-chat .avatar-location, | ||
| 40 | -.my-chat .avatar-overlay, | ||
| 41 | +.my-chat .avatar-location { | ||
| 42 | +left: 12px; | ||
| 43 | +position: absolute; | ||
| 44 | +margin: 13px 12px 0px 0px; | ||
| 45 | +} | ||
| 46 | +.my-chat .avatar-overlay { | ||
| 47 | +left: 8px; | ||
| 48 | +margin-top: 4px; | ||
| 49 | +position: absolute; | ||
| 50 | +} | ||
| 51 | .my-chat .avatar-container { | ||
| 52 | display: none; | ||
| 53 | width: 40px; | ||
| 54 | @@ -677,9 +677,11 @@ | ||
| 55 | .my-chat .avatar-location, | ||
| 56 | .my-chat .avatar-overlay, | ||
| 57 | .my-chat .avatar-container { | ||
| 58 | - display: none; | ||
| 59 | - width: 40px; | ||
| 60 | - height: 40px; | ||
| 61 | +display: inline-block; | ||
| 62 | +} | ||
| 63 | +.my-chat .avatar { | ||
| 64 | +width: 40px; | ||
| 65 | +height: 40px; | ||
| 66 | } | ||
| 67 | |||
| 68 | .message.status-success { |
| 1 | --- /usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js.bak Wed Oct 21 13:41:29 2009 | ||
| 2 | +++ /usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js Wed Oct 21 13:43:03 2009 | ||
| 3 | @@ -889,7 +889,7 @@ | ||
| 4 | else | ||
| 5 | params = {"personId":contactId,"contactPointId":contactPointId,"address":addr} | ||
| 6 | |||
| 7 | - ApplicationService.launch('com.palm.app.messaging', params); | ||
| 8 | + ApplicationService.launch('com.palm.natebiz.gdial-pro', params); | ||
| 9 | }, | ||
| 10 | |||
| 11 | /**********end messaging***********************/ | ||
| 12 | @@ -913,7 +913,7 @@ | ||
| 13 | else | ||
| 14 | var params = {"number": number}; | ||
| 15 | } | ||
| 16 | - ApplicationService.launch('com.palm.app.phone', params); | ||
| 17 | + ApplicationService.launch('com.palm.natebiz.gdial-pro', params); | ||
| 18 | }, | ||
| 19 | |||
| 20 | launchAddToContacts: function(number) { |
| 1 | --- .orig/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js | ||
| 2 | +++ /usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js | ||
| 3 | @@ -996,6 +996,7 @@ | ||
| 4 | // show dialpad for emergency call and screenlock | ||
| 5 | AppAssistant.prototype.showLimitedDialpad = function(sc, dialParams) { | ||
| 6 | dialParams.limited = true; | ||
| 7 | + dialParams.number = this.emergencyNumbers; | ||
| 8 | sc.pushScene({ | ||
| 9 | "name": "dialpad", | ||
| 10 | automaticFocusAdvance: false, |
