@livinglogic/livingapi 1.24.0 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@livinglogic/livingapi",
-	"version": "1.24.0",
+	"version": "1.26.0",
 	"description": "Javascript version of the LivingAPI classes of LivingApps",
 	"repository": {
 		"type": "git",

package/src/livingapi.js

@@ -2104,11 +2104,31 @@ let stringfieldtype = new StringFieldType("la", "StringField", "Holds the value
 
 export class StringField extends Field
 {
+	constructor(control, record, value)
+	{
+		super(control, record, value);
+		this._placeholder = null;
+	}
+
 	[ul4.symbols.type]()
 	{
 		return stringfieldtype;
 	}
 
+	get placeholder()
+	{
+		if (this._placeholder !== null)
+			return this._placeholder;
+		return this.control.placeholder;
+	}
+
+	set placeholder(value)
+	{
+		this._placeholder = value;
+		if (this._in_form())
+			this._dom_control.placeholder = this.placeholder ?? "";
+	}
+
 	_validate(change)
 	{
 		if (change.value === null || change.value === "")
@@ -2155,6 +2175,9 @@ export class StringField extends Field
 	}
 };
 
+StringField.prototype._ul4onattrs = [...Field.prototype._ul4onattrs, "_placeholder"];
+StringField.prototype._ul4attrs = new Set([...Field.prototype._ul4attrs, "placeholder"]);
+
 
 class PasswordFieldType extends StringFieldType
 {
@@ -4139,37 +4162,7 @@ IntControl.prototype.type = "int";
 IntControl.prototype.fieldtype = IntField;
 
 
-class PlaceholderControlType extends ControlType
-{
-	instancecheck(obj)
-	{
-		return obj instanceof PlaceholderControld;
-	}
-};
-
-let placeholdercontroltype = new PlaceholderControlType("la", "PlaceholderControl", "A LivingApps field that has a placeholder");
-
-
-class PlaceholderControl extends Control
-{
-	[ul4.symbols.type]()
-	{
-		return placeholdercontroltype;
-	}
-
-	get placeholder()
-	{
-		let view_control = this._view_control();
-		if (view_control === null)
-			return null;
-		return view_control.placeholder;
-	}
-};
-
-PlaceholderControl.prototype._ul4attrs = new Set([...Control.prototype._ul4attrs, "placeholder"]);
-
-
-class NumberControlType extends PlaceholderControlType
+class NumberControlType extends ControlType
 {
 	instancecheck(obj)
 	{
@@ -4180,7 +4173,7 @@ class NumberControlType extends PlaceholderControlType
 let numbercontroltype = new NumberControlType("la", "NumberControl", "A LivingApps number field (type 'number')");
 
 
-export class NumberControl extends PlaceholderControl
+export class NumberControl extends Control
 {
 	[ul4.symbols.type]()
 	{
@@ -4210,7 +4203,7 @@ NumberControl.prototype._ul4onattrs = [...Control.prototype._ul4onattrs, "precis
 NumberControl.prototype._ul4attrs = new Set([...Control.prototype._ul4attrs, "precision", "minimum", "maximum"]);
 
 
-class StringControlType extends PlaceholderControlType
+class StringControlType extends ControlType
 {
 	instancecheck(obj)
 	{
@@ -4221,13 +4214,21 @@ class StringControlType extends PlaceholderControlType
 let stringcontroltype = new StringControlType("la", "StringControl", "A LivingApps number field (type 'string')");
 
 
-export class StringControl extends PlaceholderControl
+export class StringControl extends Control
 {
 	[ul4.symbols.type]()
 	{
 		return stringcontroltype;
 	}
 
+	get placeholder()
+	{
+		let view_control = this._view_control();
+		if (view_control !== null)
+			return view_control.placeholder;
+		return this._placeholder;
+	}
+
 	_user_placeholder(user, placeholder)
 	{
 		if (placeholder === null)
@@ -4336,6 +4337,7 @@ export class StringControl extends PlaceholderControl
 };
 
 StringControl.prototype.type = "string";
+StringControl.prototype._ul4attrs = new Set([...Control.prototype._ul4attrs, "minlength", "maxlength", "placeholder"]);
 
 
 class TextControlType extends StringControlType
@@ -4517,7 +4519,7 @@ HTMLControl.prototype.subtype = "html";
 HTMLControl.prototype.fieldtype = HTMLField;
 
 
-class DateControlType extends PlaceholderControlType
+class DateControlType extends ControlType
 {
 	instancecheck(obj)
 	{
@@ -4528,7 +4530,7 @@ class DateControlType extends PlaceholderControlType
 let datecontroltype = new DateControlType("la", "DateControl", "A LivingApps date field (type 'date/date')");
 
 
-export class DateControl extends PlaceholderControl
+export class DateControl extends Control
 {
 	[ul4.symbols.type]()
 	{