CDPP / AMDA_IHM

Commit 8e40a14dc246cec3b2deb6601d674999b9faf58b

Authored by Elena.Budnik
1 parent d95e8421
Exists in master and in 109 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, 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, 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

new vars in desktop

Showing 1 changed file with 7 additions and 5 deletions   Show diff stats
Inline Side-by-side
desktop.php
  Diff comments   View file @8e40a14
... ... @@ -33,8 +33,8 @@
33 33  
34 34 <!-- <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
35 35 <!-- <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
36   -<!-- <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>-->
37   - <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
  36 +<!-- <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script> -->
  37 + <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
38 38 <!-- <script type="text/javascript" src="js/lib/ext/ext-all-dev.js"> -->
39 39 <!-- <script type="text/javascript" src="js/lib/ext-override.js"></script> -->
40 40  
... ... @@ -76,8 +76,10 @@
76 76  
77 77 var myDesktopApp;
78 78  
  79 + var isMigration = true;
79 80 var sessionID = '<?php echo $sessionID; ?>';
80 81 var isFirstVisit = '<?php echo $usrMgr->isFirst; ?>';
  82 + var isOldWS = '<?php echo $usrMgr->isOldWS; ?>';
81 83 var isSpecialInfo = '<?php echo $usrMgr->isSpecialInfo; ?>';
82 84 var isNewInfo = '<?php echo $usrMgr->isNewInfo; ?>';
83 85 var news = '../data/' + sessionID + '/INFO';
... ... @@ -91,11 +93,11 @@
91 93  
92 94 var helpDir = 'help/';
93 95 var isGuest = sessionID.match('guest');
94   -
  96 +
95 97 var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>';
96 98 var guestSessionDuration = '<?php echo GuestSessionDuration*60; ?>'; // in secs
97 99 var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>'; // in days
98   -
  100 +
99 101 //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask)
100 102 var AMDAMask = new Ext.Class({
101 103 show : function(interactivePlot)
... ... @@ -116,7 +118,7 @@
116 118 maskMsg.style.zIndex = '99999';
117 119 if (interactivePlot)
118 120 {
119   - var killBtn = Ext.get('killopBtn');
  121 + var killBtn = Ext.get('killopBtn');
120 122 killBtn.on('click',function(e,t) {
121 123 AmdaAction.killPlotRequest(function (result, e)
122 124 {
... ...