Commit 7227892b520825dfb85beb9652c2e03998b57a47

  • avatar
  • Daniel Beames <dbeames @del…ge.vision5.com>
  • Fri Oct 23 21:55:08 CEST 2009
3 New and 2 modified send via webOS-Patches form.
  
1--- .orig/usr/lib/luna/system/luna-applauncher/app/views/launcher/page-item.html
2+++ /usr/lib/luna/system/luna-applauncher/app/views/launcher/page-item.html
3@@ -2,5 +2,4 @@
4 <div class="icon">
5 <img class="draggable" src="#{icon}" x-palm-pass-event="true"></img>
6 </div>
7- <div class="name">#{title}</div>
8 </div>
9\ No newline at end of file
  
1diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js b/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js
2index 4e0f974..fc1520d 100644
3--- a/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js
4+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js
5@@ -102,12 +102,39 @@ Chrome.prototype._hidePortrait = function() {
1--- /tmp/old/app/controllers/chrome.js Thu Oct 22 01:20:25 2009
2+++ /usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js Thu Oct 22 01:24:41 2009
3@@ -102,12 +102,39 @@
64 }
75 };
86
4040 };
4141
4242 Chrome.prototype.isVisible = function() {
43diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js b/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js
44new file mode 100644
45index 0000000..4c07986
46--- /dev/null
47+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js
43--- /tmp/old/app/controllers/downloaddialog-assistant.js Wed Dec 31 16:00:00 1969
44+++ /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js Thu Oct 22 01:24:41 2009
4845@@ -0,0 +1,46 @@
4946+/**
5047+ * A dialog assistant for display of yes/no box.
8989+ }
9090+ }
9191+});
92diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js
93index a805d2c..1074480 100644
94--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js
95+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js
96@@ -1198,7 +1198,95 @@ PageAssistant.prototype._newBrowserPage = function(url, pageIdentifier){
92--- /tmp/old/app/controllers/page-assistant.js Thu Oct 22 01:20:25 2009
93+++ /usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js Thu Oct 22 00:28:49 2009
94@@ -1198,7 +1198,30 @@
9795 PageAssistant.prototype._streamResource = function(uri, appid, mimeType){
9896
9997 Mojo.Log.info("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType);
10098-
101+ if(appid === 'com.palm.app.email')
99+ if(appid === 'com.palm.app.email' || 'com.palm.app.docviewer' || 'com.palm.app.pdfviewer' || 'com.palm.app.maps' || 'com.palm.app.youtube' || 'com.palm.app.phone')
100+ //a phone #, Google Map, docviewer, email, pdfviewer, or YouTube link was clicked, so we bypass the download dialog and open the app.
102101+ {
103+ //an email was clicked, so we bypass the download dialog and open the email app.
104+ var params = {target: uri, mimeType: mimeType};
105+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
106+ method: 'open',
107+ parameters: {
108+ 'id': appid,
109+ 'params': params
110+ }}
111+ );
112+ return;
102+ var params = {target: uri, mimeType: mimeType};
103+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
104+ method: 'open',
105+ parameters: {
106+ 'id': appid,
107+ 'params': params
108+ }}
109+ );
110+ return;
113111+ }
114+ if(appid === 'com.palm.app.docviwer')
115+ {
116+ //a doc was clicked, so we bypass the download dialog and open the docviewer app.
117+ var params = {target: uri, mimeType: mimeType};
118+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
119+ method: 'open',
120+ parameters: {
121+ 'id': appid,
122+ 'params': params
123+ }}
124+ );
125+ return;
126+ }
127+ if(appid === 'com.palm.app.pdfviewer')
128+ {
129+ //a pdf was clicked, so we bypass the download dialog and open the pdfviewer app.
130+ var params = {target: uri, mimeType: mimeType};
131+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
132+ method: 'open',
133+ parameters: {
134+ 'id': appid,
135+ 'params': params
136+ }}
137+ );
138+ return;
139+ }
140+ if(appid === 'com.palm.app.maps')
141+ {
142+ //a map was clicked, so we bypass the download dialog and open the maps app.
143+ var params = {target: uri, mimeType: mimeType};
144+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
145+ method: 'open',
146+ parameters: {
147+ 'id': appid,
148+ 'params': params
149+ }}
150+ );
151+ return;
152+ }
153+ if(appid === 'com.palm.app.youtube')
154+ {
155+ //a youtube video was clicked, so we bypass the download dialog and open the youtube app.
156+ var params = {target: uri, mimeType: mimeType};
157+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
158+ method: 'open',
159+ parameters: {
160+ 'id': appid,
161+ 'params': params
162+ }}
163+ );
164+ return;
165+ }
166+ if(appid === 'com.palm.app.phone')
167+ {
168+ //a phone # was clicked, so we bypass the download dialog and open the phone app.
169+ var params = {target: uri, mimeType: mimeType};
170+ this.controller.serviceRequest('palm://com.palm.applicationManager',{
171+ method: 'open',
172+ parameters: {
173+ 'id': appid,
174+ 'params': params
175+ }}
176+ );
177+ return;
178+ }
179112+ this._downloadWidgetElement = this.controller.showDialog({
180113+ uri: uri,
181114+ mimeType: mimeType,
123123 // Only a few select applications can be
124124 crossAppScene = {
125125 'com.palm.app.videoplayer': 'nowplaying',
126@@ -1206,11 +1294,9 @@ PageAssistant.prototype._streamResource = function(uri, appid, mimeType){
126@@ -1206,11 +1229,9 @@
127127 };
128128 var params = {target: uri, mimeType: mimeType};
129129 if (crossAppScene[appid]) {
136136 this.controller.serviceRequest('palm://com.palm.applicationManager', {
137137 method: 'open',
138138 parameters: {
139@@ -1219,6 +1305,9 @@ PageAssistant.prototype._streamResource = function(uri, appid, mimeType){
139@@ -1219,6 +1240,9 @@
140140 }
141141 });
142142 }
146146 };
147147
148148 /**
149@@ -2237,6 +2326,31 @@ PageAssistant.prototype._onKeyDownEvent = function(event) {
149@@ -2237,6 +2261,31 @@
150150 // allowed to trigger the bar.
151151 if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) {
152152 this._gotoUrlBar();
155155+ var scroller = this.controller.getSceneScroller();
156156+ var pageHeight = scroller.mojo.scrollerSize().height;
157157+ if (pageHeight > 50) pageHeight = pageHeight - 50;
158+ if (key == 32) {
158+ if (key == Mojo.Char.spaceBar) {
159159+ // alternate method for scrolling, gives visual feedback, but slower
160160+ //var currentTop = scroller.mojo.getScrollPosition().top;
161161+ //currentTop += scroller.mojo.scrollerSize().height - 50;
162162+ //scroller.mojo.scrollTo(undefined, currentTop, true);
163163+ scroller.mojo.adjustBy(0, -1*pageHeight);
164164+ this._addressBar.hide();
165+ } else if (key == 0) {
165+ } else if (key == Mojo.Char.shift) {
166166+ scroller.mojo.adjustBy(0, pageHeight);
167+ } else if (key == 190) {
167+ } else if (key == Mojo.Char.period) {
168168+ scroller.mojo.adjustBy(0, -25);
169169+ this._addressBar.hide();
170+ } else if (key == 8) {
170+ } else if (key == Mojo.Char.backspace) {
171171+ scroller.mojo.revealTop(0);
172+ } else if (key == 13) {
172+ } else if (key == Mojo.Char.enter) {
173173+ scroller.mojo.revealBottom(0);
174174+ this._addressBar.hide();
175175+ } else {
178178 }
179179 }
180180 };
181diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js b/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js
182index 94abd5d..cafa2e4 100644
183--- a/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js
184+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js
185@@ -47,6 +47,10 @@ UrlBar.prototype.setOrientation = function(orientation) {
181--- /tmp/old/app/controllers/urlbar.js Thu Oct 22 01:20:25 2009
182+++ /usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js Thu Oct 22 01:24:41 2009
183@@ -47,6 +47,10 @@
186184 if (orientation !== 'up') {
187185 // In landscape and down we ALWAYS hide the BAR so we make sure it's
188186 // already hidden by calling' 'hide'.
191191 this._hidePortrait();
192192 }
193193
194@@ -73,6 +77,12 @@ UrlBar.prototype.setup = function(properties) {
194@@ -73,6 +77,12 @@
195195 this._onPropertyChange = properties.onPropertyChange || function(){};
196196 this._configOrientation(properties.orientation || 'up');
197197
204204 this.models = {
205205 urlInput: {
206206 template: 'page/url-field',
207@@ -90,7 +100,7 @@ UrlBar.prototype.setup = function(properties) {
207@@ -90,7 +100,7 @@
208208 url: ''
209209 },
210210
213213 },
214214
215215 // Beware: These are shallow copies.
216@@ -416,12 +426,25 @@ UrlBar.prototype._hidePortrait = function() {
216@@ -416,12 +426,25 @@
217217 this.controller.setMenuVisible(Mojo.Menu.viewMenu, false);
218218 };
219219
239239 };
240240
241241 UrlBar.prototype.isVisible = function() {
242diff --git a/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html b/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html
243new file mode 100644
244index 0000000..b705ece
245--- /dev/null
246+++ b/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html
242--- /tmp/old/app/views/download/download-stream-popup.html Wed Dec 31 16:00:00 1969
243+++ /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html Thu Oct 22 01:24:41 2009
247244@@ -0,0 +1,8 @@
248245+<div id="palm-dialog-content" class="palm-dialog-content">
249246+ <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>
250250+ <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Stream</div>
251251+ <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Download</div>
252252+</div>
253diff --git a/usr/palm/applications/com.palm.app.browser/sources.json b/usr/palm/applications/com.palm.app.browser/sources.json
254index 54187ce..7d79e70 100644
255--- a/usr/palm/applications/com.palm.app.browser/sources.json
256+++ b/usr/palm/applications/com.palm.app.browser/sources.json
253--- /tmp/old/sources.json Thu Oct 22 01:20:25 2009
254+++ /usr/palm/applications/com.palm.app.browser/sources.json Thu Oct 22 01:24:41 2009
257255@@ -48,6 +48,9 @@
258256 "source": "app\/controllers\/download-controller.js",
259257 },
262262 "source": "app\/controllers\/preferences-assistant.js",
263263 },
264264 {
265diff --git a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
266index 6215e0b..aee8654 100644
267--- a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
268+++ b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
269@@ -753,7 +753,7 @@ div#historyScroller {
265--- /tmp/old/stylesheets/browser.css Thu Oct 22 01:20:25 2009
266+++ /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css Thu Oct 22 01:24:41 2009
267@@ -753,7 +753,7 @@
270268 }
271269
272270 .search-results-container .palm-list {
  
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..08d56ac 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@@ -1101,10 +1101,13 @@ HistoryAssistant.prototype.setup = function() {
1Swipe delete history in the browser
2Index: /usr/palm/applications/com.palm.app.browser/app/controllers/history-assistant.js
3===================================================================
4--- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/history-assistant.js
5+++ /usr/palm/applications/com.palm.app.browser/app/controllers/history-assistant.js
6@@ -34,10 +34,13 @@ HistoryAssistant.prototype.setup = funct
67 this.controller.setupWidget('historyList', {
78 itemTemplate:'history/history-entry',
89 listTemplate:'history/history-container',
910- itemsCallback:this._itemsCallback.bind(this)
1011+ itemsCallback:this._itemsCallback.bind(this),
11+ swipeToDelete:true,
12+ autoconfirmDelete:true
12+ swipeToDelete:true,
13+ autoconfirmDelete:true
1314 });
14
15
1516 this._onListSelectionHandler = this._onListSelection.bindAsEventListener(this);
16+ this._onListDeleteHandler = this._onListDelete.bindAsEventListener(this);
17+ this._onListDeleteHandler = this._onListDelete.bindAsEventListener(this);
1718 this._historyListWidget = this.controller.get('historyList');
18
19
1920 var appMenuModel = {
20@@ -1130,6 +1133,7 @@ HistoryAssistant.prototype.cleanup = function() {
21@@ -63,6 +66,7 @@ HistoryAssistant.prototype.cleanup = fun
2122 HistoryAssistant.prototype.activate = function() {
22
23
2324 this._historyListWidget.addEventListener(Mojo.Event.listTap, this._onListSelectionHandler);
2425+ this._historyListWidget.addEventListener(Mojo.Event.listDelete, this._onListDeleteHandler);
25
26
2627 // On an activation for a re-render of the contents.
27 var len = this._historyListWidget.mojo.getLength();
28@@ -1139,6 +1143,7 @@ HistoryAssistant.prototype.activate = function() {
28 var len = this._historyListWidget.mojo.getLength();
29@@ -72,6 +76,7 @@ HistoryAssistant.prototype.activate = fu
2930 HistoryAssistant.prototype.deactivate = function() {
30
31
3132 Mojo.Event.stopListening(this._historyListWidget, Mojo.Event.listTap, this._onListSelectionHandler);
3233+ Mojo.Event.stopListening(this._historyListWidget, Mojo.Event.listDelete, this._onListDeleteHandler);
3334 };
34
35
3536 /**
36@@ -1218,6 +1223,10 @@ HistoryAssistant.prototype._onListSelection = function(event) {
37@@ -151,6 +156,10 @@ HistoryAssistant.prototype._onListSelect
3738 });
3839 };
39
40
4041+HistoryAssistant.prototype._onListDelete = function(event) {
4142+ this.historyStore.deleteHistoryEntry(event.item.url, function() {}, function() {});
4243+};
4545 /**
4646 * handle a menu command.
4747 */
48@@ -7349,6 +7358,15 @@ function HistoryStore(options, onSuccess, onFailure) {
49 }
48Index: /usr/palm/applications/com.palm.app.browser/app/models/history-store.js
49===================================================================
50--- .orig/usr/palm/applications/com.palm.app.browser/app/models/history-store.js
51+++ /usr/palm/applications/com.palm.app.browser/app/models/history-store.js
52@@ -24,6 +24,11 @@ function HistoryStore(options, onSuccess
5053 }
51
54
55 /** @private */
5256+HistoryStore.prototype._deleteHistoryEntry = function(url, onSuccess, onFailure, transaction) {
5357+ this._executeSql(transaction, onSuccess, onFailure,
5458+ "DELETE FROM 'history' WHERE url = ?", [url] );
5559+};
5660+
61 HistoryStore.prototype._addHistoryEntry = function(url, title, date, onSuccess, onFailure, transaction) {
62
63 var utcNow = date.getUTC().getTime();
64@@ -41,6 +46,10 @@ HistoryStore.prototype._addHistoryEntry
65 "INSERT INTO 'history' (date, url, title) VALUES(?, ?, ?)", [utcNow, url, title]);
66 };
67
5768+HistoryStore.prototype.deleteHistoryEntry = function(url, onSuccess, onFailure) {
58+ this.database.transaction(this._deleteHistoryEntry.bind(this, url, onSuccess, onFailure));
69+ this.database.transaction(this._deleteHistoryEntry.bind(this, url, onSuccess, onFailure));
5970+};
6071+
61 /** @private */
62 HistoryStore.prototype._addHistoryEntry = function(url, title, date, onSuccess, onFailure, transaction) {
63
72 /**
73 * Add a history entry.
74 *
  
1Adds 45 min, 90 min and 2 hour before alarms options to calendar events.
2Index: /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@@ -449,7 +449,10 @@ var EditAssistant = Class.create({
7 '-PT10M', //Do not localize
8 '-PT15M', // Do NOT Localize
9 '-PT30M', // Do NOT Localize
10+ '-PT45M', // Customized: Add 45 minute option
11 '-PT1H', // Do NOT Localize
12+ '-PT90M', // Customized: Add 90 minute option
13+ '-PT2H', // Customized: Add 2 hour option
14 '-P1D' // Do NOT Localize
15 ]
16 },
17Index: /usr/palm/applications/com.palm.app.calendar/app/controllers/prefs-assistant.js
18===================================================================
19--- .orig/usr/palm/applications/com.palm.app.calendar/app/controllers/prefs-assistant.js
20+++ /usr/palm/applications/com.palm.app.calendar/app/controllers/prefs-assistant.js
21@@ -3,7 +3,7 @@
22 var THIRTY_MINUTES = $L("30 minutes");
23 var ONE_HOUR = $L("1 hour");
24 var TWO_HOURS = $L("2 hours");
25-var numTimedAlarm = 7;
26+var numTimedAlarm = 10; // Customized: Changed 7 to 10. See corresponding change in BuildAlarmsMenu
27 var PrefsAssistant = Class.create({
28
29 initialize: function() {
30@@ -219,7 +219,10 @@ var PrefsAssistant = Class.create({
31 this.alarms[4].command,
32 this.alarms[5].command,
33 this.alarms[6].command,
34-
35+ this.alarms[7].command, // Customized: Added 3 new options, so need
36+ this.alarms[8].command, // Customized: to account for 10 items in
37+ this.alarms[9].command, // Customized: the list instead of 7.
38+
39
40 this.allDayAlarms[1].command,
41 this.allDayAlarms[2].command,
42@@ -638,7 +641,10 @@ var PrefsAssistant = Class.create({
43 {label: '', command: '-PT10M'}, //Do Not localize
44 {label: '', command: '-PT15M'}, // Do NOT Localize
45 {label: '', command: '-PT30M'}, // Do NOT Localize
46+ {label: '', command: '-PT45M'}, // Customized: Added 45 minute option
47 {label: '', command: '-PT1H'}, // Do NOT Localize
48+ {label: '', command: '-PT90M'}, // Customized: Added 90 minute option
49+ {label: '', command: '-PT2H'}, // Customized: Added 2 hour option
50 {label: '', command: '-P1D'} // Do NOT Localize
51 ],
52
  
1Moves the pinpad to the top of the lock screen, making it easier to avoid accidentally hitting the "Emergency Call" button when unlocking your phone.
2Index: /usr/palm/applications/com.palm.app.phone/stylesheets/pinpad.css
3===================================================================
4--- .orig/usr/palm/applications/com.palm.app.phone/stylesheets/pinpad.css
5+++ /usr/palm/applications/com.palm.app.phone/stylesheets/pinpad.css
6@@ -14,6 +14,8 @@
7 text-align: center;
8 width: 320px;
9 color: #FFFFFF;
10+ position: absolute;
11+ bottom: 60px;
12 }
13
14 .info .big {
15@@ -146,8 +148,8 @@ input.floating.single-digit {
16 }
17
18 .pin-main-scene .keypad-flex {
19- top: 112px;
20- bottom: 55px;
21+ top: 0px;
22+ bottom: 148px;
23 }
24
25 .pin-main-scene .keypad-flex .keypad-row {