Cleanup and fix #7

Author: Jelte Lagendijk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CustomString",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Create a string with a microflow",
   "license": "",
   "author": "",

src/CustomString/widget/CustomString.js

@@ -1,19 +1,3 @@
-/*
-    CustomString
-    ========================
-
-    @file      : CustomString.js
-    @version   : 2.0.0
-    @author    : Roeland Salij
-    @date      : Thursday, December 03, 2015
-    @copyright : Mendix 2015
-    @license   : Apache 2
-
-    Documentation
-    ========================
-    Describe your widget here.
-*/
-
 define([
     "dojo/_base/declare",
     "mxui/widget/_WidgetBase",
@@ -34,7 +18,7 @@ define([
         sourceMF: "",
         renderHTML: "",
 
-        // Internal variables. Non-primitives created in the prototype are shared between all widget instances.
+        // Internal
         _handles: null,
         _contextObj: null,
         _alertDiv: null,
@@ -72,9 +56,7 @@ define([
                             applyto: "selection",
                             guids: [ this._contextObj.getGuid() ]
                         },
-                        callback: function(obj) {
-                            //TODO what to do when all is ok!
-                        },
+                        callback: function(obj) {},
                         error: lang.hitch(this, function(error) {
                             console.log(this.id + ": An error occurred while executing microflow: " + error.description);
                         })

src/CustomString/widget/CustomStringNoContext.js

@@ -1,21 +1,16 @@
-
-// Required module list. Remove unnecessary modules, you can always get them back from the boilerplate.
 require([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "CustomString/widget/CustomString"
-], function (declare, dojoLang,_customStringNoContextWidget) {
+], function (declare, lang, _customStringNoContextWidget) {
 
-    // Declare widget's prototype.
     return declare("CustomString.widget.CustomStringNoContext", [ _customStringNoContextWidget ], {
 
-        // dijit._WidgetBase.postCreate is called after constructing the widget. Implement to do extra setup work.
         postCreate: function() {
             logger.debug(this.id + ".postCreate");
             this._setupEvents();
         },
 
-        // Attach events to HTML dom elements
         _setupEvents: function() {
             logger.debug(this.id + "._setupEvents");
             if (this.mfToExecute) {
@@ -26,14 +21,14 @@ require([
         _render : function (callback) {
             logger.debug(this.id + "._render");
             mx.ui.action(this.sourceMF, {
-                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, "_render error cb");
                 }),
-                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, "_render onvalidation cb");
                 })
             }, this);
         },
@@ -44,10 +39,7 @@ require([
                 mx.ui.action(this.mfToExecute, {}, this);
             }
         }
-
     });
 });
 
-require(["CustomString/widget/CustomStringNoContext"], function() {
-    "use strict";
-});
+require(["CustomString/widget/CustomStringNoContext"]);

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="CustomString" version="2.2.3" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="CustomString" version="2.2.4" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="CustomString/CustomString.xml"/>
             <widgetFile path="CustomString/CustomStringNoContext.xml"/>