Merge branch 'release/3.7.0'

aarpon · Dec 17, 2019 · 50420be · 50420be
2 parents 7492f69 + 8ea536d
commit 50420be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/scripts/common.js b/scripts/common.js
@@ -387,6 +387,8 @@ function changeStedEntryProperties(selectObj, channel) {
         var tag = tagArray[i];
         var id = tag.concat(channel);
 
+        if (document.getElementById(id) == null) continue;
+
         var inputElement = document.getElementById(id);
 
         if ( selectObj.value == 'off-confocal' ) {
@@ -400,10 +402,10 @@ function changeStedEntryProperties(selectObj, channel) {
 }
 
 
-function setStedEntryProperties( ) {
+function setStedEntryProperties(chanCnt) {
     var tag = "StedDepletionMode";
 
-    for (var chan = 0; chan < 6; chan++) {
+    for (var chan = 0; chan < chanCnt; chan++) {
         var name = tag.concat(chan);
 
         var inputElement = document.getElementsByName(name);

diff --git a/sted_parameters.php b/sted_parameters.php
@@ -725,7 +725,7 @@ class="multichannelinput"/>
 </div> <!-- rightpanel -->
 
 <script type="text/javascript">
-    setStedEntryProperties();
+    setStedEntryProperties(<?php echo $chanCnt; ?>);
 </script>
 
 <?php