remove unnecessary MenuList setMode (smartdevicelink#573)

* remove unnecessary MenuList setMode * Revert "remove unnecessary MenuList setMode" This reverts commit 2d43636. * fix console error with scrollable message change mode and add setMode call to scrollableMessage
LuxoftSDL · Jul 16, 2021 · 2080039 · 2080039
1 parent b8af9c9
commit 2080039
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/controlls/MenuList.js b/app/controlls/MenuList.js
@@ -50,12 +50,7 @@ SDL.MenuList = Em.ContainerView.extend({
                    text: buttons[i].text,
                    icon: buttons[i].image ? buttons[i].image.value : '',
                    groupName: 'AlertPopUp',
-                   classNameBindings: ['isHighlighted:isHighlighted',
-                   'getCurrentDisplayModeClass'],
-                   getCurrentDisplayModeClass: function() {
-                    return SDL.ControlButtons.getCurrentDisplayModeClass(
-                      SDL.ControlButtons.imageMode.selection);
-                  }.property('SDL.ControlButtons.imageMode.selection'),
+                   classNameBindings: ['isHighlighted:isHighlighted'],
                    isHighlighted: buttons[i].isHighlighted ? true : false,
                    softButtonID: buttons[i].softButtonID,
                    systemAction: buttons[i].systemAction,

diff --git a/app/view/sdl/shared/scrollableMessage.js b/app/view/sdl/shared/scrollableMessage.js
@@ -55,6 +55,9 @@ SDL.ScrollableMessage = SDL.SDLAbstractView.create(
     childViews: [
       'backButton', 'captionText', 'softButtons', 'listOfCommands'
     ],
+    imageModeChanged: function() {
+      this.get('softButtons').setMode(SDL.SDLModel.data.imageMode);
+    }.observes('SDL.SDLModel.data.imageMode'),
     /**
      * Deactivate View
      *