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