| | |
| --- /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 |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js |
| 3 | 3 | @@ -102,12 +102,39 @@ |
| 4 | 4 | } |
| 5 | 5 | }; |
| … | … | |
| 40 | 40 | }; |
| 41 | 41 | |
| 42 | 42 | Chrome.prototype.isVisible = function() { |
| --- /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 |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js |
| 45 | 45 | @@ -0,0 +1,46 @@ |
| 46 | 46 | +/** |
| 47 | 47 | + * A dialog assistant for display of yes/no box. |
| … | … | |
| 89 | 89 | + } |
| 90 | 90 | + } |
| 91 | 91 | +}); |
| --- /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 @@ |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js |
| @@ -614,6 +614,7 @@ |
| {label: $L('Open In New Card'), command:'openNew'}, |
| {label: $L('Share Link'), command:'shareUrl'}, |
| {label: $L('Copy URL'), command:'copyUrl'}, |
| + {label: $L('Download URL'), command:'downloadUrl'}, |
| {label: $L('Copy to Photos'), command:'copyToPhotos'}, |
| {label: $L('Share Image'), command:'shareImage'}, |
| {label: $L('Set Wallpaper'), command:'setWallpaper'} |
| @@ -665,6 +666,9 @@ |
| case 'copyUrl': |
| this.controller.stageController.setClipboard(urlInfo.url); |
| break; |
| + case 'downloadUrl': |
| + this._downloadResource(urlInfo.url); |
| + break; |
| case 'copyToPhotos': |
| this._webView.mojo.saveImageAtPoint(tapPt.left, tapPt.top, "/media/internal", saveImageCallback); |
| break; |
| @@ -685,6 +689,7 @@ |
| usedItems.push( findItem('openNew') ); |
| usedItems.push( findItem('shareUrl') ); |
| usedItems.push( findItem('copyUrl') ); |
| + usedItems.push( findItem('downloadUrl') ); |
| } |
| |
| if (response.src) { |
| @@ -1198,7 +1203,30 @@ |
| 95 | 121 | PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ |
| 96 | 122 | |
| 97 | 123 | Mojo.Log.info("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType); |
| 98 | 124 | - |
| + 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') |
| + if(appid === 'com.palm.app.email' || appid === 'com.palm.app.docviewer' || appid === 'com.palm.app.pdfviewer' || appid === 'com.palm.app.maps' || appid === 'com.palm.app.phone' || appid === 'com.palm.app.youtube') |
| 100 | 126 | + //a phone #, Google Map, docviewer, email, pdfviewer, or YouTube link was clicked, so we bypass the download dialog and open the app. |
| 101 | 127 | + { |
| 102 | 128 | + var params = {target: uri, mimeType: mimeType}; |
| … | … | |
| 149 | 149 | // Only a few select applications can be |
| 150 | 150 | crossAppScene = { |
| 151 | 151 | 'com.palm.app.videoplayer': 'nowplaying', |
| @@ -1206,11 +1229,9 @@ |
| @@ -1206,11 +1234,9 @@ |
| 153 | 153 | }; |
| 154 | 154 | var params = {target: uri, mimeType: mimeType}; |
| 155 | 155 | if (crossAppScene[appid]) { |
| … | … | |
| 162 | 162 | this.controller.serviceRequest('palm://com.palm.applicationManager', { |
| 163 | 163 | method: 'open', |
| 164 | 164 | parameters: { |
| @@ -1219,6 +1240,9 @@ |
| @@ -1219,6 +1245,9 @@ |
| 166 | 166 | } |
| 167 | 167 | }); |
| 168 | 168 | } |
| … | … | |
| 172 | 172 | }; |
| 173 | 173 | |
| 174 | 174 | /** |
| @@ -2237,6 +2261,31 @@ |
| @@ -2237,6 +2266,24 @@ |
| 176 | 176 | // allowed to trigger the bar. |
| 177 | 177 | if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) { |
| 178 | 178 | this._gotoUrlBar(); |
| … | … | |
| 182 | 182 | + var pageHeight = scroller.mojo.scrollerSize().height; |
| 183 | 183 | + if (pageHeight > 50) pageHeight = pageHeight - 50; |
| 184 | 184 | + if (key == Mojo.Char.spaceBar) { |
| + // alternate method for scrolling, gives visual feedback, but slower |
| + //var currentTop = scroller.mojo.getScrollPosition().top; |
| + //currentTop += scroller.mojo.scrollerSize().height - 50; |
| + //scroller.mojo.scrollTo(undefined, currentTop, true); |
| 189 | 185 | + scroller.mojo.adjustBy(0, -1*pageHeight); |
| 190 | 186 | + this._addressBar.hide(); |
| + } else if (key == Mojo.Char.shift) { |
| + scroller.mojo.adjustBy(0, pageHeight); |
| 193 | 187 | + } else if (key == Mojo.Char.period) { |
| + scroller.mojo.adjustBy(0, -25); |
| + this._addressBar.hide(); |
| + scroller.mojo.adjustBy(0, pageHeight); |
| 196 | 189 | + } else if (key == Mojo.Char.backspace) { |
| 197 | 190 | + scroller.mojo.revealTop(0); |
| 198 | 191 | + } else if (key == Mojo.Char.enter) { |
| … | … | |
| 197 | 197 | } |
| 198 | 198 | } |
| 199 | 199 | }; |
| --- /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 |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js |
| 202 | 202 | @@ -47,6 +47,10 @@ |
| 203 | 203 | if (orientation !== 'up') { |
| 204 | 204 | // In landscape and down we ALWAYS hide the BAR so we make sure it's |
| … | … | |
| 258 | 258 | }; |
| 259 | 259 | |
| 260 | 260 | UrlBar.prototype.isVisible = function() { |
| --- /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 |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html |
| 263 | 263 | @@ -0,0 +1,8 @@ |
| 264 | 264 | +<div id="palm-dialog-content" class="palm-dialog-content"> |
| 265 | 265 | + <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> |
| … | … | |
| 269 | 269 | + <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Stream</div> |
| 270 | 270 | + <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Download</div> |
| 271 | 271 | +</div> |
| --- /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 |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/sources.json |
| 274 | 274 | @@ -48,6 +48,9 @@ |
| 275 | 275 | "source": "app\/controllers\/download-controller.js", |
| 276 | 276 | }, |
| … | … | |
| 281 | 281 | "source": "app\/controllers\/preferences-assistant.js", |
| 282 | 282 | }, |
| 283 | 283 | { |
| --- /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 |
| --- /dev/null |
| +++ /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css |
| 286 | 286 | @@ -753,7 +753,7 @@ |
| 287 | 287 | } |
| 288 | 288 | |
