Merge 2020.2 Gold J patches

svn path=/Website/trunk/; revision=52122

APPL/RES/res_rsv_deel_by_placetime.asp

@@ -107,7 +107,7 @@ function dagcapaciteitCalc(date)
     }
     else
     {
-        return dagCapaciteit;
+        return dagcapaciteit;
     }
 }
 if (resdate)

APPL/Shared/check_online.asp

@@ -8,24 +8,16 @@
     Description:        return a JSON string for Internet availablity checks
     Parameters:         none
 
-    Context:
+    Context:            Vanuit de App om te kijken of hij Internet verbinding heeft
-    Note:
+    Note:               Geen common.inc omdat die customerId verwacht en omdat
-    Sample:             appl/mld/check_online.asp
+                        we niet langs default.asp komen is de customerId niet gegarandeerd gezet
 
 */ %>
 
-<%
+<!-- #include file="json2.js" -->
-var JSON_Result = true;
-ANONYMOUS_Allowed = 1;
-%>
-<!-- #include file="../Shared/common.inc"-->
 <%
 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(); %>

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