From a095e8e177d046412d069c9d9964fbb010f11307 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Mon, 28 Jun 2021 14:20:31 +0000
Subject: [PATCH] Merge 2020.2 Gold J patches

svn path=/Website/trunk/; revision=52122
---
 APPL/RES/res_rsv_deel_by_placetime.asp |  2 +-
 APPL/Shared/check_online.asp           | 18 +++++-------------
 APPL/Shared/kenmerk_js.asp             |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/APPL/RES/res_rsv_deel_by_placetime.asp b/APPL/RES/res_rsv_deel_by_placetime.asp
index 1949137e06..e2a1823e41 100644
--- a/APPL/RES/res_rsv_deel_by_placetime.asp
+++ b/APPL/RES/res_rsv_deel_by_placetime.asp
@@ -107,7 +107,7 @@ function dagcapaciteitCalc(date)
     }
     else
     {
-        return dagCapaciteit;
+        return dagcapaciteit;
     }
 }
 if (resdate)
diff --git a/APPL/Shared/check_online.asp b/APPL/Shared/check_online.asp
index 123c8f4c10..d505b85751 100644
--- a/APPL/Shared/check_online.asp
+++ b/APPL/Shared/check_online.asp
@@ -8,24 +8,16 @@
     Description:        return a JSON string for Internet availablity checks
     Parameters:         none
 
-    Context:
-    Note:
-    Sample:             appl/mld/check_online.asp
+    Context:            Vanuit de App om te kijken of hij Internet verbinding heeft
+    Note:               Geen common.inc omdat die customerId verwacht en omdat
+                        we niet langs default.asp komen is de customerId niet gegarandeerd gezet
 
 */ %>
 
-<%
-var JSON_Result = true;
-ANONYMOUS_Allowed = 1;
-%>
-<!-- #include file="../Shared/common.inc"-->
+<!-- #include file="json2.js" -->
 <%
 var result = {};
-if (user_key > 0)
-{
-    result.user = { id: user_key, name: user.naam() };
-}
 result.date = new Date();
+Response.ContentType = "application/json";
 Response.Write(JSON.stringify(result));
 %>
-<% ASPPAGE_END(); %>
diff --git a/APPL/Shared/kenmerk_js.asp b/APPL/Shared/kenmerk_js.asp
index 0025afbea5..c27de7b7d3 100644
--- a/APPL/Shared/kenmerk_js.asp
+++ b/APPL/Shared/kenmerk_js.asp
@@ -380,7 +380,7 @@ function callback_flex_expr_info(json)
         }
         else
         {
-          var $fld = $("#" + json[kenmerk].kfieldid + "val:not(textarea)").closest("div");
+          var $fld = $("#" + json[kenmerk].kfieldid + "val:not(textarea)").closest("div").not('[data-role=content]');
           if ($fld.length == 0)
           {
             $fld= $("textarea#" + json[kenmerk].kfieldid + "val"); // textarea has no parent div