Merge branch 'move-markdown-preview' into 'master'

Remove preview_markdown from the global obj

See merge request gitlab-org/gitlab-ce!16025

app/assets/javascripts/behaviors/index.js

@@ -7,6 +7,7 @@ import installGlEmojiElement from './gl_emoji';
 import './quick_submit';
 import './requires_input';
 import './toggler_behavior';
+import '../preview_markdown';
 
 installGlEmojiElement();
 initCopyAsGFM();

app/assets/javascripts/main.js

@@ -46,7 +46,6 @@ import LazyLoader from './lazy_loader';
 import './line_highlighter';
 import initLogoAnimation from './logo';
 import './milestone_select';
-import './preview_markdown';
 import './projects_dropdown';
 import './render_gfm';
 import initBreadcrumbs from './breadcrumb';

app/assets/javascripts/preview_markdown.js

@@ -6,23 +6,22 @@
 // (including the explanation of quick actions), and showing a warning when
 // more than `x` users are referenced.
 //
-(function () {
-  var lastTextareaPreviewed;
-  var lastTextareaHeight = null;
-  var markdownPreview;
-  var previewButtonSelector;
-  var writeButtonSelector;
 
-  window.MarkdownPreview = (function () {
-    function MarkdownPreview() {}
+var lastTextareaPreviewed;
+var lastTextareaHeight = null;
+var markdownPreview;
+var previewButtonSelector;
+var writeButtonSelector;
 
-    // Minimum number of users referenced before triggering a warning
-    MarkdownPreview.prototype.referenceThreshold = 10;
-    MarkdownPreview.prototype.emptyMessage = 'Nothing to preview.';
+function MarkdownPreview() {}
 
-    MarkdownPreview.prototype.ajaxCache = {};
+// Minimum number of users referenced before triggering a warning
+MarkdownPreview.prototype.referenceThreshold = 10;
+MarkdownPreview.prototype.emptyMessage = 'Nothing to preview.';
 
-    MarkdownPreview.prototype.showPreview = function ($form) {
+MarkdownPreview.prototype.ajaxCache = {};
+
+MarkdownPreview.prototype.showPreview = function ($form) {
   var mdText;
   var preview = $form.find('.js-md-preview');
   var url = preview.data('url');
@@ -53,9 +52,9 @@
       }
     }).bind(this));
   }
-    };
+};
 
-    MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) {
+MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) {
   if (!url) {
     return;
   }
@@ -78,13 +77,13 @@
       success(response);
     }).bind(this)
   });
-    };
+};
 
-    MarkdownPreview.prototype.hideReferencedUsers = function ($form) {
+MarkdownPreview.prototype.hideReferencedUsers = function ($form) {
   $form.find('.referenced-users').hide();
-    };
+};
 
-    MarkdownPreview.prototype.renderReferencedUsers = function (users, $form) {
+MarkdownPreview.prototype.renderReferencedUsers = function (users, $form) {
   var referencedUsers;
   referencedUsers = $form.find('.referenced-users');
   if (referencedUsers.length) {
@@ -95,13 +94,13 @@
       referencedUsers.hide();
     }
   }
-    };
+};
 
-    MarkdownPreview.prototype.hideReferencedCommands = function ($form) {
+MarkdownPreview.prototype.hideReferencedCommands = function ($form) {
   $form.find('.referenced-commands').hide();
-    };
+};
 
-    MarkdownPreview.prototype.renderReferencedCommands = function (commands, $form) {
+MarkdownPreview.prototype.renderReferencedCommands = function (commands, $form) {
   var referencedCommands;
   referencedCommands = $form.find('.referenced-commands');
   if (commands.length > 0) {
@@ -111,25 +110,23 @@
     referencedCommands.html('');
     referencedCommands.hide();
   }
-    };
+};
 
-    return MarkdownPreview;
-  }());
+markdownPreview = new MarkdownPreview();
 
-  markdownPreview = new window.MarkdownPreview();
-  previewButtonSelector = '.js-md-preview-button';
-  writeButtonSelector = '.js-md-write-button';
-  lastTextareaPreviewed = null;
-  const markdownToolbar = $('.md-header-toolbar');
+previewButtonSelector = '.js-md-preview-button';
+writeButtonSelector = '.js-md-write-button';
+lastTextareaPreviewed = null;
+const markdownToolbar = $('.md-header-toolbar');
 
-  $.fn.setupMarkdownPreview = function () {
+$.fn.setupMarkdownPreview = function () {
   var $form = $(this);
   $form.find('textarea.markdown-area').on('input', function () {
     markdownPreview.hideReferencedUsers($form);
   });
-  };
+};
 
-  $(document).on('markdown-preview:show', function (e, $form) {
+$(document).on('markdown-preview:show', function (e, $form) {
   if (!$form) {
     return;
   }
@@ -146,9 +143,9 @@
   $form.find('.md-preview-holder').show();
   markdownToolbar.removeClass('active');
   markdownPreview.showPreview($form);
-  });
+});
 
-  $(document).on('markdown-preview:hide', function (e, $form) {
+$(document).on('markdown-preview:hide', function (e, $form) {
   if (!$form) {
     return;
   }
@@ -169,9 +166,9 @@
   markdownToolbar.addClass('active');
 
   markdownPreview.hideReferencedCommands($form);
-  });
+});
 
-  $(document).on('markdown-preview:toggle', function (e, keyboardEvent) {
+$(document).on('markdown-preview:toggle', function (e, keyboardEvent) {
   var $target;
   $target = $(keyboardEvent.target);
   if ($target.is('textarea.markdown-area')) {
@@ -182,19 +179,20 @@
     $(document).triggerHandler('markdown-preview:hide', [$target.closest('form')]);
     keyboardEvent.preventDefault();
   }
-  });
+});
 
-  $(document).on('click', previewButtonSelector, function (e) {
+$(document).on('click', previewButtonSelector, function (e) {
   var $form;
   e.preventDefault();
   $form = $(this).closest('form');
   $(document).triggerHandler('markdown-preview:show', [$form]);
-  });
+});
 
-  $(document).on('click', writeButtonSelector, function (e) {
+$(document).on('click', writeButtonSelector, function (e) {
   var $form;
   e.preventDefault();
   $form = $(this).closest('form');
   $(document).triggerHandler('markdown-preview:hide', [$form]);
-  });
-}());
+});
+
+export default MarkdownPreview;