Replace old modal notice with new overlay

ome · Apr 22, 2024 · 8481f4c · 8481f4c
1 parent 0cc063a
commit 8481f4c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 29 deletions.
diff --git a/omeroweb/webgateway/static/webgateway/js/ome.gs_utils.js b/omeroweb/webgateway/static/webgateway/js/ome.gs_utils.js
@@ -118,24 +118,6 @@ function gs_choiceModalDialog (message, choices, callback, blockui_opts, cancel_
   return;
 }
 
-/**
- * Calls a jsonp url, just like $.getJson, but also looks out for errors.
- * The call is made in a make-believe synchronous fashion, by adding a semi-transparent overlay and disabling controls.
- */
-function gs_modalJson (url, data, callback) {
-  if (!gs_loadBlockUI (function () {gs_modalJson(url,data,callback);})) {
-    return;
-  }
-  jQuery.blockUI();
-  var cb = function (result, rv) {
-    jQuery.unblockUI();
-    if (callback) {
-      callback(result, rv);
-    }
-  }
-  gs_json (url, data, cb);
-}
-
 function gs_json (url, data, callback) {
   var cb = function (result) {
     return function (data, textStatus, errorThrown) {

diff --git a/omeroweb/webgateway/static/webgateway/js/omero_image.js b/omeroweb/webgateway/static/webgateway/js/omero_image.js
@@ -99,19 +99,32 @@
     window.setImageDefaults = function (viewport, obj, callback, skip_apply) {
         if (!skip_apply) applyRDCW(viewport);
         var old = $(obj).html();
-        gs_modalJson(viewport.viewport_server + '/saveImgRDef/'+viewport.loadedImg.id+'/?'+viewport.getQuery(true),
-            {},
-            function(success, rv) {
-                $(obj).html(old).prop('disabled', false);
-                if (!(success && rv)) {
-                    alert('Setting image defaults failed. Success: ' + success + ' Response: ' + rv);
+        OME.progress_overlay(new Promise(function (resolve) {
+            var cb = function (success) {
+                return function (data, textStatus, errorThrown) {
+                    resolve();
+                    var rv = success ? data : errorThrown || textStatus;
+                    $(obj).html(old).prop('disabled', false);
+                    if (!(success && rv)) {
+                        alert('Setting image defaults failed. Success: ' + success + ' Response: ' + rv);
+                    }
+                    if (callback) {
+                        callback();
+                    }
+                    viewport.setSaved();
+                    updateUndoRedo(viewport);
                 }
-                if (callback) {
-                    callback();
-                }
-                viewport.setSaved();
-                updateUndoRedo(viewport);
+            }
+            jQuery.ajax({
+                type: "POST",
+                url: viewport.viewport_server + '/saveImgRDef/'+viewport.loadedImg.id+'/?'+viewport.getQuery(true),
+                data: {},
+                success: cb(true),
+                error: cb(false),
+                dataType: "jsonp",
+                traditional: true
             });
+        }), 'Saving...');
         return false;
     };