@saltcorn/markup - npm Package Compare versions

Comparing version 0.9.6-beta.14 to 0.9.6-beta.15

dist/form.js

@@ -75,3 +75,10 @@ "use strict";
                     class: [
-                        isHoriz(fStyle) && labelCols && `col-sm-${labelCols} text-end`,
+                        hdr.type?.name === "Bool" &&
+                            isHoriz(fStyle) &&
+                            labelCols &&
+                            `col-${labelCols} text-end`,
+                        hdr.type?.name !== "Bool" &&
+                            isHoriz(fStyle) &&
+                            labelCols &&
+                            `col-sm-${labelCols} text-md-end`,
                         labelCols === 0 && "d-none",
@@ -82,3 +89,12 @@ ],
                 }, text(hdr.label)), hdr.help && !hdr.sublabel ? helpLink(hdr.help) : ""),
-                div({ class: isHoriz(fStyle) && `col-sm-${12 - labelCols}` }, inner, text(error), mkSubLabelAndHelp(hdr)),
+                div({
+                    class: [
+                        hdr.type?.name === "Bool" &&
+                            isHoriz(fStyle) &&
+                            `col-${12 - labelCols}`,
+                        hdr.type?.name !== "Bool" &&
+                            isHoriz(fStyle) &&
+                            `col-sm-${12 - labelCols}`,
+                    ],
+                }, inner, text(error), mkSubLabelAndHelp(hdr)),
             ]);
@@ -85,0 +101,0 @@ /**

dist/index.js

@@ -50,11 +50,13 @@ "use strict";
   ${ajax ? "" : `<input type="hidden" name="_csrf" value="${csrfToken}">`}
-<button ${ajax ? 'type="button"' : 'type="submit"'} ${onClick
-    ? `onclick="${spinner ? "press_store_button(this);" : ""}${onClick}"`
-    : ajax && confirm
-        ? `onclick="if(confirm('${req.__("Are you sure?")}')) {${spinner ? "press_store_button(this);" : ""}${buildButtonCallback(reload_on_done, reload_delay)}}"`
-        : ajax
-            ? `onclick="${spinner ? "press_store_button(this);" : ""}${buildButtonCallback(reload_on_done, reload_delay)}"`
-            : confirm
-                ? `onclick="return confirm('${req.__("Are you sure?")}')"`
-                : ""} class="${klass} btn ${small ? "btn-sm" : ""} ${btnClass}"${style ? ` style="${style}"` : ""}${title ? ` title=${text_attr(title)}` : ""}>${icon && icon !== "empty"
+<button ${ajax ? 'type="button"' : 'type="submit"'} ${onClick && ajax
+    ? `onclick="${spinner ? "press_store_button(this);" : ""}${buildButtonCallback(reload_on_done, reload_delay)};${onClick}"`
+    : onClick
+        ? `onclick="${spinner ? "press_store_button(this);" : ""}${onClick}"`
+        : ajax && confirm
+            ? `onclick="if(confirm('${req.__("Are you sure?")}')) {${spinner ? "press_store_button(this);" : ""}${buildButtonCallback(reload_on_done, reload_delay)}}"`
+            : ajax
+                ? `onclick="${spinner ? "press_store_button(this);" : ""}${buildButtonCallback(reload_on_done, reload_delay)}"`
+                : confirm
+                    ? `onclick="return confirm('${req.__("Are you sure?")}')"`
+                    : ""} class="${klass} btn ${small ? "btn-sm" : ""} ${btnClass}"${style ? ` style="${style}"` : ""}${title ? ` title=${text_attr(title)}` : ""}>${icon && icon !== "empty"
     ? `<i class="${icon}"></i>${s ? "&nbsp;" : ""}`
@@ -61,0 +63,0 @@ : ""}${s}</button></form>`;

dist/layout.js

@@ -239,9 +239,13 @@ "use strict";
             return wrap(segment, isTop, ix, a({
-                href: segment.in_modal
-                    ? isWeb
-                        ? `javascript:ajax_modal('${segment.url}');`
-                        : `javascript:mobile_modal('${segment.url}');`
-                    : isWeb
-                        ? segment.url
-                        : `javascript:execLink('${segment.url}', '${segment.link_src || "URL"}')`,
+                ...(isWeb
+                    ? {
+                        href: segment.in_modal
+                            ? `javascript:ajax_modal('${segment.url}');`
+                            : segment.url,
+                    }
+                    : {
+                        onclick: segment.in_modal
+                            ? `javascript:mobile_modal('${segment.url}');`
+                            : `execLink('${segment.url}', '${segment.link_src || "URL"}')`,
+                    }),
                 class: [segment.link_style || "", segment.link_size || ""],
@@ -248,0 +252,0 @@ target: isWeb && segment.target_blank ? "_blank" : false,

package.json

 {
   "name": "@saltcorn/markup",
-  "version": "0.9.6-beta.14",
+  "version": "0.9.6-beta.15",
   "description": "Markup for Saltcorn, open-source no-code platform",
@@ -38,3 +38,3 @@ "homepage": "https://saltcorn.com",
   "devDependencies": {
-    "@saltcorn/types": "0.9.6-beta.14",
+    "@saltcorn/types": "0.9.6-beta.15",
     "@types/escape-html": "^1.0.1",
@@ -41,0 +41,0 @@ "@types/jest": "^29.5.11",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

259639

increased by0.57%

Lines of code

3419

increased by0.65%

No dependency changes