Commit 7ebdf3a2cd4e693efebeb3a827028ea4632dad93

  • avatar
  • egaudet
  • Sun Sep 27 10:08:20 CEST 2009
Regenerated patches with git diff -b to ignore trailing newline
  
1Index: /usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js
2===================================================================
3--- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js
4+++ /usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js
5@@ -1449,6 +1449,8 @@ PageAssistant.prototype.setup = function
1diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js b/usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js
2index b2c8848..d541ea7 100644
3--- a/usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js
4+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/global_code.js
5@@ -1449,6 +1449,8 @@ PageAssistant.prototype.setup = function() {
66 this._webView.addEventListener(Mojo.Event.webViewUrlRedirect, this._onUrlRedirect.bind(this), false);
77 this._webView.addEventListener(Mojo.Event.webViewModifierTap, this._onModifierTapHandler, false);
88 this._webView.addEventListener(Mojo.Event.webViewUpdateHistory, this._onUpdateHistoryHandler, false);
1111 }
1212 catch (e) {
1313 Mojo.Log.logException(e, 'PageAssistant#setup');
14@@ -2287,28 +2289,116 @@ PageAssistant.prototype._newBrowserPage
14@@ -2287,28 +2289,116 @@ PageAssistant.prototype._newBrowserPage = function(url, pageIdentifier){
1515 */
1616 PageAssistant.prototype._streamResource = function(uri, appid, mimeType){
1717
1818- Mojo.Log.info("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType);
1919-
20- // Only a few select applications can be
21- crossAppScene = {
22- 'com.palm.app.videoplayer': 'nowplaying',
23- 'com.palm.app.streamingmusicplayer': 'nowplaying'
24- };
25- var params = {target: uri, mimeType: mimeType};
26- if (crossAppScene[appid]) {
2720+ Mojo.Log.error("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType);
2821+ if(appid === 'com.palm.app.email')
2922+{
109109+ }.bind(this),
110110+ onAccept: function(cParams) { // STREAM
111111+ var params = {target: uri, mimeType: mimeType, appid: appid};
112+ // Only a few select applications can be
112 // Only a few select applications can be
113- crossAppScene = {
113114+ var crossAppScene = {
114+ 'com.palm.app.videoplayer': 'nowplaying',
115+ 'com.palm.app.streamingmusicplayer': 'nowplaying'
116+ };
115 'com.palm.app.videoplayer': 'nowplaying',
116 'com.palm.app.streamingmusicplayer': 'nowplaying'
117 };
118- var params = {target: uri, mimeType: mimeType};
117119+ //this._onPopupHandler('close');
118+ if (crossAppScene[appid]) {
119+ var args = { appId: appid, name: crossAppScene[appid] };
120+ this.controller.stageController.pushScene(args, params);
121+ }
122+ else {
123+ this._downloadController.downloadResource(uri);
124+ }
125+ }.bind(this)})
126+ });
127+ // Record we have a popup
128+ //this._onPopupHandler('open');
129
130- var args = { appId: appid, name: crossAppScene[appid] };
131- this.controller.stageController.pushScene(args, params);
132- }
133- else {
120 if (crossAppScene[appid]) {
121-
122 var args = { appId: appid, name: crossAppScene[appid] };
123 this.controller.stageController.pushScene(args, params);
124 }
125 else {
134126- this.controller.serviceRequest('palm://com.palm.applicationManager', {
135127- method: 'open',
136128- parameters: {
137129- 'id': appid,
138130- 'params': params
139- }
140- });
131+ this._downloadController.downloadResource(uri);
132 }
133+ }.bind(this)})
134 });
141135- }
136+ // Record we have a popup
137+ //this._onPopupHandler('open');
138+
142139 };
143140
144141 /**
145@@ -2318,16 +2408,29 @@ PageAssistant.prototype._streamResource
146 */
147 PageAssistant.prototype._downloadResource = function(uri) {
148
149- Mojo.Log.info("Downloading: " + uri);
150+ Mojo.Log.info("Downloading: " + uri);
151
152- try {
153- // We should no longer download a resource but inform the user
154- // we are unable to perform the download.
142@@ -2323,11 +2413,24 @@ PageAssistant.prototype._downloadResource = function(uri) {
143 try {
144 // We should no longer download a resource but inform the user
145 // we are unable to perform the download.
155146- this.controller.showAlertDialog({
156147- onChoose: function(value) { /* Do Nothing */},
157148- message: $L('Cannot find an application which can open this file.'),
158149- choices:[{label:$L('OK'), value:'1', type:'dismiss'}]
159- });
160+ try {
161+ // We should no longer download a resource but inform the user
162+ // we are unable to perform the download.
163150+ if (!this._downloadWidgetElement) {
164151+ this._downloadWidgetElement = this.controller.showDialog({
165152+ template: 'download/download-popup',
160160+ //this._onPopupHandler('close');
161161+ this._downloadController.downloadResource(uri);
162162+ }.bind(this)})
163+ });
163 });
164164+
165165+ // Record we have a popup
166166+ //this._onPopupHandler('open');
168168 } catch (e) {
169169 Mojo.Log.logException(e, "#_downloadResource");
170170 }
171@@ -3165,9 +3268,34 @@ PageAssistant.prototype._onKeyDownEvent
172 if (!this._addressBar.hasFocus() && !this._editorInPageFocused) {
173 // Only jump to the URL bar IF we are a valid keycode that is
171@@ -3167,6 +3270,31 @@ PageAssistant.prototype._onKeyDownEvent = function(event) {
174172 // allowed to trigger the bar.
175- if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) {
176- this._gotoUrlBar();
177- }
178+ if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) {
179+ this._gotoUrlBar();
173 if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) {
174 this._gotoUrlBar();
180175+ } else {
181176+ var key = event.originalEvent.keyCode;
182177+ var scroller = this.controller.getSceneScroller();
197197+ } else {
198198+ Mojo.Log.error("Ignoring keyCode", key);
199199+ }
200+ }
200 }
201201 }
202202 };
203
204@@ -4956,8 +5084,10 @@ UrlBar.prototype.isAGotoUrlBarKey = func
203@@ -4956,8 +5084,10 @@ UrlBar.prototype.isAGotoUrlBarKey = function(keycode) {
205204 UrlBar.prototype.setOrientation = function(orientation) {
206205
207206 if (orientation !== 'up') {
213213 this._hidePortrait();
214214 }
215215
216@@ -4984,6 +5114,12 @@ UrlBar.prototype.setup = function(proper
216@@ -4984,6 +5114,12 @@ UrlBar.prototype.setup = function(properties) {
217217 this._onPropertyChange = properties.onPropertyChange || function(){};
218218 this._configOrientation(properties.orientation || 'up');
219219
226226 this.models = {
227227 urlInput: {
228228 template: 'page/url-field',
229@@ -5001,7 +5137,7 @@ UrlBar.prototype.setup = function(proper
229@@ -5001,7 +5137,7 @@ UrlBar.prototype.setup = function(properties) {
230230 url: ''
231231 },
232232
235235 },
236236
237237 // Beware: These are shallow copies.
238@@ -5327,12 +5463,25 @@ UrlBar.prototype._hidePortrait = functio
238@@ -5327,12 +5463,25 @@ UrlBar.prototype._hidePortrait = function() {
239239 this.controller.setMenuVisible(Mojo.Menu.viewMenu, false);
240240 };
241241
263263 };
264264
265265 UrlBar.prototype.isVisible = function() {
266@@ -5738,12 +5887,43 @@ Chrome.prototype._hidePortrait = functio
266@@ -5738,12 +5887,43 @@ Chrome.prototype._hidePortrait = function() {
267267 }
268268 };
269269
309309 };
310310
311311 Chrome.prototype.isVisible = function() {
312Index: /usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html
313===================================================================
314--- .orig/usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html
315+++ /usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html
316@@ -1,20 +1,24 @@
317-<div id="view_menu_bkgnd">
318- <div id="view_menu_bkgnd_content_nochrome"></div>
319-</div>
320-
321-<div id='web_view_panel' style="min-height:481px;">
322-<div id="web_view" x-mojo-element="WebView"></div>
323-</div>
324-
325-<div id="urlSearch" class="browser-search">
326- <div class="search-results-container">
327- <div id="urlSearchScroller" class="search-results-wrapper" x-mojo-element="Scroller">
328- <div id="urlSearchList" class="palm-list" x-mojo-element="List"></div>
329- </div>
330- </div>
331-</div>
332-<div id="server-disconnected" class="palm-scrim">
333- <div id="server-disconnected-spinner" x-mojo-element="Spinner"></div>
334-</div>
335-
336-
337+<div id="view_menu_bkgnd">
338+ <div id="view_menu_bkgnd_content_nochrome"></div>
339+</div>
340+
341+<div id='web_view_panel' style="min-height:481px;">
342+<div id="web_view" x-mojo-element="WebView"></div>
343+</div>
344+
345+<div id="urlSearch" class="browser-search">
346+ <div class="search-results-container">
347+ <div id="urlSearchScroller" class="search-results-wrapper" x-mojo-element="Scroller">
348+ <div id="urlSearchList" class="palm-list" x-mojo-element="List"></div>
349+ </div>
350+ </div>
351+</div>
352+<div id="server-disconnected" class="palm-scrim">
353+ <div id="server-disconnected-spinner" x-mojo-element="Spinner"></div>
354+</div>
312diff --git a/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html b/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html
313index b5f171f..a838cda 100644
314--- a/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html
315+++ b/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html
316@@ -1,3 +1,3 @@
317 <div x-mojo-elements="List" class="palm-list no-lines">
318- #{listElements}
319+ #{-listElements}
320 </div>
321\ No newline at end of file
322diff --git a/usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html b/usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html
323index a8fc62d..68bad1b 100644
324--- a/usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html
325+++ b/usr/palm/applications/com.palm.app.browser/app/views/page/page-scene.html
326@@ -16,5 +16,9 @@
327 <div id="server-disconnected" class="palm-scrim">
328 <div id="server-disconnected-spinner" x-mojo-element="Spinner"></div>
329 </div>
355330+<div id="downloadListScroller" class="browser-download" x-mojo-element="Scroller">
356331+ <div id="downloadList" class="palm-list" x-mojo-element="List"></div>
357332+</div>
358333+
359+
360+
361Index: /usr/palm/applications/com.palm.app.browser/sources.json
362===================================================================
363--- .orig/usr/palm/applications/com.palm.app.browser/sources.json
364+++ /usr/palm/applications/com.palm.app.browser/sources.json
334
335
336diff --git a/usr/palm/applications/com.palm.app.browser/sources.json b/usr/palm/applications/com.palm.app.browser/sources.json
337index bc485bf..74fb77a 100644
338--- a/usr/palm/applications/com.palm.app.browser/sources.json
339+++ b/usr/palm/applications/com.palm.app.browser/sources.json
365340@@ -1,5 +1,17 @@
366-[
367+[
341 [
368342 {
369- "source": "app\/controllers\/global_code.js"
370343+ "source":"app\/models\/download-model.js"
371344+ },
372345+ {
352352+ "source":"app\/controllers\/downloaddialog-assistant.js"
353353+ },
354354+ {
355+ "source": "app\/controllers\/global_code.js"
355 "source": "app\/controllers\/global_code.js"
356356 }
357357 ]
358Index: /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js
359===================================================================
360--- /dev/null
361+++ /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js
362@@ -0,0 +1,46 @@
363+/**
364+ * A dialog assistant for display of yes/no box.
365+ */
366+DownloadDialogAssistant = Class.create({
367+
368+ initialize: function(params) {
369+ this.onDismiss = params.onDismiss;
370+ this.onAccept = params.onAccept;
371+ this.controller= params.sceneAssistant.controller;
372+
373+ // Button handlers.
374+ this.onDismissHandler = this.handleDismiss.bindAsEventListener(this);
375+ this.onAcceptHandler = this.handleAccept.bindAsEventListener(this);
376+ },
377+
378+ setup: function(widget) {
379+ this.widget = widget;
380+ this.controller.get('acceptButton').addEventListener(Mojo.Event.tap, this.onAcceptHandler);
381+ this.controller.get('acceptButton').focus();
382+ this.controller.get('dismissButton').addEventListener(Mojo.Event.tap, this.onDismissHandler);
383+ this.controller.get('dismissButton').focus();
384+ },
385+
386+ handleDismiss: function() {
387+ this.onDismiss();
388+ delete this.onDismiss;
389+ this.widget.mojo.close();
390+ },
391+ handleAccept: function() {
392+ this.onAccept();
393+ delete this.onAccept;
394+ delete this.onDismiss;
395+ this.widget.mojo.close();
396+ },
397+
398+ cleanup: function() {
399+ Mojo.Log.info("NetworkDialogAssistant#cleanup()");
400+ Mojo.Event.stopListening(this.controller.get('dismissButton'), Mojo.Event.tap, this.onDismissHandler);
401+ Mojo.Event.stopListening(this.controller.get('acceptButton'), Mojo.Event.tap, this.onAcceptHandler);
402+
403+ // Send a dismiss if NOT already sent a response
404+ if (this.onDismiss) {
405+ this.onDismiss();
406+ }
407+ }
408+});
409diff --git a/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html b/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html
410index b5f171f..a838cda 100644
411--- a/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html
412+++ b/usr/palm/applications/com.palm.app.browser/app/views/download/download-container.html
413@@ -1,3 +1,3 @@
414 <div x-mojo-elements="List" class="palm-list no-lines">
415- #{listElements}
416-</div>
417\ No newline at end of file
418+ #{-listElements}
419+</div>
420Index: /usr/palm/applications/com.palm.app.browser/app/views/download/download-popup.html
421===================================================================
422--- /dev/null
423+++ /usr/palm/applications/com.palm.app.browser/app/views/download/download-popup.html
424@@ -0,0 +1,8 @@
425+<div id="palm-dialog-content" class="palm-dialog-content">
426+ <div class="dialog-message" x-mojo-loc=""> Cannot find an application which can open this file. Would you like to download it to /media/internal/downloads?</div>
427+</div>
428+
429+<div class="palm-dialog-buttons">
430+ <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Yes</div>
431+ <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">No</div>
432+</div>
433Index: /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html
434===================================================================
435--- /dev/null
436+++ /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html
437@@ -0,0 +1,8 @@
438+<div id="palm-dialog-content" class="palm-dialog-content">
439+ <div class="dialog-message" x-mojo-loc="">This file type has been registered as a streaming media file. Would you like to download it to /media/internal/downloads instead?</div>
440+</div>
441+
442+<div class="palm-dialog-buttons">
443+ <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Stream</div>
444+ <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Download</div>
445+</div>
446Index: /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
447===================================================================
448--- .orig/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
449+++ /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
358diff --git a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
359index 4be566b..5a0f544 100644
360--- a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
361+++ b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
450362@@ -753,7 +753,7 @@ div#historyScroller {
451363 }
452364
  
1Patch to enable "hidden" clock in the Clock app shipped
2with WebOS 1.0.4. Also modded to show day and date.
3
4Tested-On: 1.1
5
6Mod by frankos72 @ precentral and Phrozen
7Patch submitted by JackieRipper
8Index: /usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js
9===================================================================
10--- .orig/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js
11+++ /usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js
1diff --git a/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js b/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js
2index 7652bf7..dbb4c5c 100644
3--- a/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js
4+++ b/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock-functions.js
125@@ -91,8 +91,8 @@
136 }
147 // format date
1313 }
1414
1515 ManualanalogClockFunctions.prototype.alarm = function() {
16Index: /usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html
17===================================================================
18--- .orig/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html
19+++ /usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html
16diff --git a/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html b/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html
17index 2b790e4..8cfb653 100644
18--- a/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html
19+++ b/usr/palm/applications/com.palm.app.clock/themes/manualanalog/manualanalog-clock.html
2020@@ -1,8 +1,8 @@
2121
2222 <div class="clock-container">
2828
2929 <div id="hour"></div>
3030 <div id="minute"></div>
31Index: /usr/palm/applications/com.palm.app.clock/themes/themes.json
32===================================================================
33--- .orig/usr/palm/applications/com.palm.app.clock/themes/themes.json
34+++ /usr/palm/applications/com.palm.app.clock/themes/themes.json
31diff --git a/usr/palm/applications/com.palm.app.clock/themes/themes.json b/usr/palm/applications/com.palm.app.clock/themes/themes.json
32index 1f29438..272c7c7 100644
33--- a/usr/palm/applications/com.palm.app.clock/themes/themes.json
34+++ b/usr/palm/applications/com.palm.app.clock/themes/themes.json
3535@@ -10,5 +10,11 @@
3636 "nicename":"Analog",
3737 "description":"",
4343+ "description":"",
4444+ "source": "themes/manualanalog/"
4545 }
46-]
46 ]
4747\ No newline at end of file
48+]
  
11diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/da_dk/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/da_dk/alternatechars_table.json
2index 4a5e5b1..2dee293 100644
2index 4a5e5b1..55f8270 100644
33--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/da_dk/alternatechars_table.json
44+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/da_dk/alternatechars_table.json
55@@ -2,28 +2,28 @@
3737 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
3838 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
3939- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
40-]
41\ No newline at end of file
4240+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
43+]
41 ]
42\ No newline at end of file
4443diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/de_ch/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/de_ch/alternatechars_table.json
45index 01b316b..2dee293 100644
44index 01b316b..55f8270 100644
4645--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/de_ch/alternatechars_table.json
4746+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/de_ch/alternatechars_table.json
4847@@ -2,28 +2,28 @@
7777 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
7878 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
7979- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
80-]
81\ No newline at end of file
8280+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
83+]
81 ]
82\ No newline at end of file
8483diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/de_de/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/de_de/alternatechars_table.json
85index 01b316b..2dee293 100644
84index 01b316b..55f8270 100644
8685--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/de_de/alternatechars_table.json
8786+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/de_de/alternatechars_table.json
8887@@ -2,28 +2,28 @@
117117 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
118118 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
119119- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
120-]
121\ No newline at end of file
122120+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
123+]
121 ]
122\ No newline at end of file
124123diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ca/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ca/alternatechars_table.json
125index 8180a5a..2dee293 100644
124index 8180a5a..55f8270 100644
126125--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ca/alternatechars_table.json
127126+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ca/alternatechars_table.json
128127@@ -2,28 +2,28 @@
161161 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
162162 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
163163- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
164-]
165\ No newline at end of file
166164+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
167+]
165 ]
166\ No newline at end of file
168167diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_gb/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_gb/alternatechars_table.json
169index 8180a5a..2dee293 100644
168index 8180a5a..55f8270 100644
170169--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_gb/alternatechars_table.json
171170+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_gb/alternatechars_table.json
172171@@ -2,28 +2,28 @@
205205 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
206206 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
207207- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
208-]
209\ No newline at end of file
210208+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
211+]
209 ]
210\ No newline at end of file
212211diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ie/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ie/alternatechars_table.json
213index 8180a5a..2dee293 100644
212index 8180a5a..55f8270 100644
214213--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ie/alternatechars_table.json
215214+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_ie/alternatechars_table.json
216215@@ -2,28 +2,28 @@
249249 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
250250 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
251251- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
252-]
253\ No newline at end of file
254252+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
255+]
253 ]
254\ No newline at end of file
256255diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_pl/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_pl/alternatechars_table.json
257index 8180a5a..2dee293 100644
256index 8180a5a..55f8270 100644
258257--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_pl/alternatechars_table.json
259258+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_pl/alternatechars_table.json
260259@@ -2,28 +2,28 @@
293293 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
294294 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
295295- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
296-]
297\ No newline at end of file
298296+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
299+]
297 ]
298\ No newline at end of file
300299diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_us/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_us/alternatechars_table.json
301index 8180a5a..2dee293 100644
300index 8180a5a..55f8270 100644
302301--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/en_us/alternatechars_table.json
303302+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/en_us/alternatechars_table.json
304303@@ -2,28 +2,28 @@
337337 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
338338 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
339339- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
340-]
341\ No newline at end of file
342340+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
343+]
341 ]
342\ No newline at end of file
344343diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/es_es/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/es_es/alternatechars_table.json
345index 487afa5..2dee293 100644
344index 487afa5..55f8270 100644
346345--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/es_es/alternatechars_table.json
347346+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/es_es/alternatechars_table.json
348347@@ -10,7 +10,7 @@
358358 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
359359 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
360360- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
361-]
362\ No newline at end of file
363361+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
364+]
362 ]
363\ No newline at end of file
365364diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/es_mx/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/es_mx/alternatechars_table.json
366index 487afa5..2dee293 100644
365index 487afa5..55f8270 100644
367366--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/es_mx/alternatechars_table.json
368367+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/es_mx/alternatechars_table.json
369368@@ -10,7 +10,7 @@
379379 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
380380 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
381381- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
382-]
383\ No newline at end of file
384382+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
385+]
383 ]
384\ No newline at end of file
386385diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/es_us/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/es_us/alternatechars_table.json
387index 487afa5..2dee293 100644
386index 487afa5..55f8270 100644
388387--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/es_us/alternatechars_table.json
389388+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/es_us/alternatechars_table.json
390389@@ -10,7 +10,7 @@
400400 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
401401 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
402402- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
403-]
404\ No newline at end of file
405403+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
406+]
404 ]
405\ No newline at end of file
407406diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/fi_fi/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/fi_fi/alternatechars_table.json
408index f8a90e5..2dee293 100644
407index f8a90e5..55f8270 100644
409408--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/fi_fi/alternatechars_table.json
410409+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/fi_fi/alternatechars_table.json
411410@@ -2,28 +2,28 @@
441441 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
442442 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
443443- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
444-]
445\ No newline at end of file
446444+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
447+]
445 ]
446\ No newline at end of file
448447diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ca/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ca/alternatechars_table.json
449index 405065a..2dee293 100644
448index 405065a..55f8270 100644
450449--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ca/alternatechars_table.json
451450+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ca/alternatechars_table.json
452451@@ -2,28 +2,28 @@
482482 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
483483 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
484484- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
485-]
486\ No newline at end of file
487485+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
488+]
486 ]
487\ No newline at end of file
489488diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ch/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ch/alternatechars_table.json
490index 405065a..2dee293 100644
489index 405065a..55f8270 100644
491490--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ch/alternatechars_table.json
492491+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_ch/alternatechars_table.json
493492@@ -2,28 +2,28 @@
523523 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
524524 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
525525- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
526-]
527\ No newline at end of file
528526+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
529+]
527 ]
528\ No newline at end of file
530529diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_fr/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_fr/alternatechars_table.json
531index 405065a..2dee293 100644
530index 405065a..55f8270 100644
532531--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_fr/alternatechars_table.json
533532+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/fr_fr/alternatechars_table.json
534533@@ -2,28 +2,28 @@
564564 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
565565 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
566566- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
567-]
568\ No newline at end of file
569567+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
570+]
568 ]
569\ No newline at end of file
571570diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/it_it/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/it_it/alternatechars_table.json
572index c118bfa..2dee293 100644
571index c118bfa..55f8270 100644
573572--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/it_it/alternatechars_table.json
574573+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/it_it/alternatechars_table.json
575574@@ -2,28 +2,28 @@
605605 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
606606 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
607607- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
608-]
609\ No newline at end of file
610608+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
611+]
609 ]
610\ No newline at end of file
612611diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/nb_no/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/nb_no/alternatechars_table.json
613index 6239079..2dee293 100644
612index 6239079..55f8270 100644
614613--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/nb_no/alternatechars_table.json
615614+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/nb_no/alternatechars_table.json
616615@@ -2,28 +2,28 @@
647647 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
648648 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
649649- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
650-]
651\ No newline at end of file
652650+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
653+]
651 ]
652\ No newline at end of file
654653diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/nl_nl/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/nl_nl/alternatechars_table.json
655index 826f97b..2dee293 100644
654index 826f97b..55f8270 100644
656655--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/nl_nl/alternatechars_table.json
657656+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/nl_nl/alternatechars_table.json
658657@@ -2,28 +2,28 @@
688688 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
689689 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
690690- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
691-]
692\ No newline at end of file
693691+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
694+]
692 ]
693\ No newline at end of file
695694diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/pl_pl/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/pl_pl/alternatechars_table.json
696index 822f0fb..2dee293 100644
695index 822f0fb..55f8270 100644
697696--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/pl_pl/alternatechars_table.json
698697+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/pl_pl/alternatechars_table.json
699698@@ -2,28 +2,28 @@
731731 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
732732 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
733733- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
734-]
735\ No newline at end of file
736734+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
737+]
735 ]
736\ No newline at end of file
738737diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_br/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_br/alternatechars_table.json
739index 61457f0..2dee293 100644
738index 61457f0..55f8270 100644
740739--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_br/alternatechars_table.json
741740+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_br/alternatechars_table.json
742741@@ -2,28 +2,28 @@
772772 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
773773 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
774774- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
775-]
776\ No newline at end of file
777775+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
778+]
776 ]
777\ No newline at end of file
779778diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_pt/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_pt/alternatechars_table.json
780index 61457f0..2dee293 100644
779index 61457f0..55f8270 100644
781780--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_pt/alternatechars_table.json
782781+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/pt_pt/alternatechars_table.json
783782@@ -2,28 +2,28 @@
813813 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
814814 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
815815- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
816-]
817\ No newline at end of file
818816+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
819+]
817 ]
818\ No newline at end of file
820819diff --git a/usr/palm/frameworks/mojo/submissions/191.15/resources/sv_se/alternatechars_table.json b/usr/palm/frameworks/mojo/submissions/191.15/resources/sv_se/alternatechars_table.json
821index e1f190f..2dee293 100644
820index e1f190f..55f8270 100644
822821--- a/usr/palm/frameworks/mojo/submissions/191.15/resources/sv_se/alternatechars_table.json
823822+++ b/usr/palm/frameworks/mojo/submissions/191.15/resources/sv_se/alternatechars_table.json
824823@@ -2,28 +2,28 @@
854854 {"keyCode": 88, "letter":"x", "list": ["×","¤"]},
855855 {"keyCode": 89, "letter":"y", "list": ["ÿ","ý","Ÿ","Ý","¥","[","]","{","}","<",">","«","»"]},
856856- {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•"]}
857-]
858\ No newline at end of file
859857+ {"keyCode": 90, "letter":"z", "list": ["ž","Ž","•",":doh",":mad",":wtf",":cool",":cry",":eek",":sad",":omg",":grin",":kiss",":lol",":evil",":meh",":sick",":smile",":wink",":yuck",":eww",":heart",":angel",":redface"]}
860+]
858 ]
859\ No newline at end of file
  
