APPLINK-5718: 'systemContext':'HMI_OBSCURED' fix
authorAndrew Melnik <AMelnik@luxoft.com>
Thu, 27 Mar 2014 11:24:09 +0000 (13:24 +0200)
committerJustin Dickow <jjdickow@gmail.com>
Tue, 8 Jul 2014 22:15:31 +0000 (18:15 -0400)
src/components/HMI/app/controller/sdl/Controller.js
src/components/HMI/app/view/sdl/ExitAppView.js
src/components/HMI/app/view/sdl/VehicleInfoView.js
src/components/HMI/app/view/sdl/tbtClientStateView.js

index 730b55e..737a9cf 100644 (file)
@@ -45,11 +45,7 @@ SDL.SDLController = Em.Object
             if (SDL.AlertPopUp.active) {
                 return 'ALERT';
             }
-            if (SDL.TBTClientStateView.active
-                || SDL.VehicleInfo.active
-                || SDL.DriverDistraction.active
-                || SDL.ExitApp.active
-                || SDL.SliderView.active
+            if ( SDL.SliderView.active
                 || SDL.InteractionChoicesView.active
                 || SDL.ScrollableMessage.active
                 || SDL.AudioPassThruPopUp.activate
@@ -67,16 +63,12 @@ SDL.SDLController = Em.Object
             } else {
                 return 'MENU';
             }
-        }.property('SDL.DriverDistraction.active',
-            'SDL.OptionsView.active',
+        }.property('SDL.OptionsView.active',
             'SDL.SliderView.active',
             'SDL.VRPopUp.VRActive',
             'SDL.AlertPopUp.active',
-            'SDL.TBTClientStateView.active',
-            'SDL.VehicleInfo.active',
             'SDL.States.info.nonMedia.active',
             'SDL.States.media.sdlmedia.active',
-            'SDL.ExitApp.active',
             'SDL.ScrollableMessage.active',
             'SDL.InteractionChoicesView.active',
             'SDL.VRHelpListView.active',
index 920f5f3..4f423f0 100644 (file)
@@ -109,6 +109,5 @@ SDL.ExitApp = Em.ContainerView.create( {
      */
     toggleActivity: function() {
         this.toggleProperty( 'active' );
-        SDL.SDLController.onSystemContextChange();
     }
 } );
\ No newline at end of file
index 541d071..2e2f80a 100644 (file)
@@ -165,7 +165,6 @@ SDL.VehicleInfo = Em.ContainerView.create( {
      */
     toggleActivity: function() {
         this.set( 'active', !this.active );
-        SDL.SDLController.onSystemContextChange();
     },
     
     /**
index 62856bf..2d2571d 100644 (file)
@@ -109,6 +109,5 @@ SDL.TBTClientStateView = Em.ContainerView.create( {
      */
     toggleActivity: function() {
         this.toggleProperty( 'active' );
-        SDL.SDLController.onSystemContextChange();
     }
 } );
\ No newline at end of file