Do not emit value if input is disabled

owncloud · May 11, 2020 · e073282 · e073282
1 parent f125e4d
commit e073282
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/changelog/unreleased/modal-confirm-without-input-ref b/changelog/unreleased/modal-confirm-without-input-ref
@@ -0,0 +1,6 @@
+Bugfix: Do not try to emit value after confirming modal if input is missing
+
+Confirming modal resulted in an error if the modal haven't got an input.
+We've fixed this by not attempting to emit the value if the prop `hasInput` is set to false.
+
+https://github.com/owncloud/owncloud-design-system/pull/749
diff --git a/src/elements/OcModal.vue b/src/elements/OcModal.vue
@@ -213,12 +213,14 @@ export default {
     },
 
     $_ocModal_confirm() {
+      const value = this.hasInput ? this.$refs.ocModalInput.value : null
+
       /**
        * The user clicked on the confirm button. If input exists, emits it's value
        * 
        * @property {String} inputValue Value of the input
        */
-      this.$emit("confirm", this.$refs.ocModalInput.value)
+      this.$emit("confirm", value)
     },
 
     $_ocModal_input_type() {