Cleanup

Author: Jelte Lagendijk

src/CustomString/widget/CustomString.js

@@ -14,7 +14,6 @@
     Describe your widget here.
 */
 
-// Required module list. Remove unnecessary modules, you can always get them back from the boilerplate.
 define([
     "dojo/_base/declare",
     "mxui/widget/_WidgetBase",
@@ -24,12 +23,11 @@ define([
     "dojo/html",
     "mxui/dom",
     "dojo/text!CustomString/widget/template/CustomString.html"
-], function(declare, _WidgetBase, _TemplatedMixin, dojoArray, dojoLang, html, dom, widgetTemplate) {
+], function(declare, _WidgetBase, _TemplatedMixin, dojoArray, lang, html, dom, widgetTemplate) {
     "use strict";
 
-    // Declare widget's prototype.
     return declare("CustomString.widget.CustomString", [ _WidgetBase, _TemplatedMixin ], {
-        // _TemplatedMixin will create our dom node using this HTML template.
+
         templateString: widgetTemplate,
 
         // Parameters configured in the Modeler.
@@ -41,19 +39,16 @@ define([
         _contextObj: null,
         _alertDiv: null,
 
-        // dojo.declare.constructor is called to construct the widget instance. Implement to initialize non-primitive properties.
         constructor: function() {
             logger.level(logger.DEBUG);
             this._handles = [];
         },
 
-        // dijit._WidgetBase.postCreate is called after constructing the widget. Implement to do extra setup work.
         postCreate: function() {
             logger.debug(this.id + ".postCreate");
             this._setupEvents();
         },
 
-        // mxui.widget._WidgetBase.update is called when context is changed or initialized. Implement to re-render and / or fetch data.
         update: function(obj, callback) {
             logger.debug(this.id + ".update");
             this._contextObj = obj;
@@ -64,29 +59,24 @@ define([
             } else if (this._render){
                 this._render(callback);
             } else {
-                mendix.lang.nullExec(callback);
+                this._executeCallback(callback, "update");
             }
         },
 
-         // Attach events to HTML dom elements
         _setupEvents: function() {
             logger.debug(this.id + "._setupEvents");
             this.connect(this.customString, "click", function(e) {
                 // If a microflow has been set execute the microflow on a click.
                 if (this.mfToExecute !== "") {
-                    mx.data.action({
+                    mx.ui.action(this.mfToExecute, {
                         params: {
                             applyto: "selection",
-                            actionname: this.mfToExecute,
                             guids: [ this._contextObj.getGuid() ]
                         },
-                        store: {
-                            caller: this.mxform
-                        },
                         callback: function(obj) {
                             //TODO what to do when all is ok!
                         },
-                        error: dojoLang.hitch(this, function(error) {
+                        error: lang.hitch(this, function(error) {
                             console.log(this.id + ": An error occurred while executing microflow: " + error.description);
                         })
                     }, this);
@@ -96,33 +86,27 @@ define([
 
         _updateRendering : function (callback) {
             logger.debug(this.id + "._updateRendering");
-            mx.data.action({
-                params       : {
-                    actionname : this.sourceMF,
+            mx.ui.action(this.sourceMF, {
+                params: {
                     applyto     : "selection",
                     guids       : [this._contextObj.getGuid()]
-
                 },
-                store: {
-                    caller: this.mxform
-                },
-                callback     : dojoLang.hitch(this, this._processSourceMFCallback, callback),
-                error        : dojoLang.hitch(this, function(error) {
+                callback     : lang.hitch(this, this._processSourceMFCallback, callback),
+                error        : lang.hitch(this, function(error) {
                     alert(error.description);
-                    mendix.lang.nullExec(callback);
+                    this._executeCallback(callback, "_updateRendering error");
                 }),
-                onValidation : dojoLang.hitch(this, function(validations) {
+                onValidation : lang.hitch(this, function(validations) {
                     alert("There were " + validations.length + " validation errors");
-                    mendix.lang.nullExec(callback);
+                    this._executeCallback(callback, "_updateRendering onValidation");
                 })
-            });
+            }, this);
         },
 
-
         _processSourceMFCallback: function (callback, returnedString) {
             logger.debug(this.id + "._processSourceMFCallback");
             html.set(this.customString, this.checkString(returnedString, this.renderHTML));
-            mendix.lang.nullExec(callback);
+            this._executeCallback(callback, "_processSourceMFCallback");
         },
 
         checkString : function (string, htmlBool) {
@@ -134,32 +118,27 @@ define([
             return string;
         },
 
-        // Reset subscriptions.
         _resetSubscriptions: function() {
             logger.debug(this.id + "._resetSubscriptions");
-            // Release handles on previous object, if any.
-            if (this._handles) {
-                dojoArray.forEach(this._handles, function (handle) {
-                    mx.data.unsubscribe(handle);
-                });
-                this._handles = [];
-            }
+            this.unsubscribeAll();
 
-            // When a mendix object exists create subscribtions.
             if (this._contextObj) {
-                var objectHandle = this.subscribe({
+                this.subscribe({
                     guid: this._contextObj.getGuid(),
-                    callback: dojoLang.hitch(this, function(guid) {
+                    callback: lang.hitch(this, function(guid) {
                         this._updateRendering();
                     })
                 });
+            }
+        },
 
-                this._handles = [objectHandle];
+        _executeCallback: function (cb, from) {
+            logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
+            if (cb && typeof cb === "function") {
+                cb();
             }
         }
     });
 });
 
-require(["CustomString/widget/CustomString"], function() {
-    "use strict";
-});
+require(["CustomString/widget/CustomString"]);

src/CustomString/widget/CustomStringNoContext.js

@@ -25,13 +25,7 @@ require([
 
         _render : function (callback) {
             logger.debug(this.id + "._render");
-            mx.data.action({
-                params       : {
-                    actionname : this.sourceMF
-                },
-                store: {
-                    caller: this.mxform
-                },
+            mx.ui.action(this.sourceMF, {
                 callback     : dojoLang.hitch(this, this._processSourceMFCallback, callback),
                 error        : dojoLang.hitch(this, function(error) {
                     alert(error.description);
@@ -41,22 +35,13 @@ require([
                     alert("There were " + validations.length + " validation errors");
                     mendix.lang.nullExec(callback);
                 })
-            });
+            }, this);
         },
 
         _executeMicroflow: function () {
             logger.debug(this.id + "._executeMicroflow");
             if (this.mfToExecute) {
-                mx.data.action({
-                    store: {
-                       caller: this.mxform
-                    },
-                    params: {
-                        actionname: this.mfToExecute
-                    },
-                    callback: function () {},   // ok
-                    error: function () {}       // error
-                });
+                mx.ui.action(this.mfToExecute, {}, this);
             }
         }