@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/public/jquery-menu-editor.min.js

@@ -1,13 +1,13 @@
 function MenuEditor(e, t) {
   const radioValue = (e) =>
-    $(`input:radio[name ='${$(e).attr("name")}']:checked`).val();
+    $(`input:radio[name=\"${$(e).attr("name")}\"]:checked`).val();
   var s = $("#" + e).data("level", "0"),
     l = {
       labelEdit: '<i class="fas fa-edit clickable"></i>',
       labelRemove: '<i class="fas fa-trash-alt clickable"></i>',
       textConfirmDelete: "This item will be deleted. Are you sure?",
       getLabelText: (e) => e.text,
-      onUpdate: () => {},
+      onUpdate: () => { },
       iconPicker: { cols: 4, rows: 4, footer: !1, iconset: "fontawesome5" },
       maxLevel: -1,
       listOptions: {
@@ -113,8 +113,8 @@ function MenuEditor(e, t) {
         var o = !1;
         void 0 !== n.attr("id") && (o = n.attr("id").toString() === e),
           n.children().length ||
-            o ||
-            (n.prev("div").children(".sortableListsOpener").first().remove(),
+          o ||
+          (n.prev("div").children(".sortableListsOpener").first().remove(),
             n.remove()),
           MenuEditor.updateButtons(s);
         l.onUpdate();
@@ -125,10 +125,10 @@ function MenuEditor(e, t) {
         (function (e) {
           var t = e.data();
           $.each(t, function (e, t) {
-            var el = i.find("[name=" + e + "]");
+            var el = i.find("[name=\"" + e + "\"]");
             if (el.prop("type") == "checkbox") el.prop("checked", !!t);
             else if (el.prop("type") == "radio") {
-              $(`input[name=${el.prop("name")}][value="${t}"]`).prop(
+              $(`input[name=\"${el.prop("name")}\"][value="${t}"]`).prop(
                 "checked",
                 true
               );
@@ -173,7 +173,7 @@ function MenuEditor(e, t) {
         l = $(this).closest("li");
       l.closest("ul").closest("li").after(l),
         t.children().length <= 0 &&
-          (t.prev("div").children(".sortableListsOpener").first().remove(),
+        (t.prev("div").children(".sortableListsOpener").first().remove(),
           t.remove()),
         MenuEditor.updateButtons(s),
         s.updateLevels();
@@ -219,8 +219,8 @@ function MenuEditor(e, t) {
               $(this).attr("type") === "radio"
                 ? radioValue(this)
                 : $(this).attr("type") === "checkbox"
-                ? $(this).prop("checked")
-                : $(this).val()
+                  ? $(this).prop("checked")
+                  : $(this).val()
             );
         }),
           e.children().children("i").removeClass(t).addClass(e.data("icon")),
@@ -236,8 +236,8 @@ function MenuEditor(e, t) {
             $(this).attr("type") === "radio"
               ? radioValue(this)
               : $(this).attr("type") === "checkbox"
-              ? $(this).prop("checked")
-              : $(this).val();
+                ? $(this).prop("checked")
+                : $(this).val();
       });
       var t = u(),
         l = $("<span>").addClass("txt").text(mqeSets.getLabelText(e)),
@@ -262,13 +262,13 @@ function MenuEditor(e, t) {
       var t = Array.isArray(e)
         ? e
         : (function (e) {
-            try {
-              var t = JSON.parse(e);
-            } catch (e) {
-              return console.log("The string is not a json valid."), null;
-            }
-            return t;
-          })(e);
+          try {
+            var t = JSON.parse(e);
+          } catch (e) {
+            return console.log("The string is not a json valid."), null;
+          }
+          return t;
+        })(e);
       if (null !== t) {
         s.empty();
         var n = (function e(t, l) {
@@ -277,9 +277,9 @@ function MenuEditor(e, t) {
               0 === n
                 ? s
                 : $("<ul>")
-                    .addClass("pl-0")
-                    .css("padding-top", "10px")
-                    .data("level", n);
+                  .addClass("pl-0")
+                  .css("padding-top", "10px")
+                  .data("level", n);
           return (
             $.each(t, function (t, s) {
               var l = void 0 !== s.children && $.isArray(s.children),
@@ -311,9 +311,9 @@ function MenuEditor(e, t) {
         })(t);
         o
           ? s.find("li").each(function () {
-              var e = $(this);
-              e.children("ul").length && f(e);
-            })
+            var e = $(this);
+            e.children("ul").length && f(e);
+          })
           : (n.sortableLists(l.listOptions), (o = !0)),
           MenuEditor.updateButtons(s);
       }
@@ -409,8 +409,8 @@ function MenuEditor(e, t) {
     "class" == n.opener.as
       ? c.addClass(n.opener.close)
       : "html" == n.opener.as
-      ? c.html(n.opener.close)
-      : console.error("Invalid setting for opener.as");
+        ? c.html(n.opener.close)
+        : console.error("Invalid setting for opener.as");
     var d = {
       isDragged: !1,
       isRelEFP: null,
@@ -439,7 +439,7 @@ function MenuEditor(e, t) {
           var t = e(this);
           t.children(n.listSelector).length &&
             (c.clone(!0).prependTo(t.children("div").first()),
-            t.hasClass("sortableListsOpen") ? L(t) : E(t));
+              t.hasClass("sortableListsOpen") ? L(t) : E(t));
         });
     }
     return this.on("mousedown touchstart", function (t) {
@@ -452,41 +452,41 @@ function MenuEditor(e, t) {
           a = e(this);
         l[0] &&
           (n.onDragStart(t, l),
-          (function (t, s, l) {
-            d.isDragged = !0;
-            var a = parseInt(s.css("margin-top")),
-              c = parseInt(s.css("margin-bottom")),
-              f = parseInt(s.css("margin-left")),
-              h = parseInt(s.css("margin-right")),
-              v = s.offset(),
-              b = s.innerHeight();
-            (d.rootEl = {
-              el: l,
-              offset: l.offset(),
-              rootElClass: l.attr("class"),
-            }),
-              (d.cEl = { el: s, mT: a, mL: f, mB: c, mR: h, offset: v }),
-              (d.cEl.xyOffsetDiff = {
-                X: t.pageX - d.cEl.offset.left,
-                Y: t.pageY - d.cEl.offset.top,
+            (function (t, s, l) {
+              d.isDragged = !0;
+              var a = parseInt(s.css("margin-top")),
+                c = parseInt(s.css("margin-bottom")),
+                f = parseInt(s.css("margin-left")),
+                h = parseInt(s.css("margin-right")),
+                v = s.offset(),
+                b = s.innerHeight();
+              (d.rootEl = {
+                el: l,
+                offset: l.offset(),
+                rootElClass: l.attr("class"),
               }),
-              d.cEl.el.addClass("sortableListsCurrent " + n.currElClass),
-              s.before(i);
-            var g = (d.placeholderNode = e("#sortableListsPlaceholder"));
-            s
-              .css({
-                width: s.width(),
-                position: "absolute",
-                top: v.top - a,
-                left: v.left - f,
-              })
-              .prependTo(o),
-              g.css({ display: "block", height: b }),
-              r.css("height", b),
-              d.doc
-                .on("mousemove touchmove", p)
-                .on("mouseup touchend touchcancel", u);
-          })(t, l, a));
+                (d.cEl = { el: s, mT: a, mL: f, mB: c, mR: h, offset: v }),
+                (d.cEl.xyOffsetDiff = {
+                  X: t.pageX - d.cEl.offset.left,
+                  Y: t.pageY - d.cEl.offset.top,
+                }),
+                d.cEl.el.addClass("sortableListsCurrent " + n.currElClass),
+                s.before(i);
+              var g = (d.placeholderNode = e("#sortableListsPlaceholder"));
+              s
+                .css({
+                  width: s.width(),
+                  position: "absolute",
+                  top: v.top - a,
+                  left: v.left - f,
+                })
+                .prependTo(o),
+                g.css({ display: "block", height: b }),
+                r.css("height", b),
+                d.doc
+                  .on("mousemove touchmove", p)
+                  .on("mouseup touchend touchcancel", u);
+            })(t, l, a));
       }
     });
     function p(t) {
@@ -496,12 +496,12 @@ function MenuEditor(e, t) {
           o = d.win;
         "touchmove" === t.type && v(t),
           t.pageX ||
-            (function (e) {
-              (e.pageY = d.pY),
-                (e.pageX = d.pX),
-                (e.clientY = d.cY),
-                (e.clientX = d.cX);
-            })(t),
+          (function (e) {
+            (e.pageY = d.pY),
+              (e.pageX = d.pX),
+              (e.clientY = d.cY),
+              (e.clientX = d.cX);
+          })(t),
           l.scrollTop() > d.rootEl.offset.top - 10 && t.clientY < 50
             ? d.upScroll
               ? ((t.pageY = t.pageY - n.scroll),
@@ -510,27 +510,27 @@ function MenuEditor(e, t) {
                 }),
                 f(t))
               : (function (e) {
-                  if (d.upScroll) return;
-                  d.upScroll = setInterval(function () {
-                    d.doc.trigger("mousemove");
-                  }, 50);
-                })()
+                if (d.upScroll) return;
+                d.upScroll = setInterval(function () {
+                  d.doc.trigger("mousemove");
+                }, 50);
+              })()
             : l.scrollTop() + o.height() <
-                d.rootEl.offset.top + d.rootEl.el.outerHeight(!1) + 10 &&
+              d.rootEl.offset.top + d.rootEl.el.outerHeight(!1) + 10 &&
               o.height() - t.clientY < 50
-            ? d.downScroll
-              ? ((t.pageY = t.pageY + n.scroll),
-                e("html, body").each(function (t) {
-                  e(this).scrollTop(e(this).scrollTop() + n.scroll);
-                }),
-                f(t))
-              : (function (e) {
+              ? d.downScroll
+                ? ((t.pageY = t.pageY + n.scroll),
+                  e("html, body").each(function (t) {
+                    e(this).scrollTop(e(this).scrollTop() + n.scroll);
+                  }),
+                  f(t))
+                : (function (e) {
                   if (d.downScroll) return;
                   d.downScroll = setInterval(function () {
                     d.doc.trigger("mousemove");
                   }, 50);
                 })()
-            : h(d),
+              : h(d),
           (d.oElOld = d.oEl),
           (s.el[0].style.visibility = "hidden"),
           (d.oEl = oEl =
@@ -542,17 +542,17 @@ function MenuEditor(e, t) {
                 (n = d.doc.scrollTop()) > 0 &&
                   (l =
                     null ==
-                      (o = document.elementFromPoint(
-                        0,
-                        n + e(window).height() - 1
-                      )) || "HTML" == o.tagName.toUpperCase()),
+                    (o = document.elementFromPoint(
+                      0,
+                      n + e(window).height() - 1
+                    )) || "HTML" == o.tagName.toUpperCase()),
                   (n = d.doc.scrollLeft()) > 0 &&
-                    (l =
-                      null ==
-                        (o = document.elementFromPoint(
-                          n + e(window).width() - 1,
-                          0
-                        )) || "HTML" == o.tagName.toUpperCase());
+                  (l =
+                    null ==
+                    (o = document.elementFromPoint(
+                      n + e(window).width() - 1,
+                      0
+                    )) || "HTML" == o.tagName.toUpperCase());
               }
               l && ((t -= d.doc.scrollLeft()), (s -= d.doc.scrollTop()));
               var i = e(document.elementFromPoint(t, s));
@@ -576,8 +576,8 @@ function MenuEditor(e, t) {
                 ? g(e, s, 7 > o)
                 : l - 14 < o && C(e, s, l - 7 < o)
               : 5 > o
-              ? b(e, s)
-              : l - 5 < o && m(e, s);
+                ? b(e, s)
+                : l - 5 < o && m(e, s);
           })(t, d),
           (function (e, t) {
             var s = t.cEl;
@@ -620,12 +620,12 @@ function MenuEditor(e, t) {
               f.length && f.prev("div").prepend(c.clone(!0)),
               a
                 ? d.placeholderNode.slideUp(150, function () {
-                    d.placeholderNode.remove(),
-                      y(),
-                      n.onChange(s.el),
-                      n.complete(s.el),
-                      (d.isDragged = !1);
-                  })
+                  d.placeholderNode.remove(),
+                    y(),
+                    n.onChange(s.el),
+                    n.complete(s.el),
+                    (d.isDragged = !1);
+                })
                 : (d.placeholderNode.remove(),
                   y(),
                   n.complete(s.el),
@@ -657,7 +657,7 @@ function MenuEditor(e, t) {
     function b(t, s) {
       if (
         (e("#sortableListsHintWrapper", d.rootEl.el).length && r.unwrap(),
-        t.pageX - s.offset().left < n.insertZone)
+          t.pageX - s.offset().left < n.insertZone)
       ) {
         if (s.prev("#sortableListsPlaceholder").length)
           return void r.css("display", "none");
@@ -676,7 +676,7 @@ function MenuEditor(e, t) {
     function g(t, s, l) {
       if (
         (e("#sortableListsHintWrapper", d.rootEl.el).length && r.unwrap(),
-        !l && t.pageX - s.offset().left > n.insertZone)
+          !l && t.pageX - s.offset().left > n.insertZone)
       ) {
         var o = s.children(),
           i = s.children(n.listSelector).first();
@@ -695,7 +695,7 @@ function MenuEditor(e, t) {
     function m(t, s) {
       if (
         (e("#sortableListsHintWrapper", d.rootEl.el).length && r.unwrap(),
-        t.pageX - s.offset().left < n.insertZone)
+          t.pageX - s.offset().left < n.insertZone)
       ) {
         if (s.next("#sortableListsPlaceholder").length)
           return void r.css("display", "none");
@@ -713,7 +713,7 @@ function MenuEditor(e, t) {
     function C(t, s, l) {
       if (
         (e("#sortableListsHintWrapper", d.rootEl.el).length && r.unwrap(),
-        !l && t.pageX - s.offset().left > n.insertZone)
+          !l && t.pageX - s.offset().left > n.insertZone)
       ) {
         var o = s.children(),
           i = s.children(n.listSelector).last();
@@ -735,8 +735,8 @@ function MenuEditor(e, t) {
       "html" == n.opener.as
         ? t.html(n.opener.close)
         : "class" == n.opener.as
-        ? t.addClass(n.opener.close).removeClass(n.opener.open)
-        : t.css("background-image", "url(" + n.opener.close + ")");
+          ? t.addClass(n.opener.close).removeClass(n.opener.open)
+          : t.css("background-image", "url(" + n.opener.close + ")");
     }
     function E(e) {
       e.removeClass("sortableListsOpen").addClass("sortableListsClosed"),
@@ -745,8 +745,8 @@ function MenuEditor(e, t) {
       "html" == n.opener.as
         ? t.html(n.opener.open)
         : "class" == n.opener.as
-        ? t.addClass(n.opener.open).removeClass(n.opener.close)
-        : t.css("background-image", "url(" + n.opener.open + ")");
+          ? t.addClass(n.opener.open).removeClass(n.opener.close)
+          : t.css("background-image", "url(" + n.opener.open + ")");
     }
     function y() {
       e(n.listSelector, d.rootEl.el).each(function (t) {
@@ -756,7 +756,7 @@ function MenuEditor(e, t) {
             .children(".sortableListsOpener")
             .first()
             .remove(),
-          e(this).remove());
+            e(this).remove());
       });
     }
   }),
@@ -767,7 +767,7 @@ function MenuEditor(e, t) {
       "html" === e.opener.as
         ? t.html(e.opener.close)
         : "class" === e.opener.as &&
-          t.addClass(e.opener.close).removeClass(e.opener.open);
+        t.addClass(e.opener.close).removeClass(e.opener.open);
     }),
     (e.fn.iconClose = function (e) {
       this.removeClass("sortableListsOpen").addClass("sortableListsClosed"),
@@ -776,7 +776,7 @@ function MenuEditor(e, t) {
       "html" === e.opener.as
         ? t.html(e.opener.open)
         : "class" === e.opener.as &&
-          t.addClass(e.opener.open).removeClass(e.opener.close);
+        t.addClass(e.opener.open).removeClass(e.opener.close);
     }),
     (e.fn.sortableListsToJson = function () {
       var t = [];
@@ -808,8 +808,8 @@ function MenuEditor(e, t) {
         n = ["Down"];
       0 === s &&
         (l.push("Out"),
-        n.push("Out"),
-        e(this).children("li").hideButtons(["Out"])),
+          n.push("Out"),
+          e(this).children("li").hideButtons(["Out"])),
         e(this)
           .children("li")
           .each(function () {

package/public/saltcorn-common.js

@@ -28,6 +28,7 @@ function add_repeater(nm) {
   var newix = es.length;
   var newe = $(e).clone();
   newe.find("[name]").each(function (ix, element) {
+    if ($(element).hasClass("omit-repeater-clone")) $(element).remove();
     var newnm = (element.name || "").replace("_0", "_" + newix);
     var newid = (element.id || "").replace("_0", "_" + newix);
     $(element).attr("name", newnm).attr("id", newid);
@@ -191,14 +192,15 @@ function splitTargetMatch(elemValue, target, keySpec) {
 
 function get_form_record(e, select_labels) {
   const rec = {};
-  e.closest("form")
+  e.closest(".form-namespace")
     .find("input[name],select[name]")
     .each(function () {
+      const name = $(this).attr("data-fieldname") || $(this).attr("name")
       if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
-        rec[$(this).attr("name")] = $(this).find("option:selected").text();
+        rec[name] = $(this).find("option:selected").text();
       else if ($(this).prop("type") === "checkbox")
-        rec[$(this).attr("name")] = $(this).prop("checked");
-      else rec[$(this).attr("name")] = $(this).val();
+        rec[name] = $(this).prop("checked");
+      else rec[name] = $(this).val();
     });
   return rec;
 }
@@ -550,7 +552,13 @@ function common_done(res, isWeb = true) {
     });
   else if (res.goto) {
     if (res.target === "_blank") window.open(res.goto, "_blank").focus();
-    else window.location.href = res.goto;
+    else {
+      const prev = new URL(window.location.href)
+      const next = new URL(res.goto, prev.origin)
+      window.location.href = res.goto;
+      if (prev.origin === next.origin && prev.pathname === next.pathname && next.hash !== prev.hash)
+        location.reload()
+    }
   }
   if (res.popup) {
     ajax_modal(res.popup)
@@ -720,16 +728,20 @@ function init_room(viewname, room_id) {
 
 function cancel_form(form) {
   if (!form) return;
+  $(form).trigger("reset");
+  $(form).trigger("change");
   $(form).append(`<input type="hidden" name="_cancel" value="on">`);
   $(form).submit();
 }
 
 function split_paste_handler(e) {
-  e.preventDefault();
   let clipboardData = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
 
   const lines = clipboardData.getData('text').split(/\r\n/g)
 
+  // do normal thing if not multiline - do not interfere with ordinary copy paste
+  if (lines.length < 2) return;
+  e.preventDefault();
   const form = $(e.target).closest('form')
 
   let matched = false;
@@ -737,9 +749,20 @@ function split_paste_handler(e) {
   form.find('input:not(:disabled):not([readonly]):not(:hidden)').each(function (ix, element) {
     if (!matched && element === e.target) matched = true;
     if (matched && lines.length > 0) {
-      $(element).val(lines.shift())
+      const $elem = $(element)
+      if (ix === 0 && $elem.attr("type") !== "number") {
+        //const existing = $elem.val()
+        //const pasted = 
+        $elem.val(lines.shift())
+
+      } else
+        $elem.val(lines.shift())
     }
   })
 
 
-}
+}
+
+function is_paging_param(key) {
+  return key.endsWith("_page") || key.endsWith("_pagesize");
+}

package/public/saltcorn.css

@@ -353,3 +353,14 @@ table.table-inner-grid td {
 .d-inline-maybe {
   display: inline;
 }
+
+.w-unset {
+  width: unset;
+}
+
+.preview-text {
+  transform: rotate(-30deg);
+  z-index: 11;
+  margin-left: 30px;
+  margin-top: -5px;
+}