From c6dac2a1c4c9833a3e704bf6d4913f466e858473 Mon Sep 17 00:00:00 2001 From: seaside_wu Date: Wed, 25 May 2022 22:36:12 +0800 Subject: [PATCH] fixed f26f675 from https://gitee.com/seaside_wu/third_party_jsframework/pulls/287 fixed 727038e from https://gitee.com/seaside_wu/third_party_jsframework/pulls/286 support default device-type Signed-off-by: seaside_wu Change-Id: I4fed26a7dcb9e43d77c2349a113ba11ea4095420 --- runtime/main/extend/mediaquery/mediaQuery.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime/main/extend/mediaquery/mediaQuery.ts b/runtime/main/extend/mediaquery/mediaQuery.ts index bd227c0b..8dc73881 100644 --- a/runtime/main/extend/mediaquery/mediaQuery.ts +++ b/runtime/main/extend/mediaquery/mediaQuery.ts @@ -389,7 +389,11 @@ function parseDeviceTypeCondition(condition: string, mediaStatus: object, failRe failReason.type = MEDIAERROR.SYNTAX; return false; } - return deviceType[1] === mediaStatus['device-type']; + if (deviceType[1] === 'default') { + return mediaStatus['device-type'] === 'phone'; + } else { + return deviceType[1] === mediaStatus['device-type']; + } } /**