diff options
| author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-08-06 12:02:23 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-06 12:02:23 +0000 |
| commit | 3283e4397fab09be6fe9496b6a20ff08cc17fa5a (patch) | |
| tree | 3e77d4a93212ebbf32ff053f6c5f80ca1ecb7997 /app | |
| parent | fd92bd24f919fbe7f184c2fc49dd7b944b634825 (diff) | |
| download | gitlab-ce-3283e4397fab09be6fe9496b6a20ff08cc17fa5a.tar.gz | |
Revert "Fixed comparing value to undefined"
This reverts commit d754beb74fbc06a2c744e15be4aa2831d8cef1c0.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/behaviors/preview_markdown.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/behaviors/preview_markdown.js b/app/assets/javascripts/behaviors/preview_markdown.js index 35874140bf9..b2571fb840c 100644 --- a/app/assets/javascripts/behaviors/preview_markdown.js +++ b/app/assets/javascripts/behaviors/preview_markdown.js @@ -36,6 +36,10 @@ MarkdownPreview.prototype.showPreview = function($form) { mdText = $form.find('textarea.markdown-area').val(); + if (mdText === undefined) { + return; + } + if (mdText.trim().length === 0) { preview.text(this.emptyMessage); this.hideReferencedUsers($form); diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue index fc6a45b957e..6a4a834337a 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue @@ -27,7 +27,6 @@ export default { return { width: 0, height: 0, - isLoaded: false, }; }, computed: { @@ -63,8 +62,6 @@ export default { this.height = contentImg.naturalHeight; this.$nextTick(() => { - this.isLoaded = true; - this.$emit('imgLoaded', { width: this.width, height: this.height, |