| |   |
| diff --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 |
| index 4e0f974..fc1520d 100644 |
| --- a/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js |
| +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js |
| @@ -102,12 +102,39 @@ Chrome.prototype._hidePortrait = function() { |
| --- /tmp/old/app/controllers/chrome.js Thu Oct 22 01:20:25 2009 |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js Thu Oct 22 01:24:41 2009 |
| @@ -102,12 +102,39 @@ |
| 6 | 4 | } |
| 7 | 5 | }; |
| 8 | 6 | |
| … | … | |
| 40 | 40 | }; |
| 41 | 41 | |
| 42 | 42 | Chrome.prototype.isVisible = function() { |
| diff --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 |
| new file mode 100644 |
| index 0000000..4c07986 |
| --- /dev/null |
| +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js |
| --- /tmp/old/app/controllers/downloaddialog-assistant.js Wed Dec 31 16:00:00 1969 |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js Thu Oct 22 01:24:41 2009 |
| 48 | 45 | @@ -0,0 +1,46 @@ |
| 49 | 46 | +/** |
| 50 | 47 | + * A dialog assistant for display of yes/no box. |
| … | … | |
| 89 | 89 | + } |
| 90 | 90 | + } |
| 91 | 91 | +}); |
| diff --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 |
| index a805d2c..1074480 100644 |
| --- 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 |
| @@ -1198,7 +1198,95 @@ PageAssistant.prototype._newBrowserPage = function(url, pageIdentifier){ |
| --- /tmp/old/app/controllers/page-assistant.js Thu Oct 22 01:20:25 2009 |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js Thu Oct 22 00:28:49 2009 |
| @@ -1198,7 +1198,30 @@ |
| 97 | 95 | PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ |
| 98 | 96 | |
| 99 | 97 | Mojo.Log.info("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType); |
| 100 | 98 | - |
| + if(appid === 'com.palm.app.email') |
| + 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') |
| + //a phone #, Google Map, docviewer, email, pdfviewer, or YouTube link was clicked, so we bypass the download dialog and open the app. |
| 102 | 101 | + { |
| + //an email was clicked, so we bypass the download dialog and open the email app. |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| 113 | 111 | + } |
| + if(appid === 'com.palm.app.docviwer') |
| + { |
| + //a doc was clicked, so we bypass the download dialog and open the docviewer app. |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| + } |
| + if(appid === 'com.palm.app.pdfviewer') |
| + { |
| + //a pdf was clicked, so we bypass the download dialog and open the pdfviewer app. |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| + } |
| + if(appid === 'com.palm.app.maps') |
| + { |
| + //a map was clicked, so we bypass the download dialog and open the maps app. |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| + } |
| + if(appid === 'com.palm.app.youtube') |
| + { |
| + //a youtube video was clicked, so we bypass the download dialog and open the youtube app. |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| + } |
| + if(appid === 'com.palm.app.phone') |
| + { |
| + //a phone # was clicked, so we bypass the download dialog and open the phone app. |
| + var params = {target: uri, mimeType: mimeType}; |
| + this.controller.serviceRequest('palm://com.palm.applicationManager',{ |
| + method: 'open', |
| + parameters: { |
| + 'id': appid, |
| + 'params': params |
| + }} |
| + ); |
| + return; |
| + } |
| 179 | 112 | + this._downloadWidgetElement = this.controller.showDialog({ |
| 180 | 113 | + uri: uri, |
| 181 | 114 | + mimeType: mimeType, |
| … | … | |
| 123 | 123 | // Only a few select applications can be |
| 124 | 124 | crossAppScene = { |
| 125 | 125 | 'com.palm.app.videoplayer': 'nowplaying', |
| @@ -1206,11 +1294,9 @@ PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ |
| @@ -1206,11 +1229,9 @@ |
| 127 | 127 | }; |
| 128 | 128 | var params = {target: uri, mimeType: mimeType}; |
| 129 | 129 | if (crossAppScene[appid]) { |
| … | … | |
| 136 | 136 | this.controller.serviceRequest('palm://com.palm.applicationManager', { |
| 137 | 137 | method: 'open', |
| 138 | 138 | parameters: { |
| @@ -1219,6 +1305,9 @@ PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ |
| @@ -1219,6 +1240,9 @@ |
| 140 | 140 | } |
| 141 | 141 | }); |
| 142 | 142 | } |
| … | … | |
| 146 | 146 | }; |
| 147 | 147 | |
| 148 | 148 | /** |
| @@ -2237,6 +2326,31 @@ PageAssistant.prototype._onKeyDownEvent = function(event) { |
| @@ -2237,6 +2261,31 @@ |
| 150 | 150 | // allowed to trigger the bar. |
| 151 | 151 | if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) { |
| 152 | 152 | this._gotoUrlBar(); |
| … | … | |
| 155 | 155 | + var scroller = this.controller.getSceneScroller(); |
| 156 | 156 | + var pageHeight = scroller.mojo.scrollerSize().height; |
| 157 | 157 | + if (pageHeight > 50) pageHeight = pageHeight - 50; |
| + if (key == 32) { |
| + if (key == Mojo.Char.spaceBar) { |
| 159 | 159 | + // alternate method for scrolling, gives visual feedback, but slower |
| 160 | 160 | + //var currentTop = scroller.mojo.getScrollPosition().top; |
| 161 | 161 | + //currentTop += scroller.mojo.scrollerSize().height - 50; |
| 162 | 162 | + //scroller.mojo.scrollTo(undefined, currentTop, true); |
| 163 | 163 | + scroller.mojo.adjustBy(0, -1*pageHeight); |
| 164 | 164 | + this._addressBar.hide(); |
| + } else if (key == 0) { |
| + } else if (key == Mojo.Char.shift) { |
| 166 | 166 | + scroller.mojo.adjustBy(0, pageHeight); |
| + } else if (key == 190) { |
| + } else if (key == Mojo.Char.period) { |
| 168 | 168 | + scroller.mojo.adjustBy(0, -25); |
| 169 | 169 | + this._addressBar.hide(); |
| + } else if (key == 8) { |
| + } else if (key == Mojo.Char.backspace) { |
| 171 | 171 | + scroller.mojo.revealTop(0); |
| + } else if (key == 13) { |
| + } else if (key == Mojo.Char.enter) { |
| 173 | 173 | + scroller.mojo.revealBottom(0); |
| 174 | 174 | + this._addressBar.hide(); |
| 175 | 175 | + } else { |
| … | … | |
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | }; |
| diff --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 |
| index 94abd5d..cafa2e4 100644 |
| --- a/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js |
| +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js |
| @@ -47,6 +47,10 @@ UrlBar.prototype.setOrientation = function(orientation) { |
| --- /tmp/old/app/controllers/urlbar.js Thu Oct 22 01:20:25 2009 |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js Thu Oct 22 01:24:41 2009 |
| @@ -47,6 +47,10 @@ |
| 186 | 184 | if (orientation !== 'up') { |
| 187 | 185 | // In landscape and down we ALWAYS hide the BAR so we make sure it's |
| 188 | 186 | // already hidden by calling' 'hide'. |
| … | … | |
| 191 | 191 | this._hidePortrait(); |
| 192 | 192 | } |
| 193 | 193 | |
| @@ -73,6 +77,12 @@ UrlBar.prototype.setup = function(properties) { |
| @@ -73,6 +77,12 @@ |
| 195 | 195 | this._onPropertyChange = properties.onPropertyChange || function(){}; |
| 196 | 196 | this._configOrientation(properties.orientation || 'up'); |
| 197 | 197 | |
| … | … | |
| 204 | 204 | this.models = { |
| 205 | 205 | urlInput: { |
| 206 | 206 | template: 'page/url-field', |
| @@ -90,7 +100,7 @@ UrlBar.prototype.setup = function(properties) { |
| @@ -90,7 +100,7 @@ |
| 208 | 208 | url: '' |
| 209 | 209 | }, |
| 210 | 210 | |
| … | … | |
| 213 | 213 | }, |
| 214 | 214 | |
| 215 | 215 | // Beware: These are shallow copies. |
| @@ -416,12 +426,25 @@ UrlBar.prototype._hidePortrait = function() { |
| @@ -416,12 +426,25 @@ |
| 217 | 217 | this.controller.setMenuVisible(Mojo.Menu.viewMenu, false); |
| 218 | 218 | }; |
| 219 | 219 | |
| … | … | |
| 239 | 239 | }; |
| 240 | 240 | |
| 241 | 241 | UrlBar.prototype.isVisible = function() { |
| diff --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 |
| new file mode 100644 |
| index 0000000..b705ece |
| --- /dev/null |
| +++ b/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html |
| --- /tmp/old/app/views/download/download-stream-popup.html Wed Dec 31 16:00:00 1969 |
| +++ /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html Thu Oct 22 01:24:41 2009 |
| 247 | 244 | @@ -0,0 +1,8 @@ |
| 248 | 245 | +<div id="palm-dialog-content" class="palm-dialog-content"> |
| 249 | 246 | + <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> |
| … | … | |
| 250 | 250 | + <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Stream</div> |
| 251 | 251 | + <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Download</div> |
| 252 | 252 | +</div> |
| diff --git a/usr/palm/applications/com.palm.app.browser/sources.json b/usr/palm/applications/com.palm.app.browser/sources.json |
| index 54187ce..7d79e70 100644 |
| --- a/usr/palm/applications/com.palm.app.browser/sources.json |
| +++ b/usr/palm/applications/com.palm.app.browser/sources.json |
| --- /tmp/old/sources.json Thu Oct 22 01:20:25 2009 |
| +++ /usr/palm/applications/com.palm.app.browser/sources.json Thu Oct 22 01:24:41 2009 |
| 257 | 255 | @@ -48,6 +48,9 @@ |
| 258 | 256 | "source": "app\/controllers\/download-controller.js", |
| 259 | 257 | }, |
| … | … | |
| 262 | 262 | "source": "app\/controllers\/preferences-assistant.js", |
| 263 | 263 | }, |
| 264 | 264 | { |
| diff --git a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css |
| index 6215e0b..aee8654 100644 |
| --- a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css |
| +++ b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css |
| @@ -753,7 +753,7 @@ div#historyScroller { |
| --- /tmp/old/stylesheets/browser.css Thu Oct 22 01:20:25 2009 |
| +++ /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css Thu Oct 22 01:24:41 2009 |
| @@ -753,7 +753,7 @@ |
| 270 | 268 | } |
| 271 | 269 | |
| 272 | 270 | .search-results-container .palm-list { |