Fix ticket 69994: Microflow Timer not working properly in popup. Also item ASC-2

Author: Jelte Lagendijk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MicroflowTimer",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "",
   "license": "",
   "author": "",
@@ -34,4 +34,4 @@
     "folders": "node ./node_modules/gulp/bin/gulp folders",
     "modeler": "node ./node_modules/gulp/bin/gulp modeler"
   }
-}
+}

src/MicroflowTimer/widget/MicroflowTimer.js

@@ -187,7 +187,6 @@ define([
                 var mfObject = {
                     params: {
                         actionname: this.microflow,
-                        origin: this.mxform,
                         applyto: "selection",
                         guids: [this._contextObj.getGuid()]
                     },
@@ -202,6 +201,15 @@ define([
                         mx.ui.error("An error ocurred while executing microflow" + error.message);
                     })
                 };
+
+                if (!mx.version || mx.version && parseInt(mx.version.split(".")[0]) < 6) {
+                    mfObject.store = {
+                        caller: this.mxform
+                    };
+                } else {
+                    mfObject.origin = this.mxform;
+                }
+
                 mx.data.action(mfObject, this);
             }
         },
@@ -228,41 +236,32 @@ define([
 
         // Reset subscriptions.
         _resetSubscriptions: function() {
-            // Release handles on previous object, if any.
-            if (this._handles) {
-                dojoArray.forEach(this._handles, function (handle) {
-                    this.unsubscribe(handle);
-                });
-
-                this._handles = [];
-            }
+            this.unsubscribeAll();
 
             // When a mendix object exists create subscribtions.
             if (this._contextObj && this.timerStatusAttr) {
-                var _objectHandle = this.subscribe({
+                this.subscribe({
                     guid: this._contextObj.getGuid(),
                     callback: lang.hitch(this, function(guid) {
                         this._checkTimerStatus();
                     })
                 });
 
-                var _attrHandle = this.subscribe({
+                this.subscribe({
                     guid: this._contextObj.getGuid(),
                     attr: this.timerStatusAttr,
                     callback: lang.hitch(this, function(guid, attr, attrValue) {
                         this._checkTimerStatus();
                     })
                 });
 
-                var _attrHandle2 = this.subscribe({
+                this.subscribe({
                     guid: this._contextObj.getGuid(),
                     attr: this.intervalAttr,
                     callback: lang.hitch(this, function(guid, attr, attrValue) {
                         this._intervalChange();
                     })
                 });
-
-                this._handles = [_objectHandle, _attrHandle, _attrHandle2];
             }
         },
 

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="MicroflowTimer" version="4.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="MicroflowTimer" version="4.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="MicroflowTimer/MicroflowTimer.xml"/>
         </widgetFiles>