Commit f35d3a24 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'fix-static-analysis-visual_review_toolbar' into 'master'

Exclude preexisting lint issues for i18n

Closes #63223

See merge request gitlab-org/gitlab-ce!29649
parents 6dc4bc44 1e9fd7ad
...@@ -18,6 +18,7 @@ const resetCommentBox = () => { ...@@ -18,6 +18,7 @@ const resetCommentBox = () => {
const commentBox = selectCommentBox(); const commentBox = selectCommentBox();
const commentButton = selectCommentButton(); const commentButton = selectCommentButton();
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
commentButton.innerText = 'Send feedback'; commentButton.innerText = 'Send feedback';
commentButton.classList.replace('gitlab-button-secondary', 'gitlab-button-success'); commentButton.classList.replace('gitlab-button-secondary', 'gitlab-button-success');
commentButton.style.opacity = 1; commentButton.style.opacity = 1;
...@@ -43,7 +44,9 @@ const confirmAndClear = mergeRequestId => { ...@@ -43,7 +44,9 @@ const confirmAndClear = mergeRequestId => {
const commentButton = selectCommentButton(); const commentButton = selectCommentButton();
const currentNote = selectNote(); const currentNote = selectNote();
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
commentButton.innerText = 'Feedback sent'; commentButton.innerText = 'Feedback sent';
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
currentNote.innerText = `Your comment was successfully posted to merge request #${mergeRequestId}`; currentNote.innerText = `Your comment was successfully posted to merge request #${mergeRequestId}`;
setTimeout(resetComment, 2000); setTimeout(resetComment, 2000);
}; };
...@@ -52,6 +55,7 @@ const setInProgressState = () => { ...@@ -52,6 +55,7 @@ const setInProgressState = () => {
const commentButton = selectCommentButton(); const commentButton = selectCommentButton();
const commentBox = selectCommentBox(); const commentBox = selectCommentBox();
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
commentButton.innerText = 'Sending feedback'; commentButton.innerText = 'Sending feedback';
commentButton.classList.replace('gitlab-button-success', 'gitlab-button-secondary'); commentButton.classList.replace('gitlab-button-success', 'gitlab-button-secondary');
commentButton.style.opacity = 0.5; commentButton.style.opacity = 0.5;
...@@ -79,6 +83,7 @@ const postComment = ({ ...@@ -79,6 +83,7 @@ const postComment = ({
const commentText = selectCommentBox().value.trim(); const commentText = selectCommentBox().value.trim();
if (!commentText) { if (!commentText) {
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
postError('Your comment appears to be empty.', COMMENT_BOX); postError('Your comment appears to be empty.', COMMENT_BOX);
resetCommentBox(); resetCommentBox();
return; return;
......
...@@ -40,6 +40,7 @@ const authorizeUser = state => { ...@@ -40,6 +40,7 @@ const authorizeUser = state => {
const token = selectToken().value; const token = selectToken().value;
if (!token) { if (!token) {
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
postError('Please enter your token.', TOKEN_BOX); postError('Please enter your token.', TOKEN_BOX);
return; return;
} }
......
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
} from './constants'; } from './constants';
// this style must be applied inline in a handful of components // this style must be applied inline in a handful of components
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
const buttonClearStyles = ` const buttonClearStyles = `
-webkit-appearance: none; -webkit-appearance: none;
`; `;
......
...@@ -15,6 +15,7 @@ const state = { ...@@ -15,6 +15,7 @@ const state = {
// adapted from https://developer.mozilla.org/en-US/docs/Web/API/Window/navigator#Example_2_Browser_detect_and_return_an_index // adapted from https://developer.mozilla.org/en-US/docs/Web/API/Window/navigator#Example_2_Browser_detect_and_return_an_index
const getBrowserId = sUsrAg => { const getBrowserId = sUsrAg => {
/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
const aKeys = ['MSIE', 'Edge', 'Firefox', 'Safari', 'Chrome', 'Opera']; const aKeys = ['MSIE', 'Edge', 'Firefox', 'Safari', 'Chrome', 'Opera'];
let nIdx = aKeys.length - 1; let nIdx = aKeys.length - 1;
......
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