Update mfAction

Author: Jelte Lagendijk

package.json

@@ -1,12 +1,11 @@
 {
   "name": "ChartJS",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "This widget is a wrapper for the ChartJS library and you can use it to visualize your aggregated data.",
   "license": "Apache License, Version 2",
   "author": "Mendix",
   "private": true,
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {
     "del": "^2.2.2",
     "gulp": "^3.9.1",
@@ -34,4 +33,4 @@
     "folders": "node ./node_modules/gulp/bin/gulp folders",
     "modeler": "node ./node_modules/gulp/bin/gulp modeler"
   }
-}
+}

src/ChartJS/widgets/Core.js

@@ -162,7 +162,7 @@ define([
                 domStyle.set(this.domNode, "display", "none");
             }
 
-            mendix.lang.nullExec(callback);
+            this._executeCallback(callback, "update");
         },
 
         _loadData: function () {
@@ -634,11 +634,8 @@ define([
                 _params.guids = [obj.getGuid()];
             }
 
-            mx.data.action({
+            var mfAction = {
                 params: _params,
-                store: {
-                    caller: this.mxform
-                },
                 callback: lang.hitch(this, function (obj) {
                     if (typeof callback === "function") {
                         callback(obj);
@@ -647,7 +644,24 @@ define([
                 error: lang.hitch(this, function (error) {
                     console.log(this.id + "._executeMicroflow error: " + error.description);
                 })
-            }, this);
+            };
+
+            if (!mx.version || mx.version && parseInt(mx.version.split(".")[0]) < 6) {
+                mfAction.store = {
+                    caller: this.mxform
+                };
+            } else {
+                mfAction.origin = this.mxform;
+            }
+
+            mx.data.action(mfAction, this);
+        },
+
+        _executeCallback: function (cb, from) {
+            logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
+            if (cb && typeof cb === "function") {
+                cb();
+            }
         }
 
     });

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="ChartJS" version="3.5.2" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ChartJS" version="3.5.3" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ChartJS/widgets/BarChart/BarChart.xml"/>
             <widgetFile path="ChartJS/widgets/LineChart/LineChart.xml"/>