alchemy-widget 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2 (2022-12-23)
+
+* Fix widgets not being populated properly
+
 ## 0.2.1 (2022-12-23)
 
 * Add a `-first` modifier class to the first visible entry of a table-of-contents element

package/element/05-widget_element.js

@@ -215,7 +215,7 @@ Widget.setMethod(function getValueFromRecord(record) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.5
- * @version  0.1.6
+ * @version  0.2.1
  */
 Widget.setMethod(function applyValue(value) {
 
@@ -255,7 +255,7 @@ Widget.setMethod(function applyValue(value) {
 	}
 
 	this.instance.config = config;
-	let promise = this.instance.populateWidget();
+	let promise = this.instance.loadWidget();
 
 	if (promise) {
 		this.delayAssemble(promise);

package/helper/widgets/00-widget.js

@@ -627,7 +627,7 @@ Widget.setMethod(function _createWidgetElement() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.2
  *
  * @return   {HTMLElement}
  */
@@ -641,14 +641,41 @@ Widget.setMethod(function _createPopulatedWidgetElement() {
 
 	this.widget = element;
 
-	// See if it can be populated
-	if (typeof this.populateWidget == 'function') {
-		this.populateWidget(element);
-	}
+	this.loadWidget();
 
 	return element;
 });
 
+/**
+ * Load the widget element: populate it & finalize it
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.2
+ * @version  0.2.2
+ *
+ * @return   {Promise|null}
+ */
+Widget.setMethod(function loadWidget() {
+
+	let populate = this.populateWidget();
+
+	if (Pledge.isThenable(populate)) {
+		let pledge = new Pledge();
+
+		Pledge.done(populate, (err, result) => {
+
+			if (err) {
+				pledge.reject(err);
+			}
+
+			pledge.resolve(this.finalizePopulatedWidget());
+		});
+
+		return pledge;
+	} else {
+		return this.finalizePopulatedWidget();
+	}
+});
 
 /**
  * Populate the actual widget
@@ -826,14 +853,13 @@ Widget.setMethod(function stopEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.2.1
+ * @version  0.2.2
  */
 Widget.setMethod(async function rerender() {
 
 	Hawkejs.removeChildren(this.widget);
 
-	await this.populateWidget();
-	await this.finalizePopulatedWidget();
+	await this.loadWidget();
 
 	if (this.editing) {
 		this.startEditor();

package/helper/widgets/01-container.js

@@ -38,12 +38,10 @@ Container.constitute(function prepareSchema() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
- *
- * @return   {HTMLElement}
+ * @version  0.2.2
  */
 Container.setMethod(function initContainer() {
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/helper/widgets/alchemy_tabs_widget.js

@@ -178,7 +178,7 @@ Tabs.setMethod(function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.2.2
  */
 Tabs.setMethod(function _stopEditor() {
 
@@ -189,5 +189,5 @@ Tabs.setMethod(function _stopEditor() {
 		sub_widget.stopEditor();
 	}
 
-	this.populateWidget();
+	this.loadWidget();
 });

package/helper/widgets/markdown.js

@@ -74,14 +74,14 @@ Markdown.setMethod(async function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.2
  */
 Markdown.setMethod(function _stopEditor() {
 
 	Hawkejs.removeChildren(this.widget);
 	this.easy_mde = null;
 
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/helper/widgets/partial.js

@@ -161,7 +161,7 @@ Partial.setMethod(function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.2.2
  */
 Partial.setMethod(function _stopEditor() {
 
@@ -172,7 +172,7 @@ Partial.setMethod(function _stopEditor() {
 		sub_widget.stopEditor();
 	}
 
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/helper/widgets/sourcecode.js

@@ -80,13 +80,13 @@ Sourcecode.setMethod(function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.2
  */
 Sourcecode.setMethod(function _stopEditor() {
 
 	Hawkejs.removeChildren(this.widget);
 
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-widget",
 	"description": "The widget plugin for the AlchemyMVC",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",