22index 0c816ba..e69aa92 100644
33--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
44+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
5@@ -160,7 +160,12 @@ var ChatviewAssistant = Class.create({
5@@ -160,6 +160,11 @@ var ChatviewAssistant = Class.create({
66 segmentCountContainer: this.controller.get('segmentCounterContainer'),
77 segmentCountElement: this.controller.get('segmentCounter'),
88 setTextFieldValueFn: this.setTextFieldValue.bind(this)
9- }
109+ },
1110+ charCounter: {
1211+ charCountContainer: this.controller.get('charCounterContainer'),
1312+ charCountElement: this.controller.get('charCounter'),
1413+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
15+ }
14 }
1615 };
1716
18 this.characterCounter = new CharacterCounter(this.controller,this.Messaging.messagingPrefs.platformType,this.messageTextElement,charCounterParams);
19@@ -2115,4 +2120,4 @@ var ChatviewAssistant = Class.create({
20 this.controller.sceneScroller.mojo.revealBottom();
21 this.controller.sceneScroller.mojo.revealBottom();
22 }
23-});
24\ No newline at end of file
25+});
2617diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
2718index e023a89..2d4c30d 100644
2819--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
2920+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
30@@ -140,7 +140,12 @@ var ComposeAssistant = Class.create({
21@@ -140,6 +140,11 @@ var ComposeAssistant = Class.create({
3122 segmentCountContainer: this.controller.get('segmentCounterContainer'),
3223 segmentCountElement: this.controller.get('segmentCounter'),
3324 setTextFieldValueFn: this.setTextFieldValue.bind(this)
34- }
3525+ },
3626+ charCounter: {
3727+ charCountContainer: this.controller.get('charCounterContainer'),
3828+ charCountElement: this.controller.get('charCounter'),
3929+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
40+ }
30 }
4131 };
4232
43 this.characterCounter = new CharacterCounter(this.controller,this.Messaging.messagingPrefs.platformType,this.messageTextElement,charCounterParams);
4433diff --git a/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js b/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
4534index 9e0cbc6..ea22829 100644
4635--- a/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
101101 if (_maxLength > 0)
102102 setOverLimit(messageData.isOverLimit);
103103 setCurrentSegmentCount(messageData.segmentCount);
104@@ -329,4 +359,4 @@ var CharacterCounter = Class.create({
105 characterCounter.init(controller,platformType,textAreaElement,params);
106 Object.extend(this,characterCounter);
107 }
108-});
109\ No newline at end of file
110+});
111104diff --git a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html b/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
112105index d0d8745..7ecb65a 100644
113106--- a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
159159 #messageContainer #attachmentContainer {
160160 position: relative;
161161 margin-top:10px;
162@@ -1152,4 +1169,4 @@ img.avatar-overlay {
163 }
164 #im-links .palm-row .title {
165 padding: 9px 14px;
166-}
167\ No newline at end of file
168+}
  
