Merge branch 'RCandidate'

VIENNA-Advantage-ERP-CRM · Dec 15, 2022 · 5f9d0bd · 5f9d0bd
2 parents 6c2e8b4 + acfa3e4
commit 5f9d0bd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/VIS/Areas/VIS/Scripts/F20/wframe.js b/VIS/Areas/VIS/Scripts/F20/wframe.js
@@ -469,8 +469,8 @@
      *	Dynamic Initialization form
      *  @param AD_Form_ID form
      *  @param callback to add menu item for form
-  	 *  @return true if loaded OK
-	 */
+         *  @return true if loaded OK
+     */
     AWindow.prototype.initForm = function (AD_Form_ID, callback, action, additionalInfo) {
 
 
@@ -803,7 +803,22 @@
             var li = $("<li>");
             var d = $("<div></div>");
             var fired = true;
+
+            var mouseDown = false;
+            if (this.action == "Save") {
+                // Handle case if user direct click on save button 
+                li.on("mousedown touchstrat", function (e) {
+
+                    mouseDown = true;
+                    window.setTimeout(function (md) {
+                        if (mouseDown)
+                            li.trigger('click');
+                    }, 1000);
+                });
+            }
+
             li.on(VIS.Events.onClick, function (e) {
+                mouseDown = false;
                 e.stopPropagation();
                 if (fired && that.onAction && that.isEnabled) {
                     if (that.toggle) {
@@ -962,7 +977,7 @@
         }
     };
 
-    
+
     AppsAction.prototype.highlightNewButton = function (highlight) {
         if (highlight) {
             if (this.$li.instructionPopRemoved)

diff --git a/VIS/Areas/VIS/Scripts/VIS2_0.min.js b/VIS/Areas/VIS/Scripts/VIS2_0.min.js