From fa2c69719e35d17defef5ba60dfee0a08273fb47 Mon Sep 17 00:00:00 2001 From: Alex Tiehuis Date: Thu, 21 Mar 2019 10:03:37 +0000 Subject: [PATCH] FCLT#57046 Conditionele kenmerken werken niet op de mobile versie van Facilitor (PDA=1) svn path=/Website/branches/v2019.1/; revision=41716 --- APPL/Shared/kenmerk_js.asp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/APPL/Shared/kenmerk_js.asp b/APPL/Shared/kenmerk_js.asp index a43418cb76..f4735ff6b3 100644 --- a/APPL/Shared/kenmerk_js.asp +++ b/APPL/Shared/kenmerk_js.asp @@ -333,8 +333,16 @@ function callback_flex_expr_info(json) { if ($("#" + json[kenmerk].kfieldid + "val").hasClass("flexshow") || $("#Suggest" + json[kenmerk].kfieldid + "_show").hasClass("flexshow")) { - var $td = $("#" + json[kenmerk].kfieldid + "val").parent("td"); - $td.add($td.prev(".label")).toggle(json[kenmerk].waarde != 0 && json[kenmerk].waarde != null); + if (typeof mobile == "object") // PDA has in mobile.inc an object "mobile" while the desktop has not + { + var $fld = $("#" + json[kenmerk].kfieldid + "val"); + $fld.add($fld.prev("label")).toggle(json[kenmerk].waarde != 0 && json[kenmerk].waarde != null); + } + else + { + var $td = $("#" + json[kenmerk].kfieldid + "val").parent("td"); + $td.add($td.prev(".label")).toggle(json[kenmerk].waarde != 0 && json[kenmerk].waarde != null); + } } else { @@ -355,7 +363,7 @@ function calculateFlexExpressions(field, module, refkey, niveau, nameprefix, ext + "&nameprefix=" + nameprefix + "&extraserie=" + (extraserie? 1 : 0); - $.post("../Shared/calculate_flex_expr.asp", + $.post(rooturl+"/appl/Shared/calculate_flex_expr.asp", params, FcltCallbackAndThenAlways(callback_flex_expr_info), "json");