@pageboard/html 0.14.31 → 0.14.33

package/elements/form.js

@@ -98,26 +98,8 @@ exports.api_form = {
 		},
 		action: {
 			title: 'Action',
-			type: 'object',
-			required: ["method"],
-			properties: {
-				method: {
-					title: 'Method',
-					nullable: true,
-					type: "string",
-					pattern: /^(\w+\.\w+)?$/.source
-				},
-				parameters: {
-					title: 'Parameters',
-					nullable: true,
-					type: "object"
-				}
-			},
-			$filter: {
-				name: 'service',
-				action: "write"
-			},
-			$helper: 'service',
+			description: 'Choose a service',
+			$ref: '/services?$action=write'
 		},
 		redirection: {
 			title: 'Success',
@@ -178,7 +160,7 @@ exports.api_form = {
 	contents: 'block+',
 	tag: 'form[method="post"]',
 	html: `<form is="element-form" method="post" name="[name]" masked="[masked]"
-		action="/.api/form/[$id]"
+		action="/.api/form/[name|else:$id]"
 		parameters="[$expr?.action?.parameters|as:expressions]"
 		success="[redirection.url][redirection.parameters|as:query]"
 		badrequest="[badrequest.url][badrequest.parameters|as:query]"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.14.31",
+  "version": "0.14.33",
   "description": "",
   "main": "index.js",
   "repository": {

package/ui/form.js

@@ -320,6 +320,9 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 			for (const node of prelist) {
 				await node.presubmit(state);
 			}
+			form.enable();
+			scope.$request = form.read(true, e.submitter);
+			form.disable();
 			form.classList.add('loading');
 			scope.$response = await state.fetch(form.method, Page.format({
 				pathname: form.getAttribute('action'),

package/ui/pagination.js

@@ -14,13 +14,12 @@ class HTMLElementPagination extends Page.create(HTMLAnchorElement) {
 			console.warn("pagination does not find fetch node", this.dataset.fetch);
 			return;
 		}
-		const name = node.dataset.pagination;
-		const start = parseInt(node.dataset.start) || 0;
-		const stop = parseInt(node.dataset.stop) || 0;
+		const name = node.dataset.offsetName;
+		const offset = parseInt(node.dataset.offset) || 0;
 		const limit = parseInt(node.dataset.limit) || 10;
 		const count = parseInt(node.dataset.count) || 0;
 		const sign = this.dataset.dir == "-" ? -1 : +1;
-		const cur = sign > 0 ? stop : (start - limit);
+		const cur = sign > 0 ? offset : (offset - 2 * limit);
 
 		this.setAttribute('href', Page.format({
 			pathname: state.pathname,
@@ -29,7 +28,7 @@ class HTMLElementPagination extends Page.create(HTMLAnchorElement) {
 				[name]: cur || undefined
 			}
 		}));
-		this.disabled = sign < 0 && cur + limit <= 0 || sign > 0 && count < limit;
+		this.disabled = sign < 0 && offset <= limit || sign > 0 && offset >= count;
 	}
 	handleClick(e) {
 		if (this.disabled) {