Merge pull request #1130 from girder/frame-selector-tweaks

Allow clearing the min/max fields of the frame selector.
girder · Apr 21, 2023 · b66c5f4 · b66c5f4
2 parents 8aeb345 + 0eba33b
commit b66c5f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.20.6
+
+### Bug Fixes
+- Allow clearing the min/max fields of the frame selector ([#1030](../../pull/1030))
+
 ## 1.20.5
 
 ### Improvements

diff --git a/girder/girder_large_image/web_client/vue/components/CompositeLayers.vue b/girder/girder_large_image/web_client/vue/components/CompositeLayers.vue
@@ -89,13 +89,13 @@ export default {
         },
         updateLayerMin(event, layer) {
             const newVal = event.target.value;
-            const newMinVal = parseFloat(newVal);
+            const newMinVal = Number.isFinite(newVal) ? parseFloat(newVal) : undefined;
             this.compositeLayerInfo[layer].min = newMinVal;
             this.updateStyle();
         },
         updateLayerMax(event, layer) {
             const newVal = event.target.valueAsNumber;
-            const newMaxVal = parseFloat(newVal);
+            const newMaxVal = Number.isFinite(newVal) ? parseFloat(newVal) : undefined;
             this.compositeLayerInfo[layer].max = newMaxVal;
             this.updateStyle();
         },
@@ -192,7 +192,6 @@ export default {
                             @change.prevent="(event) => updateLayerMax(event, layer)"
                         >
                     </td>
-                    <td></td>
                 </tr>
             </tbody>
         </table>

diff --git a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue
@@ -120,7 +120,7 @@ export default Vue.extend({
                 )
             }
             this.sliderModes.push(
-                { id: 3, name: 'Advanced Band Compositing' }
+                { id: 3, name: 'Band Compositing' }
             )
         }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ export default Vue.extend({ @@
                     )
                 }
                 this.sliderModes.push(
-                    { id: 3, name: 'Advanced Band Compositing' }
+                    { id: 3, name: 'Band Compositing' }
                 )
             }
         },
@@ Expand Down @@