From a70671336fbabbf935e754b3c3f61da1836ad37b Mon Sep 17 00:00:00 2001 From: Dmitriy Klimenko Date: Wed, 9 Apr 2014 04:31:19 -0700 Subject: [PATCH] APPLINK-5204: Support for STATIC imageType impl --- src/components/HMI/app/controller/sdl/RPCController.js | 4 ++-- src/components/HMI/ffw/UIRPC.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/HMI/app/controller/sdl/RPCController.js b/src/components/HMI/app/controller/sdl/RPCController.js index 5a8ce43..408b81d 100644 --- a/src/components/HMI/app/controller/sdl/RPCController.js +++ b/src/components/HMI/app/controller/sdl/RPCController.js @@ -1077,7 +1077,7 @@ SDL.RPCController = Em.Object } } if ("turnIcon" in params - && params.turnIcon.imageType !== "DYNAMIC") { + && (params.turnIcon.imageType !== "DYNAMIC" && params.turnIcon.imageType !== "STATIC")) { this.resultStruct = { "resultCode": SDL.SDLModel.resultCode["INVALID_DATA"], "resultMessage": "Unsupported image type!" @@ -1483,7 +1483,7 @@ SDL.RPCController = Em.Object return this.resultStruct; } if ("cmdIcon" in params - && params.cmdIcon.imageType !== "DYNAMIC") { + && (params.cmdIcon.imageType !== "DYNAMIC" && params.cmdIcon.imageType !== "STATIC")) { this.resultStruct = { "resultCode": SDL.SDLModel.resultCode["INVALID_DATA"], "resultMessage": "Unsupported image type!" diff --git a/src/components/HMI/ffw/UIRPC.js b/src/components/HMI/ffw/UIRPC.js index 6429e70..4093d80 100644 --- a/src/components/HMI/ffw/UIRPC.js +++ b/src/components/HMI/ffw/UIRPC.js @@ -504,7 +504,7 @@ FFW.UI = FFW.RPCObserver.create({ "CLOCK1", "CLOCK2", "CLOCK3", "CLOCKTEXT1", "CLOCKTEXT2", "CLOCKTEXT3", "CLOCKTEXT4" ], "graphicSupported": true, - "imageCapabilities": ["DYNAMIC"], + "imageCapabilities": ["DYNAMIC", "STATIC"], "templatesAvailable": ["TEMPLATE"], "screenParams": { "resolution": { @@ -885,7 +885,7 @@ FFW.UI = FFW.RPCObserver.create({ "CLOCK1", "CLOCK2", "CLOCK3", "CLOCKTEXT1", "CLOCKTEXT2", "CLOCKTEXT3", "CLOCKTEXT4" ], "graphicSupported": true, - "imageCapabilities": ["DYNAMIC"], + "imageCapabilities": ["DYNAMIC", "STATIC"], "templatesAvailable": ["TEMPLATE"], "screenParams": { "resolution": { -- 2.7.4