Skip to content

G
gitlab-ce
Commit 7fd4e21c authored by Mike Greiling's avatar Mike Greiling
Browse files
Options

Prettify blob behaviors and cycle_analytics modules

parent aeaf6686
Show whitespace changes
Inline Side-by-side
Showing with 507 additions and 488 deletions
app/assets/javascripts/behaviors/copy_to_clipboard.js
View file @ 7fd4e21c
...@@ -51,7 +51,7 @@ export default function initCopyToClipboard() { ...@@ -51,7 +51,7 @@ export default function initCopyToClipboard() {
* the last minute to deconstruct this JSON hash and set the `text/plain` and `text/x-gfm` copy * the last minute to deconstruct this JSON hash and set the `text/plain` and `text/x-gfm` copy
* data types to the intended values. * data types to the intended values.
*/ */
$(document).on('copy', 'body > textarea[readonly]', (e) => { $(document).on('copy', 'body > textarea[readonly]', e => {
const { clipboardData } = e.originalEvent; const { clipboardData } = e.originalEvent;
if (!clipboardData) return; if (!clipboardData) return;
......
app/assets/javascripts/behaviors/details_behavior.js
View file @ 7fd4e21c
...@@ -2,7 +2,9 @@ import $ from 'jquery'; ...@@ -2,7 +2,9 @@ import $ from 'jquery';
$(() => { $(() => {
$('body').on('click', '.js-details-target', function target() { $('body').on('click', '.js-details-target', function target() {
$(this).closest('.js-details-container').toggleClass('open'); $(this)
.closest('.js-details-container')
.toggleClass('open');
}); });
// Show details content. Hides link after click. // Show details content. Hides link after click.
...@@ -13,7 +15,9 @@ $(() => { ...@@ -13,7 +15,9 @@ $(() => {
// //
$('body').on('click', '.js-details-expand', function expand(e) { $('body').on('click', '.js-details-expand', function expand(e) {
e.preventDefault(); e.preventDefault();
$(this).next('.js-details-content').removeClass('hide'); $(this)
.next('.js-details-content')
.removeClass('hide');
$(this).hide(); $(this).hide();
const truncatedItem = $(this).siblings('.js-details-short'); const truncatedItem = $(this).siblings('.js-details-short');
......
app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
View file @ 7fd4e21c
...@@ -34,7 +34,7 @@ const gfmRules = { ...@@ -34,7 +34,7 @@ const gfmRules = {
}, },
}, },
AutolinkFilter: { AutolinkFilter: {
'a'(el, text) { a(el, text) {
// Fallback on the regular MarkdownFilter's `a` handler. // Fallback on the regular MarkdownFilter's `a` handler.
if (text !== el.getAttribute('href')) return false; if (text !== el.getAttribute('href')) return false;
...@@ -60,7 +60,7 @@ const gfmRules = { ...@@ -60,7 +60,7 @@ const gfmRules = {
}, },
}, },
ImageLazyLoadFilter: { ImageLazyLoadFilter: {
'img'(el, text) { img(el, text) {
return `![${el.getAttribute('alt')}](${el.getAttribute('src')})`; return `![${el.getAttribute('alt')}](${el.getAttribute('src')})`;
}, },
}, },
...@@ -71,7 +71,7 @@ const gfmRules = { ...@@ -71,7 +71,7 @@ const gfmRules = {
return CopyAsGFM.nodeToGFM(videoEl); return CopyAsGFM.nodeToGFM(videoEl);
}, },
'video'(el) { video(el) {
return `![${el.dataset.title}](${el.getAttribute('src')})`; return `![${el.dataset.title}](${el.getAttribute('src')})`;
}, },
}, },
...@@ -118,11 +118,14 @@ const gfmRules = { ...@@ -118,11 +118,14 @@ const gfmRules = {
'a[name]:not([href]):empty'(el) { 'a[name]:not([href]):empty'(el) {
return el.outerHTML; return el.outerHTML;
}, },
'dl'(el, text) { dl(el, text) {
let lines = text.replace(/\n\n/g, '\n').trim().split('\n'); let lines = text
.replace(/\n\n/g, '\n')
.trim()
.split('\n');
// Add two spaces to the front of subsequent list items lines, // Add two spaces to the front of subsequent list items lines,
// or leave the line entirely blank. // or leave the line entirely blank.
lines = lines.map((l) => { lines = lines.map(l => {
const line = l.trim(); const line = l.trim();
if (line.length === 0) return ''; if (line.length === 0) return '';
...@@ -151,12 +154,15 @@ const gfmRules = { ...@@ -151,12 +154,15 @@ const gfmRules = {
// Prefixes lines with 4 spaces if the code contains triple backticks // Prefixes lines with 4 spaces if the code contains triple backticks
if (lang === '' && text.match(/^```/gm)) { if (lang === '' && text.match(/^```/gm)) {
return text.split('\n').map((l) => { return text
.split('\n')
.map(l => {
const line = l.trim(); const line = l.trim();
if (line.length === 0) return ''; if (line.length === 0) return '';
return ` ${line}`; return ` ${line}`;
}).join('\n'); })
.join('\n');
} }
return `\`\`\`${lang}\n${text}\n\`\`\``; return `\`\`\`${lang}\n${text}\n\`\`\``;
...@@ -167,11 +173,11 @@ const gfmRules = { ...@@ -167,11 +173,11 @@ const gfmRules = {
}, },
}, },
MarkdownFilter: { MarkdownFilter: {
'br'(el) { br(el) {
// Two spaces at the end of a line are turned into a BR // Two spaces at the end of a line are turned into a BR
return ' '; return ' ';
}, },
'code'(el, text) { code(el, text) {
let backtickCount = 1; let backtickCount = 1;
const backtickMatch = text.match(/`+/); const backtickMatch = text.match(/`+/);
if (backtickMatch) { if (backtickMatch) {
...@@ -183,27 +189,31 @@ const gfmRules = { ...@@ -183,27 +189,31 @@ const gfmRules = {
return backticks + spaceOrNoSpace + text.trim() + spaceOrNoSpace + backticks; return backticks + spaceOrNoSpace + text.trim() + spaceOrNoSpace + backticks;
}, },
'blockquote'(el, text) { blockquote(el, text) {
return text.trim().split('\n').map(s => `> ${s}`.trim()).join('\n'); return text
.trim()
.split('\n')
.map(s => `> ${s}`.trim())
.join('\n');
}, },
'img'(el) { img(el) {
const imageSrc = el.src; const imageSrc = el.src;
const imageUrl = imageSrc && imageSrc !== placeholderImage ? imageSrc : (el.dataset.src || ''); const imageUrl = imageSrc && imageSrc !== placeholderImage ? imageSrc : el.dataset.src || '';
return `![${el.getAttribute('alt')}](${imageUrl})`; return `![${el.getAttribute('alt')}](${imageUrl})`;
}, },
'a.anchor'(el, text) { 'a.anchor'(el, text) {
// Don't render a Markdown link for the anchor link inside a heading // Don't render a Markdown link for the anchor link inside a heading
return text; return text;
}, },
'a'(el, text) { a(el, text) {
return `[${text}](${el.getAttribute('href')})`; return `[${text}](${el.getAttribute('href')})`;
}, },
'li'(el, text) { li(el, text) {
const lines = text.trim().split('\n'); const lines = text.trim().split('\n');
const firstLine = `- ${lines.shift()}`; const firstLine = `- ${lines.shift()}`;
// Add four spaces to the front of subsequent list items lines, // Add four spaces to the front of subsequent list items lines,
// or leave the line entirely blank. // or leave the line entirely blank.
const nextLines = lines.map((s) => { const nextLines = lines.map(s => {
if (s.trim().length === 0) return ''; if (s.trim().length === 0) return '';
return ` ${s}`; return ` ${s}`;
...@@ -211,49 +221,49 @@ const gfmRules = { ...@@ -211,49 +221,49 @@ const gfmRules = {
return `${firstLine}\n${nextLines.join('\n')}`; return `${firstLine}\n${nextLines.join('\n')}`;
}, },
'ul'(el, text) { ul(el, text) {
return text; return text;
}, },
'ol'(el, text) { ol(el, text) {
// LIs get a `- ` prefix by default, which we replace by `1. ` for ordered lists. // LIs get a `- ` prefix by default, which we replace by `1. ` for ordered lists.
return text.replace(/^- /mg, '1. '); return text.replace(/^- /gm, '1. ');
}, },
'h1'(el, text) { h1(el, text) {
return `# ${text.trim()}\n`; return `# ${text.trim()}\n`;
}, },
'h2'(el, text) { h2(el, text) {
return `## ${text.trim()}\n`; return `## ${text.trim()}\n`;
}, },
'h3'(el, text) { h3(el, text) {
return `### ${text.trim()}\n`; return `### ${text.trim()}\n`;
}, },
'h4'(el, text) { h4(el, text) {
return `#### ${text.trim()}\n`; return `#### ${text.trim()}\n`;
}, },
'h5'(el, text) { h5(el, text) {
return `##### ${text.trim()}\n`; return `##### ${text.trim()}\n`;
}, },
'h6'(el, text) { h6(el, text) {
return `###### ${text.trim()}\n`; return `###### ${text.trim()}\n`;
}, },
'strong'(el, text) { strong(el, text) {
return `**${text}**`; return `**${text}**`;
}, },
'em'(el, text) { em(el, text) {
return `_${text}_`; return `_${text}_`;
}, },
'del'(el, text) { del(el, text) {
return `~~${text}~~`; return `~~${text}~~`;
}, },
'hr'(el) { hr(el) {
// extra leading \n is to ensure that there is a blank line between // extra leading \n is to ensure that there is a blank line between
// a list followed by an hr, otherwise this breaks old redcarpet rendering // a list followed by an hr, otherwise this breaks old redcarpet rendering
return '\n-----\n'; return '\n-----\n';
}, },
'p'(el, text) { p(el, text) {
return `${text.trim()}\n`; return `${text.trim()}\n`;
}, },
'table'(el) { table(el) {
const theadEl = el.querySelector('thead'); const theadEl = el.querySelector('thead');
const tbodyEl = el.querySelector('tbody'); const tbodyEl = el.querySelector('tbody');
if (!theadEl || !tbodyEl) return false; if (!theadEl || !tbodyEl) return false;
...@@ -263,8 +273,8 @@ const gfmRules = { ...@@ -263,8 +273,8 @@ const gfmRules = {
return [theadText, tbodyText].join('\n'); return [theadText, tbodyText].join('\n');
}, },
'thead'(el, text) { thead(el, text) {
const cells = _.map(el.querySelectorAll('th'), (cell) => { const cells = _.map(el.querySelectorAll('th'), cell => {
let chars = CopyAsGFM.nodeToGFM(cell).length + 2; let chars = CopyAsGFM.nodeToGFM(cell).length + 2;
let before = ''; let before = '';
...@@ -296,7 +306,7 @@ const gfmRules = { ...@@ -296,7 +306,7 @@ const gfmRules = {
return [text, separatorRow].join('\n'); return [text, separatorRow].join('\n');
}, },
'tr'(el) { tr(el) {
const cellEls = el.querySelectorAll('td, th'); const cellEls = el.querySelectorAll('td, th');
if (cellEls.length === 0) return false; if (cellEls.length === 0) return false;
...@@ -315,8 +325,12 @@ export class CopyAsGFM { ...@@ -315,8 +325,12 @@ export class CopyAsGFM {
const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent); const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent);
if (isIOS) return; if (isIOS) return;
$(document).on('copy', '.md, .wiki', (e) => { CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformGFMSelection); }); $(document).on('copy', '.md, .wiki', e => {
$(document).on('copy', 'pre.code.highlight, .diff-content .line_content', (e) => { CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformCodeSelection); }); CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformGFMSelection);
});
$(document).on('copy', 'pre.code.highlight, .diff-content .line_content', e => {
CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformCodeSelection);
});
$(document).on('paste', '.js-gfm-input', CopyAsGFM.pasteGFM); $(document).on('paste', '.js-gfm-input', CopyAsGFM.pasteGFM);
} }
...@@ -356,7 +370,7 @@ export class CopyAsGFM { ...@@ -356,7 +370,7 @@ export class CopyAsGFM {
// This will break down when the actual code block contains an uneven // This will break down when the actual code block contains an uneven
// number of backticks, but this is a rare edge case. // number of backticks, but this is a rare edge case.
const backtickMatch = textBefore.match(/`/g); const backtickMatch = textBefore.match(/`/g);
const insideCodeBlock = backtickMatch && (backtickMatch.length % 2) === 1; const insideCodeBlock = backtickMatch && backtickMatch.length % 2 === 1;
if (insideCodeBlock) { if (insideCodeBlock) {
return text; return text;
...@@ -393,7 +407,9 @@ export class CopyAsGFM { ...@@ -393,7 +407,9 @@ export class CopyAsGFM {
let lineSelector = '.line'; let lineSelector = '.line';
if (target) { if (target) {
const lineClass = ['left-side', 'right-side'].filter(name => target.classList.contains(name))[0]; const lineClass = ['left-side', 'right-side'].filter(name =>
target.classList.contains(name),
)[0];
if (lineClass) { if (lineClass) {
lineSelector = `.line_content.${lineClass} ${lineSelector}`; lineSelector = `.line_content.${lineClass} ${lineSelector}`;
} }
...@@ -436,7 +452,8 @@ export class CopyAsGFM { ...@@ -436,7 +452,8 @@ export class CopyAsGFM {
return node.textContent; return node.textContent;
} }
const respectWhitespace = respectWhitespaceParam || (node.nodeName === 'PRE' || node.nodeName === 'CODE'); const respectWhitespace =
respectWhitespaceParam || (node.nodeName === 'PRE' || node.nodeName === 'CODE');
const text = this.innerGFM(node, respectWhitespace); const text = this.innerGFM(node, respectWhitespace);
......
app/assets/javascripts/behaviors/markdown/render_math.js
View file @ 7fd4e21c
...@@ -32,7 +32,9 @@ export default function renderMath($els) { ...@@ -32,7 +32,9 @@ export default function renderMath($els) {
Promise.all([ Promise.all([
import(/* webpackChunkName: 'katex' */ 'katex'), import(/* webpackChunkName: 'katex' */ 'katex'),
import(/* webpackChunkName: 'katex' */ 'katex/dist/katex.min.css'), import(/* webpackChunkName: 'katex' */ 'katex/dist/katex.min.css'),
]).then(([katex]) => { ])
.then(([katex]) => {
renderWithKaTeX($els, katex); renderWithKaTeX($els, katex);
}).catch(() => flash(__('An error occurred while rendering KaTeX'))); })
.catch(() => flash(__('An error occurred while rendering KaTeX')));
} }
app/assets/javascripts/behaviors/markdown/render_mermaid.js
View file @ 7fd4e21c
...@@ -17,7 +17,8 @@ import flash from '~/flash'; ...@@ -17,7 +17,8 @@ import flash from '~/flash';
export default function renderMermaid($els) { export default function renderMermaid($els) {
if (!$els.length) return; if (!$els.length) return;
import(/* webpackChunkName: 'mermaid' */ 'blackst0ne-mermaid').then((mermaid) => { import(/* webpackChunkName: 'mermaid' */ 'blackst0ne-mermaid')
.then(mermaid => {
mermaid.initialize({ mermaid.initialize({
// mermaid core options // mermaid core options
mermaid: { mermaid: {
...@@ -33,7 +34,7 @@ export default function renderMermaid($els) { ...@@ -33,7 +34,7 @@ export default function renderMermaid($els) {
// Remove any extra spans added by the backend syntax highlighting. // Remove any extra spans added by the backend syntax highlighting.
Object.assign(el, { textContent: source }); Object.assign(el, { textContent: source });
mermaid.init(undefined, el, (id) => { mermaid.init(undefined, el, id => {
const svg = document.getElementById(id); const svg = document.getElementById(id);
svg.classList.add('mermaid'); svg.classList.add('mermaid');
...@@ -51,7 +52,8 @@ export default function renderMermaid($els) { ...@@ -51,7 +52,8 @@ export default function renderMermaid($els) {
svg.appendChild(sourceEl); svg.appendChild(sourceEl);
}); });
}); });
}).catch((err) => { })
.catch(err => {
flash(`Can't load mermaid module: ${err}`); flash(`Can't load mermaid module: ${err}`);
}); });
} }
app/assets/javascripts/behaviors/preview_markdown.js
View file @ 7fd4e21c
...@@ -26,7 +26,7 @@ MarkdownPreview.prototype.emptyMessage = 'Nothing to preview.'; ...@@ -26,7 +26,7 @@ MarkdownPreview.prototype.emptyMessage = 'Nothing to preview.';
MarkdownPreview.prototype.ajaxCache = {}; MarkdownPreview.prototype.ajaxCache = {};
MarkdownPreview.prototype.showPreview = function ($form) { MarkdownPreview.prototype.showPreview = function($form) {
var mdText; var mdText;
var markdownVersion; var markdownVersion;
var url; var url;
...@@ -44,7 +44,10 @@ MarkdownPreview.prototype.showPreview = function ($form) { ...@@ -44,7 +44,10 @@ MarkdownPreview.prototype.showPreview = function ($form) {
this.hideReferencedUsers($form); this.hideReferencedUsers($form);
} else { } else {
preview.addClass('md-preview-loading').text('Loading...'); preview.addClass('md-preview-loading').text('Loading...');
this.fetchMarkdownPreview(mdText, url, (function (response) { this.fetchMarkdownPreview(
mdText,
url,
function(response) {
var body; var body;
if (response.body.length > 0) { if (response.body.length > 0) {
({ body } = response); ({ body } = response);
...@@ -59,19 +62,22 @@ MarkdownPreview.prototype.showPreview = function ($form) { ...@@ -59,19 +62,22 @@ MarkdownPreview.prototype.showPreview = function ($form) {
if (response.references.commands) { if (response.references.commands) {
this.renderReferencedCommands(response.references.commands, $form); this.renderReferencedCommands(response.references.commands, $form);
} }
}).bind(this)); }.bind(this),
);
} }
}; };
MarkdownPreview.prototype.versionedPreviewPath = function (markdownPreviewPath, markdownVersion) { MarkdownPreview.prototype.versionedPreviewPath = function(markdownPreviewPath, markdownVersion) {
if (typeof markdownVersion === 'undefined') { if (typeof markdownVersion === 'undefined') {
return markdownPreviewPath; return markdownPreviewPath;
} }
return `${markdownPreviewPath}${markdownPreviewPath.indexOf('?') === -1 ? '?' : '&'}markdown_version=${markdownVersion}`; return `${markdownPreviewPath}${
markdownPreviewPath.indexOf('?') === -1 ? '?' : '&'
}markdown_version=${markdownVersion}`;
}; };
MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) { MarkdownPreview.prototype.fetchMarkdownPreview = function(text, url, success) {
if (!url) { if (!url) {
return; return;
} }
...@@ -79,7 +85,8 @@ MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) { ...@@ -79,7 +85,8 @@ MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) {
success(this.ajaxCache.response); success(this.ajaxCache.response);
return; return;
} }
axios.post(url, { axios
.post(url, {
text, text,
}) })
.then(({ data }) => { .then(({ data }) => {
...@@ -92,11 +99,11 @@ MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) { ...@@ -92,11 +99,11 @@ MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) {
.catch(() => flash(__('An error occurred while fetching markdown preview'))); .catch(() => flash(__('An error occurred while fetching markdown preview')));
}; };
MarkdownPreview.prototype.hideReferencedUsers = function ($form) { MarkdownPreview.prototype.hideReferencedUsers = function($form) {
$form.find('.referenced-users').hide(); $form.find('.referenced-users').hide();
}; };
MarkdownPreview.prototype.renderReferencedUsers = function (users, $form) { MarkdownPreview.prototype.renderReferencedUsers = function(users, $form) {
var referencedUsers; var referencedUsers;
referencedUsers = $form.find('.referenced-users'); referencedUsers = $form.find('.referenced-users');
if (referencedUsers.length) { if (referencedUsers.length) {
...@@ -109,11 +116,11 @@ MarkdownPreview.prototype.renderReferencedUsers = function (users, $form) { ...@@ -109,11 +116,11 @@ MarkdownPreview.prototype.renderReferencedUsers = function (users, $form) {
} }
}; };
MarkdownPreview.prototype.hideReferencedCommands = function ($form) { MarkdownPreview.prototype.hideReferencedCommands = function($form) {
$form.find('.referenced-commands').hide(); $form.find('.referenced-commands').hide();
}; };
MarkdownPreview.prototype.renderReferencedCommands = function (commands, $form) { MarkdownPreview.prototype.renderReferencedCommands = function(commands, $form) {
var referencedCommands; var referencedCommands;
referencedCommands = $form.find('.referenced-commands'); referencedCommands = $form.find('.referenced-commands');
if (commands.length > 0) { if (commands.length > 0) {
...@@ -132,14 +139,14 @@ writeButtonSelector = '.js-md-write-button'; ...@@ -132,14 +139,14 @@ writeButtonSelector = '.js-md-write-button';
lastTextareaPreviewed = null; lastTextareaPreviewed = null;
const markdownToolbar = $('.md-header-toolbar'); const markdownToolbar = $('.md-header-toolbar');
$.fn.setupMarkdownPreview = function () { $.fn.setupMarkdownPreview = function() {
var $form = $(this); var $form = $(this);
$form.find('textarea.markdown-area').on('input', function () { $form.find('textarea.markdown-area').on('input', function() {
markdownPreview.hideReferencedUsers($form); markdownPreview.hideReferencedUsers($form);
}); });
}; };
$(document).on('markdown-preview:show', function (e, $form) { $(document).on('markdown-preview:show', function(e, $form) {
if (!$form) { if (!$form) {
return; return;
} }
...@@ -148,8 +155,14 @@ $(document).on('markdown-preview:show', function (e, $form) { ...@@ -148,8 +155,14 @@ $(document).on('markdown-preview:show', function (e, $form) {
lastTextareaHeight = lastTextareaPreviewed.height(); lastTextareaHeight = lastTextareaPreviewed.height();
// toggle tabs // toggle tabs
$form.find(writeButtonSelector).parent().removeClass('active'); $form
$form.find(previewButtonSelector).parent().addClass('active'); .find(writeButtonSelector)
.parent()
.removeClass('active');
$form
.find(previewButtonSelector)
.parent()
.addClass('active');
// toggle content // toggle content
$form.find('.md-write-holder').hide(); $form.find('.md-write-holder').hide();
...@@ -158,7 +171,7 @@ $(document).on('markdown-preview:show', function (e, $form) { ...@@ -158,7 +171,7 @@ $(document).on('markdown-preview:show', function (e, $form) {
markdownPreview.showPreview($form); markdownPreview.showPreview($form);
}); });
$(document).on('markdown-preview:hide', function (e, $form) { $(document).on('markdown-preview:hide', function(e, $form) {
if (!$form) { if (!$form) {
return; return;
} }
...@@ -169,8 +182,14 @@ $(document).on('markdown-preview:hide', function (e, $form) { ...@@ -169,8 +182,14 @@ $(document).on('markdown-preview:hide', function (e, $form) {
} }
// toggle tabs // toggle tabs
$form.find(writeButtonSelector).parent().addClass('active'); $form
$form.find(previewButtonSelector).parent().removeClass('active'); .find(writeButtonSelector)
.parent()
.addClass('active');
$form
.find(previewButtonSelector)
.parent()
.removeClass('active');
// toggle content // toggle content
$form.find('.md-write-holder').show(); $form.find('.md-write-holder').show();
...@@ -181,7 +200,7 @@ $(document).on('markdown-preview:hide', function (e, $form) { ...@@ -181,7 +200,7 @@ $(document).on('markdown-preview:hide', function (e, $form) {
markdownPreview.hideReferencedCommands($form); markdownPreview.hideReferencedCommands($form);
}); });
$(document).on('markdown-preview:toggle', function (e, keyboardEvent) { $(document).on('markdown-preview:toggle', function(e, keyboardEvent) {
var $target; var $target;
$target = $(keyboardEvent.target); $target = $(keyboardEvent.target);
if ($target.is('textarea.markdown-area')) { if ($target.is('textarea.markdown-area')) {
...@@ -194,14 +213,14 @@ $(document).on('markdown-preview:toggle', function (e, keyboardEvent) { ...@@ -194,14 +213,14 @@ $(document).on('markdown-preview:toggle', function (e, keyboardEvent) {
} }
}); });
$(document).on('click', previewButtonSelector, function (e) { $(document).on('click', previewButtonSelector, function(e) {
var $form; var $form;
e.preventDefault(); e.preventDefault();
$form = $(this).closest('form'); $form = $(this).closest('form');
$(document).triggerHandler('markdown-preview:show', [$form]); $(document).triggerHandler('markdown-preview:show', [$form]);
}); });
$(document).on('click', writeButtonSelector, function (e) { $(document).on('click', writeButtonSelector, function(e) {
var $form; var $form;
e.preventDefault(); e.preventDefault();
$form = $(this).closest('form'); $form = $(this).closest('form');
......
app/assets/javascripts/behaviors/quick_submit.js
View file @ 7fd4e21c
...@@ -28,7 +28,7 @@ function keyCodeIs(e, keyCode) { ...@@ -28,7 +28,7 @@ function keyCodeIs(e, keyCode) {
return e.keyCode === keyCode; return e.keyCode === keyCode;
} }
$(document).on('keydown.quick_submit', '.js-quick-submit', (e) => { $(document).on('keydown.quick_submit', '.js-quick-submit', e => {
// Enter // Enter
if (!keyCodeIs(e, 13)) { if (!keyCodeIs(e, 13)) {
return; return;
...@@ -55,16 +55,17 @@ $(document).on('keydown.quick_submit', '.js-quick-submit', (e) => { ...@@ -55,16 +55,17 @@ $(document).on('keydown.quick_submit', '.js-quick-submit', (e) => {
// If the user tabs to a submit button on a `js-quick-submit` form, display a // If the user tabs to a submit button on a `js-quick-submit` form, display a
// tooltip to let them know they could've used the hotkey // tooltip to let them know they could've used the hotkey
$(document).on('keyup.quick_submit', '.js-quick-submit input[type=submit], .js-quick-submit button[type=submit]', function displayTooltip(e) { $(document).on(
'keyup.quick_submit',
'.js-quick-submit input[type=submit], .js-quick-submit button[type=submit]',
function displayTooltip(e) {
// Tab // Tab
if (!keyCodeIs(e, 9)) { if (!keyCodeIs(e, 9)) {
return; return;
} }
const $this = $(this); const $this = $(this);
const title = isMac() ? const title = isMac() ? 'You can also press ⌘-Enter' : 'You can also press Ctrl-Enter';
'You can also press ⌘-Enter' :
'You can also press Ctrl-Enter';
$this.tooltip({ $this.tooltip({
container: 'body', container: 'body',
...@@ -74,4 +75,5 @@ $(document).on('keyup.quick_submit', '.js-quick-submit input[type=submit], .js-q ...@@ -74,4 +75,5 @@ $(document).on('keyup.quick_submit', '.js-quick-submit input[type=submit], .js-q
trigger: 'manual', trigger: 'manual',
}); });
$this.tooltip('show').one('blur click', () => $this.tooltip('hide')); $this.tooltip('show').one('blur click', () => $this.tooltip('hide'));
}); },
);
app/assets/javascripts/behaviors/requires_input.js
View file @ 7fd4e21c
...@@ -18,7 +18,8 @@ import '../commons/bootstrap'; ...@@ -18,7 +18,8 @@ import '../commons/bootstrap';
$.fn.requiresInput = function requiresInput() { $.fn.requiresInput = function requiresInput() {
const $form = $(this); const $form = $(this);
const $button = $('button[type=submit], input[type=submit]', $form); const $button = $('button[type=submit], input[type=submit]', $form);
const fieldSelector = 'input[required=required], select[required=required], textarea[required=required]'; const fieldSelector =
'input[required=required], select[required=required], textarea[required=required]';
function requireInput() { function requireInput() {
// Collect the input values of *all* required fields // Collect the input values of *all* required fields
......
app/assets/javascripts/behaviors/secret_values.js
View file @ 7fd4e21c
...@@ -32,16 +32,18 @@ export default class SecretValues { ...@@ -32,16 +32,18 @@ export default class SecretValues {
updateDom(isRevealed) { updateDom(isRevealed) {
const values = this.container.querySelectorAll(this.valueSelector); const values = this.container.querySelectorAll(this.valueSelector);
values.forEach((value) => { values.forEach(value => {
value.classList.toggle('hide', !isRevealed); value.classList.toggle('hide', !isRevealed);
}); });
const placeholders = this.container.querySelectorAll(this.placeholderSelector); const placeholders = this.container.querySelectorAll(this.placeholderSelector);
placeholders.forEach((placeholder) => { placeholders.forEach(placeholder => {
placeholder.classList.toggle('hide', isRevealed); placeholder.classList.toggle('hide', isRevealed);
}); });
this.revealButton.textContent = isRevealed ? n__('Hide value', 'Hide values', values.length) : n__('Reveal value', 'Reveal values', values.length); this.revealButton.textContent = isRevealed
? n__('Hide value', 'Hide values', values.length)
: n__('Reveal value', 'Reveal values', values.length);
this.revealButton.dataset.secretRevealStatus = isRevealed; this.revealButton.dataset.secretRevealStatus = isRevealed;
} }
} }
app/assets/javascripts/behaviors/shortcuts/shortcuts.js
View file @ 7fd4e21c
...@@ -88,9 +88,11 @@ export default class Shortcuts { ...@@ -88,9 +88,11 @@ export default class Shortcuts {
return null; return null;
} }
return axios.get(gon.shortcuts_path, { return axios
.get(gon.shortcuts_path, {
responseType: 'text', responseType: 'text',
}).then(({ data }) => { })
.then(({ data }) => {
$.globalEval(data); $.globalEval(data);
if (location && location.length > 0) { if (location && location.length > 0) {
......
app/assets/javascripts/behaviors/toggler_behavior.js
View file @ 7fd4e21c
...@@ -18,9 +18,7 @@ $(() => { ...@@ -18,9 +18,7 @@ $(() => {
.toggleClass('fa-chevron-up', toggleState) .toggleClass('fa-chevron-up', toggleState)
.toggleClass('fa-chevron-down', toggleState !== undefined ? !toggleState : undefined); .toggleClass('fa-chevron-down', toggleState !== undefined ? !toggleState : undefined);
$container $container.find('.js-toggle-content').toggle(toggleState);
.find('.js-toggle-content')
.toggle(toggleState);
} }
$('body').on('click', '.js-toggle-button', function toggleButton(e) { $('body').on('click', '.js-toggle-button', function toggleButton(e) {
......
app/assets/javascripts/blob/3d_viewer/index.js
View file @ 7fd4e21c
...@@ -18,12 +18,7 @@ export default class Renderer { ...@@ -18,12 +18,7 @@ export default class Renderer {
this.loader = new STLLoader(); this.loader = new STLLoader();
this.fov = 45; this.fov = 45;
this.camera = new THREE.PerspectiveCamera( this.camera = new THREE.PerspectiveCamera(this.fov, this.width / this.height, 1, 1000);
this.fov,
this.width / this.height,
1,
1000,
);
this.scene = new THREE.Scene(); this.scene = new THREE.Scene();
...@@ -35,10 +30,7 @@ export default class Renderer { ...@@ -35,10 +30,7 @@ export default class Renderer {
this.setupLight(); this.setupLight();
// Set up OrbitControls // Set up OrbitControls
this.controls = new OrbitControls( this.controls = new OrbitControls(this.camera, this.renderer.domElement);
this.camera,
this.renderer.domElement,
);
this.controls.minDistance = 5; this.controls.minDistance = 5;
this.controls.maxDistance = 30; this.controls.maxDistance = 30;
this.controls.enableKeys = false; this.controls.enableKeys = false;
...@@ -51,47 +43,32 @@ export default class Renderer { ...@@ -51,47 +43,32 @@ export default class Renderer {
antialias: true, antialias: true,
}); });
this.renderer.setClearColor(0xFFFFFF); this.renderer.setClearColor(0xffffff);
this.renderer.setPixelRatio(window.devicePixelRatio); this.renderer.setPixelRatio(window.devicePixelRatio);
this.renderer.setSize( this.renderer.setSize(this.width, this.height);
this.width,
this.height,
);
} }
setupLight() { setupLight() {
// Point light illuminates the object // Point light illuminates the object
const pointLight = new THREE.PointLight( const pointLight = new THREE.PointLight(0xffffff, 2, 0);
0xFFFFFF,
2,
0,
);
pointLight.castShadow = true; pointLight.castShadow = true;
this.camera.add(pointLight); this.camera.add(pointLight);
// Ambient light illuminates the scene // Ambient light illuminates the scene
const ambientLight = new THREE.AmbientLight( const ambientLight = new THREE.AmbientLight(0xffffff, 1);
0xFFFFFF,
1,
);
this.scene.add(ambientLight); this.scene.add(ambientLight);
} }
setupGrid() { setupGrid() {
this.grid = new THREE.GridHelper( this.grid = new THREE.GridHelper(20, 20, 0x000000, 0x000000);
20,
20,
0x000000,
0x000000,
);
this.scene.add(this.grid); this.scene.add(this.grid);
} }
loadFile() { loadFile() {
this.loader.load(this.container.dataset.endpoint, (geo) => { this.loader.load(this.container.dataset.endpoint, geo => {
const obj = new MeshObject(geo); const obj = new MeshObject(geo);
this.objects.push(obj); this.objects.push(obj);
...@@ -116,30 +93,23 @@ export default class Renderer { ...@@ -116,30 +93,23 @@ export default class Renderer {
} }
render() { render() {
this.renderer.render( this.renderer.render(this.scene, this.camera);
this.scene,
this.camera,
);
requestAnimationFrame(this.renderWrapper); requestAnimationFrame(this.renderWrapper);
} }
changeObjectMaterials(type) { changeObjectMaterials(type) {
this.objects.forEach((obj) => { this.objects.forEach(obj => {
obj.changeMaterial(type); obj.changeMaterial(type);
}); });
} }
setDefaultCameraPosition() { setDefaultCameraPosition() {
const obj = this.objects[0]; const obj = this.objects[0];
const radius = (obj.geometry.boundingSphere.radius / 1.5); const radius = obj.geometry.boundingSphere.radius / 1.5;
const dist = radius / (Math.sin((this.fov * (Math.PI / 180)) / 2)); const dist = radius / Math.sin((this.fov * (Math.PI / 180)) / 2);
this.camera.position.set( this.camera.position.set(0, dist + 1, dist);
0,
dist + 1,
dist,
);
this.camera.lookAt(this.grid); this.camera.lookAt(this.grid);
this.controls.update(); this.controls.update();
......
app/assets/javascripts/blob/3d_viewer/mesh_object.js
View file @ 7fd4e21c
import { import { Matrix4, MeshLambertMaterial, Mesh } from 'three/build/three.module';
Matrix4,
MeshLambertMaterial,
Mesh,
} from 'three/build/three.module';
const defaultColor = 0xE24329; const defaultColor = 0xe24329;
const materials = { const materials = {
default: new MeshLambertMaterial({ default: new MeshLambertMaterial({
color: defaultColor, color: defaultColor,
...@@ -17,10 +13,7 @@ const materials = { ...@@ -17,10 +13,7 @@ const materials = {
export default class MeshObject extends Mesh { export default class MeshObject extends Mesh {
constructor(geo) { constructor(geo) {
super( super(geo, materials.default);
geo,
materials.default,
);
this.geometry.computeBoundingSphere(); this.geometry.computeBoundingSphere();
...@@ -29,13 +22,7 @@ export default class MeshObject extends Mesh { ...@@ -29,13 +22,7 @@ export default class MeshObject extends Mesh {
if (this.geometry.boundingSphere.radius > 4) { if (this.geometry.boundingSphere.radius > 4) {
const scale = 4 / this.geometry.boundingSphere.radius; const scale = 4 / this.geometry.boundingSphere.radius;
this.geometry.applyMatrix( this.geometry.applyMatrix(new Matrix4().makeScale(scale, scale, scale));
new Matrix4().makeScale(
scale,
scale,
scale,
),
);
this.geometry.computeBoundingSphere(); this.geometry.computeBoundingSphere();
this.position.x = -this.geometry.boundingSphere.center.x; this.position.x = -this.geometry.boundingSphere.center.x;
......
app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
View file @ 7fd4e21c
...@@ -42,7 +42,7 @@ class BalsamiqViewer { ...@@ -42,7 +42,7 @@ class BalsamiqViewer {
this.initDatabase(loadEvent.target.response); this.initDatabase(loadEvent.target.response);
const previews = this.getPreviews(); const previews = this.getPreviews();
previews.forEach((preview) => { previews.forEach(preview => {
const renderedPreview = this.renderPreview(preview); const renderedPreview = this.renderPreview(preview);
container.appendChild(renderedPreview); container.appendChild(renderedPreview);
......
app/assets/javascripts/blob/blob_file_dropzone.js
View file @ 7fd4e21c
...@@ -41,39 +41,45 @@ export default class BlobFileDropzone { ...@@ -41,39 +41,45 @@ export default class BlobFileDropzone {
addRemoveLinks: true, addRemoveLinks: true,
previewsContainer: '.dropzone-previews', previewsContainer: '.dropzone-previews',
headers: csrf.headers, headers: csrf.headers,
init: function () { init: function() {
this.on('addedfile', function () { this.on('addedfile', function() {
toggleLoading(submitButton, submitButtonLoadingIcon, false); toggleLoading(submitButton, submitButtonLoadingIcon, false);
dropzoneMessage.addClass(HIDDEN_CLASS); dropzoneMessage.addClass(HIDDEN_CLASS);
$('.dropzone-alerts').html('').hide(); $('.dropzone-alerts')
.html('')
.hide();
}); });
this.on('removedfile', function () { this.on('removedfile', function() {
toggleLoading(submitButton, submitButtonLoadingIcon, false); toggleLoading(submitButton, submitButtonLoadingIcon, false);
dropzoneMessage.removeClass(HIDDEN_CLASS); dropzoneMessage.removeClass(HIDDEN_CLASS);
}); });
this.on('success', function (header, response) { this.on('success', function(header, response) {
$('#modal-upload-blob').modal('hide'); $('#modal-upload-blob').modal('hide');
visitUrl(response.filePath); visitUrl(response.filePath);
}); });
this.on('maxfilesexceeded', function (file) { this.on('maxfilesexceeded', function(file) {
dropzoneMessage.addClass(HIDDEN_CLASS); dropzoneMessage.addClass(HIDDEN_CLASS);
this.removeFile(file); this.removeFile(file);
}); });
this.on('sending', function (file, xhr, formData) { this.on('sending', function(file, xhr, formData) {
formData.append('branch_name', form.find('.js-branch-name').val()); formData.append('branch_name', form.find('.js-branch-name').val());
formData.append('create_merge_request', form.find('.js-create-merge-request').val()); formData.append('create_merge_request', form.find('.js-create-merge-request').val());
formData.append('commit_message', form.find('.js-commit-message').val()); formData.append('commit_message', form.find('.js-commit-message').val());
}); });
}, },
// Override behavior of adding error underneath preview // Override behavior of adding error underneath preview
error: function (file, errorMessage) { error: function(file, errorMessage) {
const stripped = $('<div/>').html(errorMessage).text(); const stripped = $('<div/>')
$('.dropzone-alerts').html(`Error uploading file: "${stripped}"`).show(); .html(errorMessage)
.text();
$('.dropzone-alerts')
.html(`Error uploading file: "${stripped}"`)
.show();
this.removeFile(file); this.removeFile(file);
}, },
}); });
submitButton.on('click', (e) => { submitButton.on('click', e => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (dropzone[0].dropzone.getQueuedFiles().length === 0) { if (dropzone[0].dropzone.getQueuedFiles().length === 0) {
......
app/assets/javascripts/blob/blob_line_permalink_updater.js
View file @ 7fd4e21c
...@@ -2,13 +2,15 @@ import { getLocationHash } from '../lib/utils/url_utility'; ...@@ -2,13 +2,15 @@ import { getLocationHash } from '../lib/utils/url_utility';
const lineNumberRe = /^L[0-9]+/; const lineNumberRe = /^L[0-9]+/;
const updateLineNumbersOnBlobPermalinks = (linksToUpdate) => { const updateLineNumbersOnBlobPermalinks = linksToUpdate => {
const hash = getLocationHash(); const hash = getLocationHash();
if (hash && lineNumberRe.test(hash)) { if (hash && lineNumberRe.test(hash)) {
const hashUrlString = `#${hash}`; const hashUrlString = `#${hash}`;
[].concat(Array.prototype.slice.call(linksToUpdate)).forEach((permalinkButton) => { [].concat(Array.prototype.slice.call(linksToUpdate)).forEach(permalinkButton => {
const baseHref = permalinkButton.getAttribute('data-original-href') || (() => { const baseHref =
permalinkButton.getAttribute('data-original-href') ||
(() => {
const href = permalinkButton.getAttribute('href'); const href = permalinkButton.getAttribute('href');
permalinkButton.setAttribute('data-original-href', href); permalinkButton.setAttribute('data-original-href', href);
return href; return href;
...@@ -26,7 +28,7 @@ function BlobLinePermalinkUpdater(blobContentHolder, lineNumberSelector, element ...@@ -26,7 +28,7 @@ function BlobLinePermalinkUpdater(blobContentHolder, lineNumberSelector, element
}, 0); }, 0);
}; };
blobContentHolder.addEventListener('click', (e) => { blobContentHolder.addEventListener('click', e => {
if (e.target.matches(lineNumberSelector)) { if (e.target.matches(lineNumberSelector)) {
updateBlameAndBlobPermalinkCb(); updateBlameAndBlobPermalinkCb();
} }
......
app/assets/javascripts/blob/file_template_selector.js
View file @ 7fd4e21c
...@@ -45,15 +45,11 @@ export default class FileTemplateSelector { ...@@ -45,15 +45,11 @@ export default class FileTemplateSelector {
} }
renderLoading() { renderLoading() {
this.$loadingIcon this.$loadingIcon.addClass('fa-spinner fa-spin').removeClass('fa-chevron-down');
.addClass('fa-spinner fa-spin')
.removeClass('fa-chevron-down');
} }
renderLoaded() { renderLoaded() {
this.$loadingIcon this.$loadingIcon.addClass('fa-chevron-down').removeClass('fa-spinner fa-spin');
.addClass('fa-chevron-down')
.removeClass('fa-spinner fa-spin');
} }
reportSelection(options) { reportSelection(options) {
......
app/assets/javascripts/blob/notebook/index.js
View file @ 7fd4e21c
...@@ -40,13 +40,14 @@ export default () => { ...@@ -40,13 +40,14 @@ export default () => {
}, },
methods: { methods: {
loadFile() { loadFile() {
axios.get(el.dataset.endpoint) axios
.get(el.dataset.endpoint)
.then(res => res.data) .then(res => res.data)
.then((data) => { .then(data => {
this.json = data; this.json = data;
this.loading = false; this.loading = false;
}) })
.catch((e) => { .catch(e => {
if (e.status !== 200) { if (e.status !== 200) {
this.loadError = true; this.loadError = true;
} }
......
app/assets/javascripts/blob/sketch/index.js
View file @ 7fd4e21c
...@@ -13,7 +13,7 @@ export default class SketchLoader { ...@@ -13,7 +13,7 @@ export default class SketchLoader {
return this.getZipFile() return this.getZipFile()
.then(data => JSZip.loadAsync(data)) .then(data => JSZip.loadAsync(data))
.then(asyncResult => asyncResult.files['previews/preview.png'].async('uint8array')) .then(asyncResult => asyncResult.files['previews/preview.png'].async('uint8array'))
.then((content) => { .then(content => {
const url = window.URL || window.webkitURL; const url = window.URL || window.webkitURL;
const blob = new Blob([new Uint8Array(content)], { const blob = new Blob([new Uint8Array(content)], {
type: 'image/png', type: 'image/png',
......
app/assets/javascripts/blob/stl_viewer.js
View file @ 7fd4e21c
...@@ -3,8 +3,8 @@ import Renderer from './3d_viewer'; ...@@ -3,8 +3,8 @@ import Renderer from './3d_viewer';
export default () => { export default () => {
const viewer = new Renderer(document.getElementById('js-stl-viewer')); const viewer = new Renderer(document.getElementById('js-stl-viewer'));
[].slice.call(document.querySelectorAll('.js-material-changer')).forEach((el) => { [].slice.call(document.querySelectorAll('.js-material-changer')).forEach(el => {
el.addEventListener('click', (e) => { el.addEventListener('click', e => {
const { target } = e; const { target } = e;
e.preventDefault(); e.preventDefault();
......
app/assets/javascripts/blob/template_selector.js
View file @ 7fd4e21c
...@@ -81,14 +81,10 @@ export default class TemplateSelector { ...@@ -81,14 +81,10 @@ export default class TemplateSelector {
} }
startLoadingSpinner() { startLoadingSpinner() {
this.$dropdownIcon this.$dropdownIcon.addClass('fa-spinner fa-spin').removeClass('fa-chevron-down');
.addClass('fa-spinner fa-spin')
.removeClass('fa-chevron-down');
} }
stopLoadingSpinner() { stopLoadingSpinner() {
this.$dropdownIcon this.$dropdownIcon.addClass('fa-chevron-down').removeClass('fa-spinner fa-spin');
.addClass('fa-chevron-down')
.removeClass('fa-spinner fa-spin');
} }
} }
app/assets/javascripts/blob/template_selectors/license_selector.js
View file @ 7fd4e21c
...@@ -22,7 +22,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector { ...@@ -22,7 +22,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector {
search: { search: {
fields: ['name'], fields: ['name'],
}, },
clicked: (options) => { clicked: options => {
const { e } = options; const { e } = options;
const el = options.$el; const el = options.$el;
const query = options.selectedObj; const query = options.selectedObj;
......
app/assets/javascripts/blob/template_selectors/type_selector.js
View file @ 7fd4e21c
...@@ -21,5 +21,4 @@ export default class FileTemplateTypeSelector extends FileTemplateSelector { ...@@ -21,5 +21,4 @@ export default class FileTemplateTypeSelector extends FileTemplateSelector {
text: item => item.name, text: item => item.name,
}); });
} }
} }
app/assets/javascripts/blob/viewer/index.js
View file @ 7fd4e21c
...@@ -22,9 +22,8 @@ export default class BlobViewer { ...@@ -22,9 +22,8 @@ export default class BlobViewer {
const viewer = document.querySelector('.blob-viewer[data-type="rich"]'); const viewer = document.querySelector('.blob-viewer[data-type="rich"]');
if (!viewer || !viewer.dataset.richType) return; if (!viewer || !viewer.dataset.richType) return;
const initViewer = promise => promise const initViewer = promise =>
.then(module => module.default(viewer)) promise.then(module => module.default(viewer)).catch(error => {
.catch((error) => {
Flash('Error loading file viewer.'); Flash('Error loading file viewer.');
throw error; throw error;
}); });
...@@ -79,8 +78,7 @@ export default class BlobViewer { ...@@ -79,8 +78,7 @@ export default class BlobViewer {
initBindings() { initBindings() {
if (this.switcherBtns.length) { if (this.switcherBtns.length) {
Array.from(this.switcherBtns) Array.from(this.switcherBtns).forEach(el => {
.forEach((el) => {
el.addEventListener('click', this.switchViewHandler.bind(this)); el.addEventListener('click', this.switchViewHandler.bind(this));
}); });
} }
...@@ -109,7 +107,10 @@ export default class BlobViewer { ...@@ -109,7 +107,10 @@ export default class BlobViewer {
this.copySourceBtn.setAttribute('title', 'Copy source to clipboard'); this.copySourceBtn.setAttribute('title', 'Copy source to clipboard');
this.copySourceBtn.classList.remove('disabled'); this.copySourceBtn.classList.remove('disabled');
} else if (this.activeViewer === this.simpleViewer) { } else if (this.activeViewer === this.simpleViewer) {
this.copySourceBtn.setAttribute('title', 'Wait for the source to load to copy it to the clipboard'); this.copySourceBtn.setAttribute(
'title',
'Wait for the source to load to copy it to the clipboard',
);
this.copySourceBtn.classList.add('disabled'); this.copySourceBtn.classList.add('disabled');
} else { } else {
this.copySourceBtn.setAttribute('title', 'Switch to the source to copy it to the clipboard'); this.copySourceBtn.setAttribute('title', 'Switch to the source to copy it to the clipboard');
...@@ -147,7 +148,7 @@ export default class BlobViewer { ...@@ -147,7 +148,7 @@ export default class BlobViewer {
this.toggleCopyButtonState(); this.toggleCopyButtonState();
BlobViewer.loadViewer(newViewer) BlobViewer.loadViewer(newViewer)
.then((viewer) => { .then(viewer => {
$(viewer).renderGFM(); $(viewer).renderGFM();
this.$fileHolder.trigger('highlight:line'); this.$fileHolder.trigger('highlight:line');
...@@ -168,8 +169,7 @@ export default class BlobViewer { ...@@ -168,8 +169,7 @@ export default class BlobViewer {
viewer.setAttribute('data-loading', 'true'); viewer.setAttribute('data-loading', 'true');
return axios.get(url) return axios.get(url).then(({ data }) => {
.then(({ data }) => {
viewer.innerHTML = data.html; viewer.innerHTML = data.html;
viewer.setAttribute('data-loaded', 'true'); viewer.setAttribute('data-loaded', 'true');
......
app/assets/javascripts/cycle_analytics/components/banner.vue
View file @ 7fd4e21c
<script> <script>
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import iconCycleAnalyticsSplash from 'icons/_icon_cycle_analytics_splash.svg'; import iconCycleAnalyticsSplash from 'icons/_icon_cycle_analytics_splash.svg';
export default { export default {
components: { components: {
Icon, Icon,
}, },
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
this.$emit('dismiss-overview-dialog'); this.$emit('dismiss-overview-dialog');
}, },
}, },
}; };
</script> </script>
<template> <template>
<div class="landing content-block"> <div class="landing content-block">
......
app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue
View file @ 7fd4e21c
<script> <script>
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
export default { export default {
directives: { directives: {
tooltip, tooltip,
}, },
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
required: true, required: true,
}, },
}, },
}; };
</script> </script>
<template> <template>
<span <span
......
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
View file @ 7fd4e21c
<script> <script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue'; import totalTime from './total_time_component.vue';
export default { export default {
components: { components: {
userAvatarImage, userAvatarImage,
limitWarning, limitWarning,
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
default: () => ({}), default: () => ({}),
}, },
}, },
}; };
</script> </script>
<template> <template>
<div> <div>
......
app/assets/javascripts/cycle_analytics/components/stage_component.vue
View file @ 7fd4e21c
<script> <script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue'; import totalTime from './total_time_component.vue';
export default { export default {
components: { components: {
userAvatarImage, userAvatarImage,
limitWarning, limitWarning,
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
default: () => ({}), default: () => ({}),
}, },
}, },
}; };
</script> </script>
<template> <template>
<div> <div>
...@@ -73,4 +73,3 @@ ...@@ -73,4 +73,3 @@
</ul> </ul>
</div> </div>
</template> </template>
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
View file @ 7fd4e21c
<script> <script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconCommit from '../svg/icon_commit.svg'; import iconCommit from '../svg/icon_commit.svg';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue'; import totalTime from './total_time_component.vue';
export default { export default {
components: { components: {
userAvatarImage, userAvatarImage,
totalTime, totalTime,
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
return iconCommit; return iconCommit;
}, },
}, },
}; };
</script> </script>
<template> <template>
<div> <div>
...@@ -74,4 +74,3 @@ ...@@ -74,4 +74,3 @@
</ul> </ul>
</div> </div>
</template> </template>
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
View file @ 7fd4e21c
<script> <script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue'; import totalTime from './total_time_component.vue';
import icon from '../../vue_shared/components/icon.vue'; import icon from '../../vue_shared/components/icon.vue';
export default { export default {
components: { components: {
userAvatarImage, userAvatarImage,
totalTime, totalTime,
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
default: () => ({}), default: () => ({}),
}, },
}, },
}; };
</script> </script>
<template> <template>
<div> <div>
......
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
View file @ 7fd4e21c
<script> <script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconBranch from '../svg/icon_branch.svg'; import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue'; import totalTime from './total_time_component.vue';
import icon from '../../vue_shared/components/icon.vue'; import icon from '../../vue_shared/components/icon.vue';
export default { export default {
components: { components: {
userAvatarImage, userAvatarImage,
totalTime, totalTime,
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
return iconBranch; return iconBranch;
}, },
}, },
}; };
</script> </script>
<template> <template>
<div> <div>
......
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
View file @ 7fd4e21c
<script> <script>
import iconBuildStatus from '../svg/icon_build_status.svg'; import iconBuildStatus from '../svg/icon_build_status.svg';
import iconBranch from '../svg/icon_branch.svg'; import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue'; import totalTime from './total_time_component.vue';
import icon from '../../vue_shared/components/icon.vue'; import icon from '../../vue_shared/components/icon.vue';
export default { export default {
components: { components: {
totalTime, totalTime,
limitWarning, limitWarning,
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
return iconBranch; return iconBranch;
}, },
}, },
}; };
</script> </script>
<template> <template>
<div> <div>
......
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
View file @ 7fd4e21c
<script> <script>
export default { export default {
props: { props: {
time: { time: {
type: Object, type: Object,
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
return Object.keys(this.time).length; return Object.keys(this.time).length;
}, },
}, },
}; };
</script> </script>
<template> <template>
<span class="total-time"> <span class="total-time">
......
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
View file @ 7fd4e21c
...@@ -18,7 +18,8 @@ Vue.use(Translate); ...@@ -18,7 +18,8 @@ Vue.use(Translate);
export default () => { export default () => {
const OVERVIEW_DIALOG_COOKIE = 'cycle_analytics_help_dismissed'; const OVERVIEW_DIALOG_COOKIE = 'cycle_analytics_help_dismissed';
new Vue({ // eslint-disable-line no-new // eslint-disable-next-line no-new
new Vue({
el: '#cycle-analytics', el: '#cycle-analytics',
name: 'CycleAnalytics', name: 'CycleAnalytics',
components: { components: {
...@@ -66,7 +67,10 @@ export default () => { ...@@ -66,7 +67,10 @@ export default () => {
const $dropdown = $('.js-ca-dropdown'); const $dropdown = $('.js-ca-dropdown');
const $label = $dropdown.find('.dropdown-label'); const $label = $dropdown.find('.dropdown-label');
$dropdown.find('li a').off('click').on('click', (e) => { $dropdown
.find('li a')
.off('click')
.on('click', e => {
e.preventDefault(); e.preventDefault();
const $target = $(e.currentTarget); const $target = $(e.currentTarget);
this.startDate = $target.data('value'); this.startDate = $target.data('value');
...@@ -82,7 +86,7 @@ export default () => { ...@@ -82,7 +86,7 @@ export default () => {
this.service this.service
.fetchCycleAnalyticsData(fetchOptions) .fetchCycleAnalyticsData(fetchOptions)
.then((response) => { .then(response => {
this.store.setCycleAnalyticsData(response); this.store.setCycleAnalyticsData(response);
this.selectDefaultStage(); this.selectDefaultStage();
this.initDropdown(); this.initDropdown();
...@@ -115,7 +119,7 @@ export default () => { ...@@ -115,7 +119,7 @@ export default () => {
stage, stage,
startDate: this.startDate, startDate: this.startDate,
}) })
.then((response) => { .then(response => {
this.isEmptyStage = !response.events.length; this.isEmptyStage = !response.events.length;
this.store.setStageEvents(response.events, stage); this.store.setStageEvents(response.events, stage);
this.isLoadingStage = false; this.isLoadingStage = false;
......
app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
View file @ 7fd4e21c
...@@ -18,10 +18,7 @@ export default class CycleAnalyticsService { ...@@ -18,10 +18,7 @@ export default class CycleAnalyticsService {
} }
fetchStageData(options) { fetchStageData(options) {
const { const { stage, startDate } = options;
stage,
startDate,
} = options;
return this.axios return this.axios
.get(`events/${stage.name}.json`, { .get(`events/${stage.name}.json`, {
......
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js
View file @ 7fd4e21c
...@@ -5,13 +5,27 @@ import { dasherize } from '../lib/utils/text_utility'; ...@@ -5,13 +5,27 @@ import { dasherize } from '../lib/utils/text_utility';
import DEFAULT_EVENT_OBJECTS from './default_event_objects'; import DEFAULT_EVENT_OBJECTS from './default_event_objects';
const EMPTY_STAGE_TEXTS = { const EMPTY_STAGE_TEXTS = {
issue: __('The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.'), issue: __(
plan: __('The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.'), 'The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.',
code: __('The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.'), ),
test: __('The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.'), plan: __(
review: __('The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.'), 'The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.',
staging: __('The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.'), ),
production: __('The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.'), code: __(
'The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.',
),
test: __(
'The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.',
),
review: __(
'The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.',
),
staging: __(
'The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.',
),
production: __(
'The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.',
),
}; };
export default { export default {
...@@ -31,11 +45,11 @@ export default { ...@@ -31,11 +45,11 @@ export default {
newData.stages = data.stats || []; newData.stages = data.stats || [];
newData.summary = data.summary || []; newData.summary = data.summary || [];
newData.summary.forEach((item) => { newData.summary.forEach(item => {
item.value = item.value || '-'; item.value = item.value || '-';
}); });
newData.stages.forEach((item) => { newData.stages.forEach(item => {
const stageSlug = dasherize(item.name.toLowerCase()); const stageSlug = dasherize(item.name.toLowerCase());
item.active = false; item.active = false;
item.isUserAllowed = data.permissions[stageSlug]; item.isUserAllowed = data.permissions[stageSlug];
...@@ -53,7 +67,7 @@ export default { ...@@ -53,7 +67,7 @@ export default {
this.state.hasError = state; this.state.hasError = state;
}, },
deactivateAllStages() { deactivateAllStages() {
this.state.stages.forEach((stage) => { this.state.stages.forEach(stage => {
stage.active = false; stage.active = false;
}); });
}, },
...@@ -67,7 +81,7 @@ export default { ...@@ -67,7 +81,7 @@ export default {
decorateEvents(events, stage) { decorateEvents(events, stage) {
const newEvents = []; const newEvents = [];
events.forEach((item) => { events.forEach(item => {
if (!item) return; if (!item) return;
const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item); const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7