From d2ee2eabc2a6b9037e98f3feb9d1534ebda79e19 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 10 Oct 2018 01:41:22 -0500 Subject: Prettify app/assets/javascripts/pages --- .../pages/admin/abuse_reports/abuse_reports.js | 2 +- app/assets/javascripts/pages/admin/admin.js | 15 +- .../application_settings/account_and_limits.js | 8 +- .../admin/broadcast_messages/broadcast_message.js | 36 ++-- .../jobs/index/components/stop_jobs_modal.vue | 65 +++--- .../javascripts/pages/admin/projects/index.js | 3 +- .../index/components/delete_project_modal.vue | 139 ++++++------- .../pages/admin/projects/index/index.js | 2 +- .../admin/users/components/delete_user_modal.vue | 187 ++++++++--------- app/assets/javascripts/pages/admin/users/index.js | 6 +- .../javascripts/pages/admin/users/new/index.js | 6 +- .../pages/dashboard/todos/index/todos.js | 15 +- .../shared/components/delete_milestone_modal.vue | 169 +++++++++------- .../shared/delete_milestone_modal_init.js | 16 +- .../shared/promote_milestone_modal_init.js | 16 +- app/assets/javascripts/pages/profiles/index.js | 7 +- .../pages/profiles/two_factor_auths/index.js | 4 +- .../pages/projects/branches/new/index.js | 11 +- .../pages/projects/graphs/charts/index.js | 22 +- .../pages/projects/graphs/show/index.js | 3 +- .../graphs/show/stat_graph_contributors.js | 91 +++++---- .../graphs/show/stat_graph_contributors_graph.js | 221 ++++++++++++++------- .../graphs/show/stat_graph_contributors_util.js | 64 +++--- app/assets/javascripts/pages/projects/init_blob.js | 3 +- app/assets/javascripts/pages/projects/init_form.js | 2 +- .../javascripts/pages/projects/issues/show.js | 2 +- .../labels/components/promote_label_modal.vue | 124 +++++++----- .../pages/projects/labels/index/index.js | 16 +- .../javascripts/pages/projects/network/network.js | 10 +- .../projects/pipeline_schedules/index/index.js | 22 +- .../shared/components/interval_pattern_input.vue | 102 +++++----- .../components/pipeline_schedules_callout.vue | 46 ++--- .../shared/components/target_branch_dropdown.js | 3 +- .../pipeline_schedules/shared/init_form.js | 4 +- .../pages/projects/pipelines/charts/index.js | 59 +++--- .../pages/projects/pipelines/index/index.js | 66 +++--- .../pages/projects/pipelines/init_pipelines.js | 7 +- .../components/project_feature_setting.vue | 114 ++++++----- .../permissions/components/project_setting_row.vue | 36 ++-- .../pages/projects/shared/permissions/constants.js | 6 +- .../pages/projects/shared/project_avatar.js | 5 +- .../javascripts/pages/projects/wikis/index.js | 3 +- app/assets/javascripts/pages/search/show/search.js | 25 ++- .../pages/sessions/new/signin_tabs_memoizer.js | 2 +- .../pages/sessions/new/username_validator.js | 10 +- app/assets/javascripts/pages/users/index.js | 6 +- 46 files changed, 1001 insertions(+), 780 deletions(-) diff --git a/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js b/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js index 15e737fff05..d9cf62db3f7 100644 --- a/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js +++ b/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js @@ -31,7 +31,7 @@ export default class AbuseReports { $messageCellElement.text(originalMessage); } else { $messageCellElement.data('messageTruncated', 'true'); - $messageCellElement.text(`${originalMessage.substr(0, (MAX_MESSAGE_LENGTH - 3))}...`); + $messageCellElement.text(`${originalMessage.substr(0, MAX_MESSAGE_LENGTH - 3)}...`); } } } diff --git a/app/assets/javascripts/pages/admin/admin.js b/app/assets/javascripts/pages/admin/admin.js index ff4d6ab15f9..4616a075729 100644 --- a/app/assets/javascripts/pages/admin/admin.js +++ b/app/assets/javascripts/pages/admin/admin.js @@ -23,7 +23,7 @@ export default function adminInit() { } }); - $('body').on('click', '.js-toggle-colors-link', (e) => { + $('body').on('click', '.js-toggle-colors-link', e => { e.preventDefault(); $('.js-toggle-colors-container').toggleClass('hide'); }); @@ -33,12 +33,15 @@ export default function adminInit() { $(this).tab('show'); }); - $('.log-bottom').on('click', (e) => { + $('.log-bottom').on('click', e => { e.preventDefault(); const $visibleLog = $('.file-content:visible'); - $visibleLog.animate({ - scrollTop: $visibleLog.find('ol').height(), - }, 'fast'); + $visibleLog.animate( + { + scrollTop: $visibleLog.find('ol').height(), + }, + 'fast', + ); }); $('.change-owner-link').on('click', function changeOwnerLinkClick(e) { @@ -47,7 +50,7 @@ export default function adminInit() { modal.show(); }); - $('.change-owner-cancel-link').on('click', (e) => { + $('.change-owner-cancel-link').on('click', e => { e.preventDefault(); modal.hide(); $('.change-owner-link').show(); diff --git a/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js b/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js index 7281f907ec7..455c637a6b3 100644 --- a/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js +++ b/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js @@ -1,10 +1,14 @@ import { __ } from '~/locale'; export const PLACEHOLDER_USER_EXTERNAL_DEFAULT_TRUE = __('Regex pattern'); -export const PLACEHOLDER_USER_EXTERNAL_DEFAULT_FALSE = __('To define internal users, first enable new users set to external'); +export const PLACEHOLDER_USER_EXTERNAL_DEFAULT_FALSE = __( + 'To define internal users, first enable new users set to external', +); function setUserInternalRegexPlaceholder(checkbox) { - const userInternalRegex = document.getElementById('application_setting_user_default_internal_regex'); + const userInternalRegex = document.getElementById( + 'application_setting_user_default_internal_regex', + ); if (checkbox && userInternalRegex) { if (checkbox.checked) { userInternalRegex.readOnly = false; diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js index e7ceccb6f47..d5ded3f9a79 100644 --- a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js +++ b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js @@ -17,20 +17,24 @@ export default () => { const previewPath = $('textarea#broadcast_message_message').data('previewPath'); - $('textarea#broadcast_message_message').on('input', _.debounce(function onMessageInput() { - const message = $(this).val(); - if (message === '') { - $('.js-broadcast-message-preview').text('Your message here'); - } else { - axios.post(previewPath, { - broadcast_message: { - message, - }, - }) - .then(({ data }) => { - $('.js-broadcast-message-preview').html(data.message); - }) - .catch(() => flash(__('An error occurred while rendering preview broadcast message'))); - } - }, 250)); + $('textarea#broadcast_message_message').on( + 'input', + _.debounce(function onMessageInput() { + const message = $(this).val(); + if (message === '') { + $('.js-broadcast-message-preview').text('Your message here'); + } else { + axios + .post(previewPath, { + broadcast_message: { + message, + }, + }) + .then(({ data }) => { + $('.js-broadcast-message-preview').html(data.message); + }) + .catch(() => flash(__('An error occurred while rendering preview broadcast message'))); + } + }, 250), + ); }; diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue index bc84666779e..e2fec3c7172 100644 --- a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue +++ b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue @@ -1,39 +1,42 @@