mirror of
https://gitee.com/openharmony/third_party_weex-loader
synced 2024-11-27 01:20:23 +00:00
Merge branch 'lixinli_varcalc_0120' of https://gitee.com/superFat/third_party_weex-loader into lixinli_varcalc_0120
Signed-off-by: Li <xlliaq@isoftstone.com>
This commit is contained in:
commit
86d0c5fe88
24
deps/weex-styler/lib/validator.js
vendored
24
deps/weex-styler/lib/validator.js
vendored
@ -3242,6 +3242,19 @@ function validate(name, value) {
|
||||
/* istanbul ignore else */
|
||||
else {
|
||||
result = {value: value}
|
||||
if (name != "border") {
|
||||
var value = result.value.toString()
|
||||
if (value.match(/var/)) {
|
||||
value = cssVarFun(value)
|
||||
}
|
||||
if (value.match(/calc/)) {
|
||||
value = dal2Rpn(value)
|
||||
value = evalRpn(value)
|
||||
} else {
|
||||
value = value
|
||||
}
|
||||
result = {value: value}
|
||||
}
|
||||
}
|
||||
if (result.reason) {
|
||||
log = {reason: result.reason(name, value, result.value)}
|
||||
@ -3263,17 +3276,6 @@ function validate(name, value) {
|
||||
'` is not a standard attribute name and may not be supported' + suggested}
|
||||
}
|
||||
|
||||
if (name != "border") {
|
||||
var value = result.value.toString()
|
||||
if (value.match(/var/)) {
|
||||
value = cssVarFun(value)
|
||||
}
|
||||
if (value.match(/calc/)) {
|
||||
value = dal2Rpn(value)
|
||||
value = evalRpn(value)
|
||||
}
|
||||
result = {value: value}
|
||||
}
|
||||
|
||||
return {
|
||||
value: result.value,
|
||||
|
Loading…
Reference in New Issue
Block a user