Commit 05bc769cae49dac1a1c8ddecfb5477ff42760c3c
- Diff rendering mode:
- inline
- side by side
|   | |||
| 1 | diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js | ||
| 2 | index e4268cf..889875f 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js | ||
| 5 | @@ -233,7 +233,7 @@ GlobalSearchAssistant = Class.create({ | ||
| 6 | this.launcherHiddenAtFirstKeydown = false; | ||
| 7 | } | ||
| 8 | else { | ||
| 9 | - SystemManagerService.showQuickLaunch(true); | ||
| 10 | + SystemManagerService.showQuickLaunch(false); | ||
| 11 | } | ||
| 12 | }, | ||
| 13 | |||
| 14 | diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 15 | index bebbad2..afefa2e 100644 | ||
| 16 | --- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 17 | +++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 18 | @@ -8,7 +8,7 @@ var LauncherAssistant = Class.create({ | ||
| 19 | * hardcoding the quick launch height until we can find a better way. | ||
| 20 | * This value = ql graphic height - the offset from the top (small fade area) | ||
| 21 | */ | ||
| 22 | - kQuickLaunchHeight: 67, | ||
| 23 | + kQuickLaunchHeight: 0, | ||
| 24 | |||
| 25 | kPageIndicatorSpacing: 6, /* spacing between each page indicator */ | ||
| 26 | kPageMargin: 10, /* 10 pixel margin on each side of a page */ | ||
| 27 | @@ -590,7 +590,7 @@ var LauncherAssistant = Class.create({ | ||
| 28 | this.controller, | ||
| 29 | function() { | ||
| 30 | delete this.appDialog; | ||
| 31 | - SystemManagerService.showQuickLaunch(true); | ||
| 32 | + SystemManagerService.showQuickLaunch(false); | ||
| 33 | this.globalSearchAssistant.enable(true); | ||
| 34 | }.bind(this)); | ||
| 35 | |||
| 36 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 37 | index 6fdbb39..0709d07 100644 | ||
| 38 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 39 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 40 | @@ -260,6 +260,13 @@ handleAppName:function(payload){ | ||
| 41 | } | ||
| 42 | $('appname').innerHTML = $L("Preferences"); | ||
| 43 | } | ||
| 44 | + else if (payload.id == "com.palm.launcher"){ | ||
| 45 | + this.controller.serviceRequest('palm://com.palm.systemmanager', { | ||
| 46 | + method: 'systemUi', | ||
| 47 | + parameters: {"quicklaunch": false} | ||
| 48 | + }); | ||
| 49 | + $('appname').innerHTML = payload.appmenu || payload.title; | ||
| 50 | + } | ||
| 51 | else | ||
| 52 | $('appname').innerHTML = payload.appmenu || payload.title; | ||
| 53 | $('appname').show(); |
|   | |||
| 1 | Name: Hide_VZNav | ||
| 2 | Version: 1.3.5.1-1 | ||
| 3 | Author: mhous33 | ||
| 4 | Description: Hides VZNav icon | ||
| 5 | |||
| 6 | --- .orig/usr/palm/applications/com.nim.app.vznavigator/appinfo.json | ||
| 7 | +++ /usr/palm/applications/com.nim.app.vznavigator/appinfo.json | ||
| 8 | @@ -7,6 +7,7 @@ | ||
| 9 | "type": "web", | ||
| 10 | "vendor": "Networks In Motion", | ||
| 11 | "vendorurl": "http://www.networksinmotion.com/", | ||
| 12 | + "visible": "false" | ||
| 13 | "noWindow": true, | ||
| 14 | "mimeTypes": [ | ||
| 15 | { "scheme":"mapto" }, |
|   | |||
| 1 | Name: Launcher Auto-Popup | ||
| 2 | Version: 1.3.5-1 | ||
| 3 | Author: Jason Robitaille | ||
| 4 | Description: Will bring up launcher on system boot. Also, upon turning the screen on, if no cards are in focus, the launcher will pop up. (MIT license) | ||
| 5 | |||
| 6 | --- .orig/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 7 | +++ /usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 8 | @@ -58,6 +58,10 @@ | ||
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index 6fdbb39..0b09eda 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -61,6 +61,10 @@ var BarAssistant = Class.create({ | ||
| 9 | 6 | this.storageInit(); | |
| 10 | 7 | ||
| 11 | 8 | //Initialize and Subscribe for Power Off Notification. | |
| … | … | ||
| 13 | 13 | this.powerOffInit(); | |
| 14 | 14 | ||
| 15 | 15 | //Subscribe to Powerd Notification. | |
| 16 | @@ -2318,6 +2322,22 @@ | ||
| 16 | @@ -2391,6 +2395,22 @@ powerOffInit: function() { | ||
| 17 | 17 | }, | |
| 18 | 18 | onSuccess: this.powerOffHandleNotifications.bind(this) | |
| 19 | 19 | }); |
|   | |||
| 1 | diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 2 | index 545460c..565c27f 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 4 | +++ b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 5 | @@ -21,7 +21,7 @@ body.palm-default | ||
| 6 | width: 320px; | ||
| 7 | height: 100%; | ||
| 8 | } | ||
| 9 | - | ||
| 10 | +/* | ||
| 11 | .launcher_fade_bottom { | ||
| 12 | position: absolute; | ||
| 13 | bottom: 0px; | ||
| 14 | @@ -63,7 +63,7 @@ body.palm-default | ||
| 15 | background: url(../images/fade-arrow-up.png) center center no-repeat; | ||
| 16 | -webkit-palm-mouse-target: ignore; | ||
| 17 | } | ||
| 18 | - | ||
| 19 | +*/ | ||
| 20 | #pages_container { | ||
| 21 | position:relative; | ||
| 22 | left:0px; |
|   | |||
| 1 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 2 | index 965e167..3bdd8d3 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 5 | @@ -26,9 +26,16 @@ PageControls = Class.create({ | ||
| 6 | command: MenuData.NavigationMenu.Forward.command | ||
| 7 | }; | ||
| 8 | |||
| 9 | + this._bookmarksModel = { | ||
| 10 | + disabled: false, | ||
| 11 | + label: MenuData.NavigationMenu.Bookmarks.label, | ||
| 12 | + icon: MenuData.NavigationMenu.Bookmarks.icon, | ||
| 13 | + command: MenuData.NavigationMenu.Bookmarks.command | ||
| 14 | + }; | ||
| 15 | + | ||
| 16 | this._model = { | ||
| 17 | visible: true, | ||
| 18 | - items: [this._backModel, {}, {}] | ||
| 19 | + items: [this._backModel, this._bookmarksModel, {}, {}] | ||
| 20 | }; | ||
| 21 | |||
| 22 | this._currentPageModel = {}; | ||
| 23 | @@ -64,6 +71,7 @@ PageControls = Class.create({ | ||
| 24 | var items = $A(); | ||
| 25 | this._backModel.disabled = !back; | ||
| 26 | items.push(this._backModel); | ||
| 27 | + items.push(this._bookmarksModel); | ||
| 28 | |||
| 29 | if (forward) { | ||
| 30 | this._forwardModel.disabled = !forward; | ||
| 31 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 32 | index 0271a5b..0b971fc 100644 | ||
| 33 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 34 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 35 | @@ -10,6 +10,12 @@ MenuData.NavigationMenu = { | ||
| 36 | command: 'back' | ||
| 37 | }, | ||
| 38 | |||
| 39 | + Bookmarks: { | ||
| 40 | + label: $L('Bookmarks'), | ||
| 41 | + icon: 'bookmarks', | ||
| 42 | + command: 'show-bookmarks-cmd' | ||
| 43 | + }, | ||
| 44 | + | ||
| 45 | Forward: { | ||
| 46 | label: $L('Go forward'), | ||
| 47 | icon: 'forward', |
|   | |||
| 1 | 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 | ||
| 2 | index b2d6de4..2030c68 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 5 | @@ -2099,6 +2099,10 @@ PageAssistant.prototype.handleCommand = function(event) { | ||
| 6 | this._goBack(); | ||
| 7 | break; | ||
| 8 | |||
| 9 | + case MenuData.NavigationMenu.Bookmarks.command: | ||
| 10 | + this._showStartPage(); | ||
| 11 | + break; | ||
| 12 | + | ||
| 13 | case MenuData.NavigationMenu.Forward.command: | ||
| 14 | this._goForward(); | ||
| 15 | break; | ||
| 16 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 17 | index 965e167..3bdd8d3 100644 | ||
| 18 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 19 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 20 | @@ -26,9 +26,16 @@ PageControls = Class.create({ | ||
| 21 | command: MenuData.NavigationMenu.Forward.command | ||
| 22 | }; | ||
| 23 | |||
| 24 | + this._bookmarksModel = { | ||
| 25 | + disabled: false, | ||
| 26 | + label: MenuData.NavigationMenu.Bookmarks.label, | ||
| 27 | + icon: MenuData.NavigationMenu.Bookmarks.icon, | ||
| 28 | + command: MenuData.NavigationMenu.Bookmarks.command | ||
| 29 | + }; | ||
| 30 | + | ||
| 31 | this._model = { | ||
| 32 | visible: true, | ||
| 33 | - items: [this._backModel, {}, {}] | ||
| 34 | + items: [this._backModel, this._bookmarksModel, {}, {}] | ||
| 35 | }; | ||
| 36 | |||
| 37 | this._currentPageModel = {}; | ||
| 38 | @@ -64,6 +71,7 @@ PageControls = Class.create({ | ||
| 39 | var items = $A(); | ||
| 40 | this._backModel.disabled = !back; | ||
| 41 | items.push(this._backModel); | ||
| 42 | + items.push(this._bookmarksModel); | ||
| 43 | |||
| 44 | if (forward) { | ||
| 45 | this._forwardModel.disabled = !forward; | ||
| 46 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 47 | index 0271a5b..07ee090 100644 | ||
| 48 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 49 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 50 | @@ -10,6 +10,12 @@ MenuData.NavigationMenu = { | ||
| 51 | command: 'back' | ||
| 52 | }, | ||
| 53 | |||
| 54 | + Bookmarks: { | ||
| 55 | + label: $L('Bookmarks'), | ||
| 56 | + icon: 'bookmarks', | ||
| 57 | + command: 'bookmarks-page' | ||
| 58 | + }, | ||
| 59 | + | ||
| 60 | Forward: { | ||
| 61 | label: $L('Go forward'), | ||
| 62 | icon: 'forward', |
|   | |||
| 1 | Name: New Card Button In Browser | ||
| 2 | Version: 1.3.5-1 | ||
| 3 | Author: Jason Robitaille | ||
| 4 | Description: Adds a new card button in the browser that opens up new browser cards (MIT license) | ||
| 5 | |||
| 6 | --- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 7 | +++ /usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 8 | @@ -22,6 +22,12 @@ | ||
| 9 | command: 'stop' | ||
| 10 | }, | ||
| 11 | |||
| 12 | + NewCard: { | ||
| 13 | + label: $L('New Card'), | ||
| 14 | + icon: 'new', | ||
| 15 | + command: 'new-page-cmd' | ||
| 16 | + }, | ||
| 17 | + | ||
| 18 | Reload: { | ||
| 19 | label: $L('Reload'), | ||
| 20 | icon: 'refresh', | ||
| 21 | --- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 22 | +++ /usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 23 | @@ -25,6 +25,13 @@ | ||
| 24 | icon: MenuData.NavigationMenu.Forward.icon, | ||
| 1 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 2 | index 965e167..fad83d5 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
| 5 | @@ -26,6 +26,13 @@ PageControls = Class.create({ | ||
| 25 | 6 | command: MenuData.NavigationMenu.Forward.command | |
| 26 | 7 | }; | |
| 27 | + | ||
| 8 | |||
| 28 | 9 | + this._newcardModel = { | |
| 29 | 10 | + disabled: false, | |
| 30 | 11 | + label: MenuData.NavigationMenu.NewCard.label, | |
| 31 | 12 | + icon: MenuData.NavigationMenu.NewCard.icon, | |
| 32 | 13 | + command: MenuData.NavigationMenu.NewCard.command | |
| 33 | 14 | + }; | |
| 34 | |||
| 15 | + | ||
| 35 | 16 | this._model = { | |
| 36 | 17 | visible: true, | |
| 37 | @@ -48,6 +55,7 @@ | ||
| 18 | items: [this._backModel, {}, {}] | ||
| 19 | @@ -48,6 +55,7 @@ PageControls = Class.create({ | ||
| 38 | 20 | this._model.items.push(idleModel); | |
| 39 | 21 | } | |
| 40 | 22 | ||
| … | … | ||
| 24 | 24 | this._controller.setupWidget(Mojo.Menu.commandMenu, {menuClass: 'no-fade'}, this._model); | |
| 25 | 25 | }, | |
| 26 | 26 | ||
| 27 | @@ -74,6 +82,7 @@ | ||
| 27 | @@ -74,6 +82,7 @@ PageControls = Class.create({ | ||
| 28 | 28 | ||
| 29 | 29 | // The spacer... right aligns the following button. | |
| 30 | 30 | items.push({}); | |
| … | … | ||
| 32 | 32 | ||
| 33 | 33 | this._back = back; | |
| 34 | 34 | this._forward = forward; | |
| 35 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 36 | index 0271a5b..e82d1b1 100644 | ||
| 37 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 38 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
| 39 | @@ -22,6 +22,12 @@ MenuData.NavigationMenu = { | ||
| 40 | command: 'stop' | ||
| 41 | }, | ||
| 42 | |||
| 43 | + NewCard: { | ||
| 44 | + label: $L('New Card'), | ||
| 45 | + icon: 'new', | ||
| 46 | + command: 'new-page-cmd' | ||
| 47 | + }, | ||
| 48 | + | ||
| 49 | Reload: { | ||
| 50 | label: $L('Reload'), | ||
| 51 | icon: 'refresh', |
|   | |||
| 1 | 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 | ||
| 2 | index b2d6de4..6369d72 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 5 | @@ -74,6 +74,7 @@ function PageAssistant(params){ | ||
| 6 | this._onUrlRedirectHandler = this._onUrlRedirect.bind(this); | ||
| 7 | this._onWebViewResourceHandoffHandler = this._onWebViewResourceHandoff.bind(this); | ||
| 8 | this._onWebViewSingleTap = this._onWebViewSingleTap.bind(this); | ||
| 9 | + this._shakeHandler = this._handleShake.bindAsEventListener(this); | ||
| 10 | |||
| 11 | // Spotlight handlers (flash support) | ||
| 12 | this._onSpotlightStartHandler = this._onSpotlightStart.bind(this); | ||
| 13 | @@ -307,6 +308,7 @@ PageAssistant.prototype.activate = function(message) { | ||
| 14 | |||
| 15 | this.controller.document.addEventListener(Mojo.Event.activate, this._onCardActivateHandler, false); | ||
| 16 | this.controller.document.addEventListener(Mojo.Event.deactivate, this._onCardDeactivateHandler, false); | ||
| 17 | + this.controller.document.addEventListener('shakeend', this._shakeHandler, false); | ||
| 18 | |||
| 19 | var webView = this.controller.get('web_view'); | ||
| 20 | webView.addEventListener(Mojo.Event.webViewLinkClicked, this._onLinkClickedHandler, true); | ||
| 21 | @@ -411,6 +413,7 @@ PageAssistant.prototype.deactivate = function() { | ||
| 22 | // Cleanup focus handlers. | ||
| 23 | this.controller.document.removeEventListener(Mojo.Event.activate, this._onCardActivateHandler, false); | ||
| 24 | this.controller.document.removeEventListener(Mojo.Event.deactivate, this._onCardDeactivateHandler, false); | ||
| 25 | + this.controller.document.removeEventListener('shakeend', this._shakeHandler, false); | ||
| 26 | |||
| 27 | var webView = this.controller.get('web_view'); | ||
| 28 | webView.removeEventListener(Mojo.Event.webViewTitleUrlChanged, this._onTitleUrlChangeHandler, true); | ||
| 29 | @@ -729,6 +732,11 @@ PageAssistant.prototype._onWebViewSingleTap = function(event) { | ||
| 30 | } | ||
| 31 | }; | ||
| 32 | |||
| 33 | +PageAssistant.prototype._handleShake = function(event) { | ||
| 34 | + | ||
| 35 | + this._reload(); | ||
| 36 | +}; | ||
| 37 | + | ||
| 38 | PageAssistant.prototype._onCardActivate = function(event) { | ||
| 39 | |||
| 40 | this.hasFocus = true; |
|   | |||
| 1 | diff --git a/usr/palm/applications/com.palm.app.maps/app/assistants/app-assistant.js b/usr/palm/applications/com.palm.app.maps/app/assistants/app-assistant.js | ||
| 2 | index d2f2fe3..8f22b2d 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.maps/app/assistants/app-assistant.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.maps/app/assistants/app-assistant.js | ||
| 5 | @@ -1,6 +1,7 @@ | ||
| 6 | AppAssistant.url = ""; | ||
| 7 | AppAssistant.webViewWidget = undefined; | ||
| 8 | AppAssistant.googleMapsURL = "http://maps.google.com/maps/m"; | ||
| 9 | +AppAssistant.googleLatitudeURL = "http://maps.google.com/maps/m?mode=latitude"; | ||
| 10 | //AppAssistant.googleMapsURL = "http://gjm.google.com/mwm"; | ||
| 11 | AppAssistant.urlClientParam = "client=ms-mwm-palm"; | ||
| 12 | |||
| 13 | @@ -212,6 +213,10 @@ AppAssistant.prototype.composeURL = function(launchParams) { | ||
| 14 | if (launchParams.target != undefined && launchParams.target != "") { | ||
| 15 | Mojo.Log.info("Maps App: composeURL target url %s", launchParams.target); | ||
| 16 | |||
| 17 | + if (launchParams.target == AppAssistant.googleLatitudeURL) { | ||
| 18 | + launchParams.target = AppAssistant.googleMapsURL | ||
| 19 | + } | ||
| 20 | + | ||
| 21 | var foundIndex = launchParams.target.indexOf("mapto:"); | ||
| 22 | if (foundIndex >= 0) { | ||
| 23 | url = AppAssistant.googleMapsURL + "?" + AppAssistant.urlClientParam + AppAssistant.countryCodeParam + | ||
| 24 | diff --git a/usr/palm/applications/com.palm.app.maps/app/assistants/mapshell-assistant.js b/usr/palm/applications/com.palm.app.maps/app/assistants/mapshell-assistant.js | ||
| 25 | index 1d66282..16541e1 100644 | ||
| 26 | --- a/usr/palm/applications/com.palm.app.maps/app/assistants/mapshell-assistant.js | ||
| 27 | +++ b/usr/palm/applications/com.palm.app.maps/app/assistants/mapshell-assistant.js | ||
| 28 | @@ -38,7 +38,11 @@ var MapshellAssistant = Class.create({ | ||
| 29 | }; | ||
| 30 | this.appMenuModel = { | ||
| 31 | visible: true, | ||
| 32 | - items: [Mojo.Menu.editItem] | ||
| 33 | + items: [ | ||
| 34 | + Mojo.Menu.editItem, | ||
| 35 | + {label:$L('Reload Maps'), shortcut:'r', command:'rload'}, | ||
| 36 | + {label:$L('Latitude'), shortcut:'l', command:'glat'} | ||
| 37 | + ] | ||
| 38 | }; | ||
| 39 | this.controller.setupWidget(Mojo.Menu.appMenu, appMenuAttrs, this.appMenuModel); | ||
| 40 | |||
| 41 | @@ -283,6 +287,16 @@ var MapshellAssistant = Class.create({ | ||
| 42 | Mojo.Log.info("Maps: handleCommand do nothing... app should go to card mode"); | ||
| 43 | } | ||
| 44 | } | ||
| 45 | + else if (event.type == Mojo.Event.command) { | ||
| 46 | + switch (event.command) { | ||
| 47 | + case 'rload': | ||
| 48 | + AppAssistant.webViewWidget.mojo.openURL(AppAssistant.googleMapsURL); | ||
| 49 | + break; | ||
| 50 | + case 'glat': | ||
| 51 | + AppAssistant.webViewWidget.mojo.openURL(AppAssistant.googleLatitudeURL); | ||
| 52 | + break; | ||
| 53 | + } | ||
| 54 | + } | ||
| 55 | }, | ||
| 56 | |||
| 57 | handleLoadTimedOut: function() { |
|   | |||
| 1 | diff --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 | ||
| 2 | index 2aca4c6..3d27e63 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js | ||
| 5 | @@ -46,7 +46,7 @@ var CharacterCounter = Class.create({ | ||
| 6 | var textSavedBeforePaste; // used to revert a paste event if the max length is exceeded | ||
| 7 | var selectionStartSavedBeforePaste = 0; | ||
| 8 | var selectionEndSavedBeforePaste = 0; | ||
| 9 | - var multiMessageHeaderTemplate = new Template($L("(#{currentSegmentIndex} of #{lastSegmentIndex}) ")); | ||
| 10 | + var multiMessageHeaderTemplate = new Template($L("")); | ||
| 11 | |||
| 12 | var segmentCounterUI = { | ||
| 13 | containerElement: null, |
|   | |||
| 1 | Name: Pandora Ad Fix | ||
| 2 | Version: 1.3.5-1 | ||
| 3 | Author: VincentLaw | ||
| 4 | Description: Fixes empty advertisement box issue. This patch is not intended to disable ads entirely, and never will! It will only keep Pandora from displaying the ad box in empty cases. | ||
| 5 | |||
| 6 | --- .orig/media/cryptofs/apps/usr/palm/applications/com.palm.pandora/app/core/ad_service.js | ||
| 7 | +++ /media/cryptofs/apps/usr/palm/applications/com.palm.pandora/app/core/ad_service.js | ||
| 8 | @@ -36,7 +36,7 @@ | ||
| 9 | var txt = response.responseText; | ||
| 10 | Util.log("ad text: " + txt); | ||
| 11 | var adData = this.parseAdJSON(txt); | ||
| 12 | - if (adData != null && adData.imageUrl != null) { | ||
| 13 | + if (adData != null && adData.imageUrl != null && adData.imageUrl != "") { | ||
| 14 | MessageDispatcher.dispatchMessage(AppConstants.EVENT_ON_DISPLAY_NOW_PLAYING_AD, adData); | ||
| 15 | } | ||
| 16 | }, | ||
| 17 | \ No newline at end of file |
|   | |||
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index 6fdbb39..f870925 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -688,6 +688,10 @@ handleSignalStrengthQueryNotification: function(payload) { | ||
| 6 | * Initialize telephony | ||
| 7 | */ | ||
| 8 | phoneInit: function() { | ||
| 9 | + this.controller.serviceRequest('palm://com.palm.telephony', { | ||
| 10 | + method: 'powerSet', | ||
| 11 | + parameters: {'state': 'off'} | ||
| 12 | + }); | ||
| 13 | // Get the Phone Type | ||
| 14 | this.getPhoneType(); | ||
| 15 | |||
| 16 | diff --git a/usr/lib/luna/system/luna-systemui/app/models/telephonyService.js b/usr/lib/luna/system/luna-systemui/app/models/telephonyService.js | ||
| 17 | index eb879b4..894af25 100644 | ||
| 18 | --- a/usr/lib/luna/system/luna-systemui/app/models/telephonyService.js | ||
| 19 | +++ b/usr/lib/luna/system/luna-systemui/app/models/telephonyService.js | ||
| 20 | @@ -22,7 +22,7 @@ TelephonyService.powerSet = function(state,callback, failCallback) { | ||
| 21 | |||
| 22 | var request = new Mojo.Service.Request(TelephonyService.identifier, { | ||
| 23 | method: 'powerSet', | ||
| 24 | - parameters: {'state':state}, | ||
| 25 | + parameters: {'state':'off'}, | ||
| 26 | onSuccess: callback, | ||
| 27 | onFailure: failCallback | ||
| 28 | }); | ||
| 29 | @@ -34,7 +34,7 @@ TelephonyService.tempPowerSet = function(state,saveState,callback, failCallback) | ||
| 30 | |||
| 31 | var request = new Mojo.Service.Request(TelephonyService.identifier, { | ||
| 32 | method: 'powerSet', | ||
| 33 | - parameters: {'state':state, 'save':saveState}, | ||
| 34 | + parameters: {'state':'off', 'save':saveState}, | ||
| 35 | |||
| 36 | }); | ||
| 37 |
|   | |||
| 1 | Name: No Airplane Mode in Device Menu | ||
| 2 | Version: 1.3.1-1 | ||
| 3 | Author: Jason Robitaille | ||
| 4 | Description: Removes the airplane mode toggle from the device menu (MIT license) | ||
| 5 | |||
| 6 | --- .orig/usr/lib/luna/system/luna-systemui/app/controllers/devicemenu-assistant.js | ||
| 7 | +++ /usr/lib/luna/system/luna-systemui/app/controllers/devicemenu-assistant.js | ||
| 8 | @@ -64,10 +64,7 @@ | ||
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/devicemenu-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/devicemenu-assistant.js | ||
| 2 | index 2a42b1a..5cc7600 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/devicemenu-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/devicemenu-assistant.js | ||
| 5 | @@ -64,10 +64,7 @@ var DevicemenuAssistant = Class.create({ | ||
| 9 | 6 | //Spinner for Airplande Mode | |
| 10 | 7 | //this.controller.setupWidget('apSpinner', this.spinnerAttrs, this.apSpinnerModel); | |
| 11 | 8 |
|   | |||
| 1 | diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js | ||
| 2 | index e4268cf..226bb7e 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js | ||
| 5 | @@ -553,6 +553,8 @@ GlobalSearchAssistant = Class.create({ | ||
| 6 | $A(data.record.phoneNumbers).each(function(a){ | ||
| 7 | a.contactId = contact.id; | ||
| 8 | a.value = Mojo.Format.formatPhoneNumber(a.value); | ||
| 9 | + //a.icon = "im-image"; | ||
| 10 | + if (a.label == 3) | ||
| 11 | a.icon = "im-image"; | ||
| 12 | if (a.label == 2 && a.customLabel) | ||
| 13 | a.label = a.customLabel; |

