Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 84 deletions

diff --git a/app/assets/javascripts/snippet/snippet_embed.js b/app/assets/javascripts/snippet/snippet_embed.js
deleted file mode 100644
index 65dd62f6af9..00000000000
--- a/app/assets/javascripts/snippet/snippet_embed.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { __ } from '~/locale';
-import { parseUrlPathname, parseUrl } from '../lib/utils/common_utils';
-
-function swapActiveState(activateBtn, deactivateBtn) {
-  activateBtn.classList.add('is-active');
-  deactivateBtn.classList.remove('is-active');
-}
-
-export default () => {
-  const shareBtn = document.querySelector('.js-share-btn');
-
-  if (shareBtn) {
-    const embedBtn = document.querySelector('.js-embed-btn');
-    const snippetUrlArea = document.querySelector('.js-snippet-url-area');
-    const embedAction = document.querySelector('.js-embed-action');
-    const dataUrl = snippetUrlArea.getAttribute('data-url');
-
-    snippetUrlArea.addEventListener('click', () => snippetUrlArea.select());
-
-    shareBtn.addEventListener('click', () => {
-      swapActiveState(shareBtn, embedBtn);
-      snippetUrlArea.value = dataUrl;
-      embedAction.innerText = __('Share');
-    });
-
-    embedBtn.addEventListener('click', () => {
-      const parser = parseUrl(dataUrl);
-      const url = `${parser.origin + parseUrlPathname(dataUrl)}`;
-      const params = parser.search;
-      const scriptTag = `<script src="${url}.js${params}"></script>`;
-
-      swapActiveState(embedBtn, shareBtn);
-      snippetUrlArea.value = scriptTag;
-      embedAction.innerText = __('Embed');
-    });
-  }
-};
diff --git a/app/assets/javascripts/snippet/snippet_show.js b/app/assets/javascripts/snippet/snippet_show.js
index 7151b5f5adb..2ef532bc6b7 100644
--- a/app/assets/javascripts/snippet/snippet_show.js
+++ b/app/assets/javascripts/snippet/snippet_show.js
@@ -1,48 +1,13 @@
-if (!gon.features.snippetsVue) {
-  const LineHighlighterModule = import('~/line_highlighter');
-  const BlobViewerModule = import('~/blob/viewer');
-  const ZenModeModule = import('~/zen_mode');
-  const SnippetEmbedModule = import('~/snippet/snippet_embed');
-  const initNotesModule = import('~/init_notes');
-  const loadAwardsHandlerModule = import('~/awards_handler');
+import initNotes from '~/init_notes';
+import loadAwardsHandler from '~/awards_handler';
+import { SnippetShowInit } from '~/snippets';
+import ZenMode from '~/zen_mode';
 
-  Promise.all([
-    LineHighlighterModule,
-    BlobViewerModule,
-    ZenModeModule,
-    SnippetEmbedModule,
-    initNotesModule,
-    loadAwardsHandlerModule,
-  ])
-    .then(
-      ([
-        { default: LineHighlighter },
-        { default: BlobViewer },
-        { default: ZenMode },
-        { default: SnippetEmbed },
-        { default: initNotes },
-        { default: loadAwardsHandler },
-      ]) => {
-        new LineHighlighter(); // eslint-disable-line no-new
-        new BlobViewer(); // eslint-disable-line no-new
-        new ZenMode(); // eslint-disable-line no-new
-        SnippetEmbed();
-        initNotes();
-        loadAwardsHandler();
-      },
-    )
-    .catch(() => {});
-} else {
-  import('~/snippets')
-    .then(({ SnippetShowInit }) => {
-      SnippetShowInit();
-    })
-    .then(() => {
-      return Promise.all([import('~/init_notes'), import('~/awards_handler')]);
-    })
-    .then(([{ default: initNotes }, { default: loadAwardsHandler }]) => {
-      initNotes();
-      loadAwardsHandler();
-    })
-    .catch(() => {});
-}
+document.addEventListener('DOMContentLoaded', () => {
+  SnippetShowInit();
+  initNotes();
+  loadAwardsHandler();
+
+  // eslint-disable-next-line no-new
+  new ZenMode();
+});