forked from lin-midas-pages/common_pages
Only one confirmation, not two
This commit is contained in:
1 parent
3429603998
commit
a7831c6fb2
2 files changed
+10
-14
No files matched your search
@@ -23,4 +23,8 @@ mhttpd to report errors such as:
|
||||
Cannot find resource file 'Beamline_elements/spinning-wheel.gif'
|
||||
|
||||
This is a compatibility/resource-path requirement resulting from serving the
|
||||
Beamline Elements pages from their own subdirectory.
|
||||
Beamline Elements pages from their own subdirectory. It could be resolved by
|
||||
a more robust design of MIDAS itself (i.e. mhttpd.js could determine the
|
||||
resource path relative to the MIDAS installation rather than the current
|
||||
document URL), but until (if ever) this gets fixed upstream, this is a
|
||||
suitable workaround.
|
||||
+5
-13
@@ -1143,19 +1143,11 @@ export function run_pysequencer_script(command) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (command != 'Idle') {
|
||||
// Get confirmation from user before proceeding
|
||||
let result = confirm('Are you sure you want to run ' + command + '?');
|
||||
if (result == false) {
|
||||
// Abort.
|
||||
return;
|
||||
} else {
|
||||
// Get another confirmation
|
||||
result = confirm('Are you really sure you want to run ' + command + '?');
|
||||
if (result == false) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Get confirmation from user before proceeding
|
||||
let result = confirm('Are you sure you want to run ' + command + '?');
|
||||
if (result == false) {
|
||||
// Abort.
|
||||
return;
|
||||
}
|
||||
|
||||
// Check whether there is an pysequencer already going
|
||||
|
||||
Reference in new issue
Block a user