Merge pull request #48 from mendix/fix/warnings

Removing deprecated APIs and updating jQuery

Author: diego-antonelli

package-lock.json

@@ -1,13 +1,13 @@
 {
     "name": "HTMLSnippet",
-    "version": "3.9.6",
+    "version": "3.9.7",
     "description": "",
     "license": "",
     "author": "",
     "private": true,
     "dependencies": {
         "core-js": "^3.2.1",
-        "jquery": "^3.5.0"
+        "jquery": "~3.5.1"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^3.0.0",

package.json

@@ -35,7 +35,7 @@ define([
         contextObj: null,
 
         postCreate: function () {
-            logger.debug(this.id + ".postCreate");
+            mx.logger.debug(this.id + ".postCreate");
             this._setupEvents();
 
             if (!this.refreshOnContextChange) {
@@ -44,7 +44,7 @@ define([
         },
 
         executeCode: function () {
-            logger.debug(this.id + ".executeCode");
+            mx.logger.debug(this.id + ".executeCode");
             var external = this.contentsPath !== "" ? true : false;
             switch (this.contenttype) {
                 case "html":
@@ -99,7 +99,7 @@ define([
         },
 
         update: function (obj, callback) {
-            logger.debug(this.id + ".update");
+            mx.logger.debug(this.id + ".update");
             this.contextObj = obj;
             if (this.refreshOnContextChange) {
                 this.executeCode();
@@ -123,7 +123,7 @@ define([
         },
 
         _setupEvents: function () {
-            logger.debug(this.id + "._setupEvents");
+            mx.logger.debug(this.id + "._setupEvents");
             if (this.onclickmf) {
                 this.connect(
                     this.domNode,
@@ -134,32 +134,31 @@ define([
         },
 
         _executeMicroflow: function () {
-            logger.debug(this.id + "._executeMicroflow");
+            mx.logger.debug(this.id + "._executeMicroflow");
             if (this.onclickmf) {
-                var params = {};
+                var params = {
+                    actionname: this.onclickmf
+                };
                 if (this.contextObj !== null) {
                     params.applyto = "selection";
                     params.guids = [this.contextObj.getGuid()];
                 }
-                mx.ui.action(
-                    this.onclickmf, {
-                        params: params,
-                        callback: function (obj) {
-                            logger.debug(
-                                this.id + " (executed microflow successfully)."
-                            );
-                        },
-                        error: function (error) {
-                            logger.error(this.id + error);
-                        }
+                mx.data.action({
+                    params: params,
+                    callback: function (obj) {
+                        mx.logger.debug(
+                            this.id + " (executed microflow successfully)."
+                        );
                     },
-                    this
-                );
+                    error: function (error) {
+                        mx.logger.error(this.id + error);
+                    }
+                });
             }
         },
 
         evalJs: function () {
-            logger.debug(this.id + ".evalJS");
+            mx.logger.debug(this.id + ".evalJS");
             try {
                 eval(this.contents + "\r\n//# sourceURL=" + this.id + ".js");
             } catch (error) {
@@ -168,7 +167,7 @@ define([
         },
 
         _evalJQueryCode: function () {
-            logger.debug(this.id + "._evalJQueryCode");
+            mx.logger.debug(this.id + "._evalJQueryCode");
             require(["jquery"], lang.hitch(this, function(jQuery){
                 try {
                     (function (snippetCode) {
@@ -198,7 +197,7 @@ define([
         },
 
         _handleError: function (error) {
-            logger.debug(this.id + "._handleError");
+            mx.logger.debug(this.id + "._handleError");
             domConstruct.place(
                 '<div class="alert alert-danger">Error while evaluating javascript input: ' +
                 error +
@@ -209,7 +208,7 @@ define([
         },
 
         _executeCallback: function (cb, from) {
-            logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
+            mx.logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
             if (cb && typeof cb === "function") {
                 cb();
             }

src/HTMLSnippet/widget/HTMLSnippet.js

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="HTMLSnippet" version="3.9.6" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="HTMLSnippet" version="3.9.7" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="HTMLSnippet/HTMLSnippet.xml"/>
             <widgetFile path="HTMLSnippet/HTMLSnippetContext.xml"/>