3535 if (event && Mojo.Char.isEnterKey(event.keyCode)) {
3636 this.considerForSend();
3737 Event.stop(event);
38@@ -2115,4 +2141,4 @@ var ChatviewAssistant = Class.create({
39 this.controller.sceneScroller.mojo.revealBottom();
40 this.controller.sceneScroller.mojo.revealBottom();
41 }
42-});
43\ No newline at end of file
44+});
  
1Patch to add time stamps to all text messages.
2Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
3===================================================================
4--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
5+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
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 0c816ba..37f0501 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
65@@ -1212,6 +1212,9 @@ var ChatviewAssistant = Class.create({
76 preFormatChatList: function(stuff){
87 for(var i=0; i<stuff.list.length; i++) {
2121
2222 // if the INCOMING message was sent longer than 10 minutes before it arrived on device,
2323 // add sent date to indicate that this delay happened
24@@ -2115,4 +2118,4 @@ var ChatviewAssistant = Class.create({
25 this.controller.sceneScroller.mojo.revealBottom();
26 this.controller.sceneScroller.mojo.revealBottom();
27 }
28-});
29\ No newline at end of file
30+});
31Index: /usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html
32===================================================================
33--- .orig/usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html
34+++ /usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html
24diff --git a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html b/usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html
25index 97ff521..95b2ba6 100644
26--- a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html
27+++ b/usr/palm/applications/com.palm.app.messaging/app/views/chatview/message/message-text.html
3528@@ -1 +1 @@
3629-<div class="messageText">#{-messageText} #{-errorContent}</div>
3730\ No newline at end of file
3831+<div class="messageText"><span class="timeStamp">#{-timeStampText}</span><pre>#{-messageText}</pre> #{-errorContent}</div>
39Index: /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
40===================================================================
41--- .orig/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
42+++ /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
32diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
33index fe6127a..5eceb3d 100644
34--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
35+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
4336@@ -659,6 +659,18 @@ img.avatar-overlay {
4437 font-size:14px;
4538 }
5252 .my-chat .chat-balloon-wrapper,
5353 .their-chat .chat-balloon-wrapper {
5454 padding: 1px 0;
55@@ -1152,4 +1164,4 @@ img.avatar-overlay {
56 }
57 #im-links .palm-row .title {
58 padding: 9px 14px;
59-}
60\ No newline at end of file
61+}
  
