alchemy-form 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.2 (2023-01-23)
+
+* Fix `al-button`'s `activate` event not being cancelable
+* Add `placeholder` support to the string field
+
 ## 0.2.1 (2022-12-23)
 
 * Enable `al-form` model validation

package/element/al_button.js

@@ -66,7 +66,7 @@ Button.setAssignedProperty('action_instance');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.1
+ * @version  0.2.2
  */
 Button.setMethod(function activate() {
 
@@ -82,7 +82,7 @@ Button.setMethod(function activate() {
 		return;
 	}
 
-	let event = this.emit('activate');
+	let event = this.emit('activate', {cancelable: true});
 
 	if (event.defaultPrevented) {
 		return;

package/element/al_field.js

@@ -88,6 +88,15 @@ Field.setAttribute('readonly', {boolean: true});
  */
 Field.setAssignedProperty('widget_settings');
 
+/**
+ * The placeholder
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.2
+ * @version  0.2.2
+ */
+Field.setAttribute('placeholder');
+
 /**
  * Get the parent al-form element
  *

package/element/al_form.js

@@ -153,12 +153,37 @@ Form.setMethod(Hawkejs.SERIALIZE_FORM, function serializeForm() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.2.1
+ * @version  0.2.2
  */
 Form.setMethod(async function submit() {
 
 	let result;
 
+	await this.validate();
+
+	try {
+		result = await hawkejs.scene.onFormSubmit(this, null, {render_error: false});
+	} catch (err) {
+		if (err instanceof Classes.Alchemy.Error.Validation) {
+			this.showError(err);
+		} else {
+			this.showError(err);
+			throw err;
+		}
+	}
+
+	return result;
+});
+
+/**
+ * Validate this form
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.2
+ * @version  0.2.2
+ */
+Form.setMethod(async function validate() {
+
 	if (this.model) {
 		let model = alchemy.getModel(this.model);
 
@@ -174,17 +199,6 @@ Form.setMethod(async function submit() {
 		}
 	}
 
-	try {
-		result = await hawkejs.scene.onFormSubmit(this, null, {render_error: false});
-	} catch (err) {
-		if (err instanceof Classes.Alchemy.Error.Validation) {
-			this.showError(err);
-		} else {
-			throw err;
-		}
-	}
-
-	return result;
 });
 
 /**

package/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"
 	},
 	"peerDependencies": {
 		"alchemymvc"    : ">=1.2.0",
-		"alchemy-media" : "~0.7.1"
+		"alchemy-media" : ">=0.7.2"
 	},
 	"license": "MIT",
 	"engines": {

package/view/form/inputs/edit/string.hwk

@@ -10,4 +10,5 @@
 	type={% type %}
 	form=<% form_id %>
 	name=<% path %>
+	placeholder={% alchemy_field.placeholder %}
 >