CDPP / AMDA_IHM

Commit 8e283c244c0b52906ecdaf9469c37af8cab0186f

Authored by Benjamin Renard
1 parent 739c3fbc
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Fix uploadNotification function (used by SAMP)

Showing 1 changed file with 19 additions and 12 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/UploadModule.js
  Diff comments   View file @8e283c2
... ... @@ -37,16 +37,23 @@ Ext.define('amdaDesktop.UploadModule', {
37 37  
38 38 uploadNotification : function(url,format){
39 39 var me = this;
40   - loadMask.show();
41   - this.createWindow(function (o)
42   - {
43   - var desktop = myDesktopApp.getDesktop();
44   - var win = desktop.getWindow(me.id);
45   - if (win){
46   - win.items.items[0].forceUpload(url,format);
47   - win.close();
48   - }
49   - loadMask.hide();
50   - });
  40 + var desktop = myDesktopApp.getDesktop();
  41 + var win = desktop.getWindow(me.id);
  42 + if (!win) {
  43 + loadMask.show();
  44 + this.createWindow(function (o)
  45 + {
  46 + win = desktop.getWindow(me.id);
  47 + if (win){
  48 + win.items.items[0].forceUpload(url,format);
  49 + win.close();
  50 + }
  51 + loadMask.hide();
  52 + });
  53 + }
  54 + else {
  55 + win.items.items[0].forceUpload(url,format);
  56 + win.close();
  57 + }
51 58 }
52   -});
53 59 \ No newline at end of file
  60 +});
... ...