Added no context widget

Author: RoelandSalij

src/CustomStringNoContext/CustomStringNoContext.xml renamed to src/CustomString/CustomStringNoContext.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<widget id="CustomStringNoContext.widget.CustomStringNoContext" needsEntityContext="false" xmlns="http://www.mendix.com/widget/1.0/">
+<widget id="CustomString.widget.CustomStringNoContext" needsEntityContext="false" xmlns="http://www.mendix.com/widget/1.0/">
   <name>CustomString (No Context)</name>
   <description></description>
 

src/CustomString/widget/CustomString.js

@@ -53,9 +53,11 @@ define([
         update: function(obj, callback) {
             this._contextObj = obj;
 
-            this._resetSubscriptions();
-            this._updateRendering();
-
+            if(this._contextObj)
+            {
+                this._resetSubscriptions();
+                this._updateRendering();
+            }
             callback();
         },
 
@@ -93,9 +95,7 @@ define([
 			        guids       : [this._contextObj.getGuid()]
 
 			    },		
-			    callback     : dojoLang.hitch(this,function(returnedString) {
-			        this.customString.innerHTML = this.checkString(returnedString, this.renderHTML);
-			    }),
+			    callback     : dojoLang.hitch(this, this._processSourceMFCallback),
 			    error        : dojoLang.hitch(this, function(error) {
 			        alert(error.description);
 			    }),
@@ -105,10 +105,14 @@ define([
 			});
 		},
 
+        _processSourceMFCallback: function(returnedString) {
+            this.customString.innerHTML = this.checkString(returnedString, this.renderHTML);
+        },
+
         checkString : function (string, htmlBool) {
-        if(string.indexOf("<script") > -1 || !htmlBool)
-            string = mxui.dom.escapeHTML(string);   
-        return string;  
+            if(string.indexOf("<script") > -1 || !htmlBool)
+                string = mxui.dom.escapeHTML(string);   
+            return string;  
     	},
 
         // Reset subscriptions.

src/CustomStringNoContext/widget/CustomStringNoContext.js renamed to src/CustomString/widget/CustomStringNoContext.js

@@ -1,47 +1,13 @@
-/*
-    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.
-*/
 
 // Required module list. Remove unnecessary modules, you can always get them back from the boilerplate.
-define([
-    "dojo/_base/declare",
-    "mxui/widget/_WidgetBase",
-    "dijit/_TemplatedMixin",
-    "dojo/_base/array",
-    "dojo/_base/lang",
-    "dojo/text!CustomStringNoContext/widget/template/CustomStringNoContext.html"
-], function(declare, _WidgetBase, _TemplatedMixin, dojoArray, dojoLang, widgetTemplate) {
-    "use strict";
-
+require([
+    'dojo/_base/declare', 
+    'dojo/_base/lang',
+    'CustomString/widget/CustomString'
+], function (declare, dojoLang,_customStringNoContextWidget) {
+   
     // Declare widget's prototype.
-    return declare("CustomStringNoContext.widget.CustomStringNoContext", [ _WidgetBase, _TemplatedMixin ], {
-        // _TemplatedMixin will create our dom node using this HTML template.
-        templateString: widgetTemplate,
-
-        // Parameters configured in the Modeler.
-        sourceMF: "",
-        renderHTML: "",
-
-        // Internal variables. Non-primitives created in the prototype are shared between all widget instances.
-        _handles: null,
-        _alertDiv: null,
-
-        // dojo.declare.constructor is called to construct the widget instance. Implement to initialize non-primitive properties.
-        constructor: function() {
-            this._handles = [];
-        },
+    return declare("CustomString.widget.CustomStringNoContext", [ _customStringNoContextWidget ], {
 
         // dijit._WidgetBase.postCreate is called after constructing the widget. Implement to do extra setup work.
         postCreate: function() {
@@ -56,14 +22,14 @@ define([
             if(this.mfToExecute){
                 this.connect(this.customString, "click", this._executeMicroflow)};
         },
+        
+   
         _render : function () {
            mx.data.action({
                 params       : {
                     actionname : this.sourceMF
                 },      
-                callback     : dojoLang.hitch(this,function(returnedString) {
-                    this.customString.innerHTML = this.checkString(returnedString, this.renderHTML);
-                }),
+                callback     : dojoLang.hitch(this, this._processSourceMFCallback),
                 error        : dojoLang.hitch(this, function(error) {
                     alert(error.description);
                 }),
@@ -94,14 +60,9 @@ define([
         },
 
 
-        checkString : function (string, htmlBool) {
-        if(string.indexOf("<script") > -1 || !htmlBool)
-            string = mxui.dom.escapeHTML(string);   
-        return string;  
-    	}
     });
 });
 
-require(["CustomStringNoContext/widget/CustomStringNoContext"], function() {
+require(["CustomString/widget/CustomStringNoContext"], function() {
     "use strict";
 });

src/CustomStringNoContext/widget/template/CustomStringNoContext.html

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="CustomString" version="2.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="CustomString" version="2.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="CustomString/CustomString.xml" />
-            <widgetFile path="CustomStringNoContext/CustomStringNoContext.xml" />
+            <widgetFile path="CustomString/CustomStringNoContext.xml" />
         </widgetFiles>
         <files>
         	<file path="CustomString/widget/" />
-            <file path="CustomStringNoContext/widget/" />
         </files>
     </clientModule>
 </package>