diff options
Diffstat (limited to 'src/components/HMI/app/view/sdl/shared')
| -rw-r--r-- | src/components/HMI/app/view/sdl/shared/interactionChoicesView.js | 14 | ||||
| -rw-r--r-- | src/components/HMI/app/view/sdl/shared/turnByTurnView.js | 40 |
2 files changed, 29 insertions, 25 deletions
diff --git a/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js b/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js index d01165dd14..288031ab17 100644 --- a/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js +++ b/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js @@ -86,8 +86,10 @@ SDL.InteractionChoicesView = SDL.SDLAbstractView.create({ ], click: function() { - SDL.InteractionChoicesView.timerUpdate(); - SDL.SDLController.onResetTimeout(SDL.SDLAppController.model.appID, "UI.PerformInteraction"); + if (this._parentView.active) { + SDL.InteractionChoicesView.timerUpdate(); + SDL.SDLController.onResetTimeout(SDL.SDLAppController.model.appID, "UI.PerformInteraction"); + } }, naviChoises: Em.ContainerView.extend({ @@ -119,8 +121,10 @@ SDL.InteractionChoicesView = SDL.SDLAbstractView.create({ itemsOnPage: 5, items: [], click: function() { - SDL.InteractionChoicesView.timerUpdate(); - SDL.SDLController.onResetTimeout(SDL.SDLAppController.model.appID, "UI.PerformInteraction"); + if (this._parentView.active) { + SDL.InteractionChoicesView.timerUpdate(); + SDL.SDLController.onResetTimeout(SDL.SDLAppController.model.appID, "UI.PerformInteraction"); + } } }), @@ -143,7 +147,7 @@ SDL.InteractionChoicesView = SDL.SDLAbstractView.create({ * Method updates popup timer when data changes through keyboard */ timerUpdate: function (){ - if (this.timeout && this.input.value !== null) { + if (this.timeout) { clearTimeout(this.timer); var self = this; this.timer = setTimeout(function () { diff --git a/src/components/HMI/app/view/sdl/shared/turnByTurnView.js b/src/components/HMI/app/view/sdl/shared/turnByTurnView.js index 21d51ca6b1..1cb7ddfad0 100644 --- a/src/components/HMI/app/view/sdl/shared/turnByTurnView.js +++ b/src/components/HMI/app/view/sdl/shared/turnByTurnView.js @@ -79,29 +79,29 @@ SDL.TurnByTurnView = SDL.SDLAbstractView.create( { for ( var i = 0; i < naviParams.navigationTexts.length; i++) { switch (naviParams.navigationTexts[i].fieldName) { - case 'navigationText1': { - this.set('captionText.content', - naviParams.navigationTexts[i].fieldText); - break; - } - case 'navigationText2': { - this.set('navigationText2', - naviParams.navigationTexts[i].fieldText); - break; - } - case 'ETA': { - this.set('eta', naviParams.navigationTexts[i].fieldText); - break; - } - case 'totalDistance': { - this.set('totalDistance', - naviParams.navigationTexts[i].fieldText); - break; - } + case 'navigationText1': { + this.set('captionText.content', + naviParams.navigationTexts[i].fieldText); + break; + } + case 'navigationText2': { + this.set('navigationText2', + naviParams.navigationTexts[i].fieldText); + break; + } + case 'ETA': { + this.set('eta', naviParams.navigationTexts[i].fieldText); + break; + } + case 'totalDistance': { + this.set('totalDistance', + naviParams.navigationTexts[i].fieldText); + break; + } } } - this.softButtons.addItems(naviParams.softButtons); + this.softButtons.addItems(naviParams.softButtons, appID); if (naviParams.maneuverComplete) { this.set('maneuverComplete', naviParams.maneuverComplete); |