diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-27 16:30:51 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-12-27 16:30:55 -0600 |
| commit | dbf4d80c329c8c4f4d00412b795d0ec48c35e6e9 (patch) | |
| tree | f421afb3f2a51ad93bb00956053ad0cc0fc1dbe8 | |
| parent | 8c1f287cb70b958ed5e3b9f2f3b31c531f8a8405 (diff) | |
| download | gitlab-ce-25364-fix-preview-multi-request.tar.gz | |
move check for preview loading class to top of method25364-fix-preview-multi-request
| -rw-r--r-- | app/assets/javascripts/preview_markdown.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/preview_markdown.js b/app/assets/javascripts/preview_markdown.js index c06fdf0aa65..89f7e976934 100644 --- a/app/assets/javascripts/preview_markdown.js +++ b/app/assets/javascripts/preview_markdown.js @@ -20,12 +20,17 @@ MarkdownPreview.prototype.ajaxCache = {}; MarkdownPreview.prototype.showPreview = function ($form) { + var mdText; var preview = $form.find('.js-md-preview'); - var mdText = $form.find('textarea.markdown-area').val(); + if (preview.hasClass('md-preview-loading')) { + return; + } + mdText = $form.find('textarea.markdown-area').val(); + if (mdText.trim().length === 0) { preview.text('Nothing to preview.'); this.hideReferencedUsers($form); - } else if (!preview.hasClass('md-preview-loading')) { + } else { preview.addClass('md-preview-loading').text('Loading...'); this.fetchMarkdownPreview(mdText, (function (response) { preview.removeClass('md-preview-loading').html(response.body); |