diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
| commit | 46ed776c537131e72747538488b213cf45f23e22 (patch) | |
| tree | 4cad1abf411addfd72ab591c93edeb5d225d9a39 /src/components/HMI/app/controller/sdl/AppController.js | |
| parent | a24079cb8de5563376dcf782cdb9fe3cae063841 (diff) | |
| download | sdl_core-46ed776c537131e72747538488b213cf45f23e22.tar.gz | |
Latest internal release - last bulk merge before pull request and gitflow!?
Smoke tested on Ubuntu 12.04
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Diffstat (limited to 'src/components/HMI/app/controller/sdl/AppController.js')
| -rw-r--r-- | src/components/HMI/app/controller/sdl/AppController.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/components/HMI/app/controller/sdl/AppController.js b/src/components/HMI/app/controller/sdl/AppController.js index 8f37fa51f0..784e7e8d1c 100644 --- a/src/components/HMI/app/controller/sdl/AppController.js +++ b/src/components/HMI/app/controller/sdl/AppController.js @@ -107,10 +107,11 @@ SDL.SDLAppController = Em.Object.create({ */ VRPerformAction: function (element) { + SDL.SDLController.vrInteractionResponse(SDL.SDLModel.resultCode["SUCCESS"], element.commandID); + if (SDL.SDLModel.VRActive) { SDL.SDLModel.toggleProperty('VRActive'); } - SDL.SDLController.vrInteractionResponse(SDL.SDLModel.resultCode["SUCCESS"], element.commandID); }, /** @@ -143,9 +144,6 @@ SDL.SDLAppController = Em.Object.create({ */ onVRCommand: function (element) { - if (SDL.SDLModel.VRActive) { - SDL.SDLModel.toggleProperty('VRActive'); - } FFW.VR.onCommand(element.commandID, element.appID); }, |