@saltcorn/server 0.6.4-beta.1 → 0.6.4-beta.5

package/public/saltcorn.js

@@ -177,6 +177,14 @@ function rep_down(e) {
     apply_form_subset_record(theform, vals1);
   }
 }
+
+function reload_on_init() {
+  localStorage.setItem("reload_on_init", true);
+}
+if (localStorage.getItem("reload_on_init")) {
+  localStorage.removeItem("reload_on_init");
+  location.reload();
+}
 function initialize_page() {
   $("form").change(apply_showif);
   apply_showif();
@@ -228,13 +236,15 @@ function initialize_page() {
   });
   if (codes.length > 0)
     enable_codemirror(() => {
-      codes.forEach((el) => {
-        console.log($(el).attr("mode"), el);
-        CodeMirror.fromTextArea(el, {
-          lineNumbers: true,
-          mode: $(el).attr("mode"),
+      setTimeout(() => {
+        codes.forEach((el) => {
+          //console.log($(el).attr("mode"), el);
+          CodeMirror.fromTextArea(el, {
+            lineNumbers: true,
+            mode: $(el).attr("mode"),
+          });
         });
-      });
+      }, 100);
     });
   const locale =
     navigator.userLanguage ||
@@ -245,6 +255,7 @@ function initialize_page() {
     navigator.browserLanguage ||
     navigator.systemLanguage ||
     "en";
+  window.detected_locale = locale;
   const parse = (s) => JSON.parse(decodeURIComponent(s));
   $("time[locale-time-options]").each(function () {
     var el = $(this);
@@ -264,6 +275,7 @@ function initialize_page() {
     const options = parse(el.attr("locale-date-options"));
     el.text(date.toLocaleDateString(locale, options));
   });
+  $('a[data-toggle="tab"]').historyTabs();
 }
 
 $(initialize_page);
@@ -482,7 +494,7 @@ function press_store_button(clicked) {
 
 function ajax_modal(url, opts = {}) {
   if ($("#scmodal").length === 0) {
-    $("body").append(`<div id="scmodal", class="modal" tabindex="-1">
+    $("body").append(`<div id="scmodal", class="modal">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
@@ -515,7 +527,7 @@ function ajax_modal(url, opts = {}) {
   });
 }
 
-function saveAndContinue(e) {
+function saveAndContinue(e, k) {
   var form = $(e).closest("form");
   var url = form.attr("action");
   var form_data = form.serialize();
@@ -536,6 +548,9 @@ function saveAndContinue(e) {
       $("#page-inner-content").html(request.responseText);
       initialize_page();
     },
+    complete: function () {
+      if (k) k();
+    },
   });
 
   return false;
@@ -605,7 +620,15 @@ function ajax_post_btn(e, reload_on_done, reload_delay) {
 
   return false;
 }
-function make_unique_field(id, table_id, field_name, value) {
+function make_unique_field(
+  id,
+  table_id,
+  field_name,
+  value,
+  space,
+  start,
+  always_append
+) {
   if (!value) return;
   $.ajax(
     `/api/${table_id}?approximate=true&${encodeURIComponent(
@@ -618,9 +641,9 @@ function make_unique_field(id, table_id, field_name, value) {
           const vals = res.success
             .map((o) => o[field_name])
             .filter((s) => s.startsWith(value));
-          if (vals.includes(value)) {
-            for (let i = 1; i < vals.length + 1; i++) {
-              const newname = `${value} ${i}`;
+          if (vals.includes(value) || always_append) {
+            for (let i = start || 0; i < vals.length + (start || 0) + 2; i++) {
+              const newname = `${value}${space ? " " : ""}${i}`;
               if (!vals.includes(newname)) {
                 $("#" + id).val(newname);
                 return;
@@ -697,6 +720,51 @@ function room_older(viewname, room_id, btn) {
     }
   );
 }
-function showHideCol(nm, e) {
-  $("#jsGrid").jsGrid("fieldOption", nm, "visible", e.checked);
-}
+
+/*
+https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
+Copyright (c) 2015 Jeff Green
+*/
+
++(function ($) {
+  "use strict";
+  $.fn.historyTabs = function () {
+    var that = this;
+    window.addEventListener("popstate", function (event) {
+      if (event.state) {
+        $(that)
+          .filter('[href="' + event.state.url + '"]')
+          .tab("show");
+      }
+    });
+    return this.each(function (index, element) {
+      $(element).on("show.bs.tab", function () {
+        var stateObject = { url: $(this).attr("href") };
+
+        if (window.location.hash && stateObject.url !== window.location.hash) {
+          window.history.pushState(
+            stateObject,
+            document.title,
+            window.location.pathname +
+              window.location.search +
+              $(this).attr("href")
+          );
+        } else {
+          window.history.replaceState(
+            stateObject,
+            document.title,
+            window.location.pathname +
+              window.location.search +
+              $(this).attr("href")
+          );
+        }
+      });
+      if (!window.location.hash && $(element).is(".active")) {
+        // Shows the first element if there are no query parameters.
+        $(element).tab("show");
+      } else if ($(this).attr("href") === window.location.hash) {
+        $(element).tab("show");
+      }
+    });
+  };
+})(jQuery);