1This patch modifies the Sounds & Rintones app, allowing you
2to specify tones for alerts, notifications and new messages.
3This patch should be used in conjunction with the
4messaging-sounds.patch and is unneeded if you are using
5the MyNotifications homebrew app.
6Index: /usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
7===================================================================
8--- .orig/usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
9+++ /usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
10@@ -81,9 +81,15 @@ var SoundsalertsconfigAssistant = Class.
1diff --git a/usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js b/usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
2index 1280518..09c20c7 100644
3--- a/usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
4+++ b/usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
5@@ -81,9 +81,15 @@ var SoundsalertsconfigAssistant = Class.create({
116
127
138 $('currentringtonerow').observe(Mojo.Event.tap, this.showAudioFilePicker.bindAsEventListener(this));
1818 this.getVibrateSettings();
1919 this.getOtherSettings();
2020
21@@ -239,6 +245,85 @@ var SoundsalertsconfigAssistant = Class.
22 this.setRingtoneReq = SystemService.setRingtone(file);
21@@ -240,6 +246,85 @@ var SoundsalertsconfigAssistant = Class.create({
2322 $('currentringtone').innerHTML = file.name;
2423 },
25+
24
2625+ // Alert Picking
2726+ getCurrentAlert: function() {
2827+ this.getCurrentAlertReq = SystemService.getAlerts(this.getCurrentAlertQuery.bind(this));
100100+ this.setMessageReq = SystemService.setMessages(file);
101101+ $('currentmessage').innerHTML = file.name;
102102+ },
103
103+
104104 getVibrateSettings: function() {
105105 this.getVibrateSettingsReq = AudioService.getVibrateSettings(this.vibrateSettingsCB.bind(this),this);
106Index: /usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js
107===================================================================
108--- .orig/usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js
109+++ /usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js
110@@ -28,6 +28,60 @@ SystemService.getRingtone = function(cal
106 },
107diff --git a/usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js b/usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js
108index c5babe5..cdf2383 100644
109--- a/usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js
110+++ b/usr/palm/applications/com.palm.app.soundsandalerts/app/models/SystemService.js
111@@ -28,6 +28,60 @@ SystemService.getRingtone = function(callback) {
111112 return request;
112113 }
113114
169169 SystemService.getSystemUISounds = function(callback) {
170170 var request = new Mojo.Service.Request(SystemService.identifier, {
171171 method: 'getPreferences',
172@@ -140,4 +194,4 @@ SystemService.getSystemlockMode = functi
173 onFailure: callback
174 });
175 return request;
176-}
177\ No newline at end of file
178+}
179Index: /usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html
180===================================================================
181--- .orig/usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html
182+++ /usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html
172diff --git a/usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html b/usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html
173index 88a6b73..52cc968 100644
174--- a/usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html
175+++ b/usr/palm/applications/com.palm.app.soundsandalerts/app/views/soundsalertsconfig/soundsalertsconfig-scene.html
183176@@ -48,9 +48,27 @@
184177 </div>
185178 </div>
202202 <div x-mojo-element="Slider" id='systemvolume' class="palm-slider"></div>
203203 </div>
204204 </div>
205@@ -64,4 +82,4 @@
206 </div>
207 </div>
208 </div>
209-</div>
210\ No newline at end of file
211+</div>