diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-12-07 19:49:24 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-12-07 19:49:24 +0300 |
commit | 420328d79e53c95d4aea3a098fe066aa43a25114 (patch) | |
tree | 58f01396aa1652c7e674421006ee9e346f3bf0e8 /app/assets/javascripts | |
parent | 621a2c2d6c91990154fb1f8c5885caa9c9f9a93a (diff) | |
parent | 75496059a1c36c2139bf29fa20fd4370c511fdd1 (diff) |
Merge branch '51243-further-improvements-to-project-overview-ui' into 'master'
Resolve "Further improvements to Project overview UI"
Closes #51243
See merge request gitlab-org/gitlab-ce!22196
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/notifications_dropdown.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/project.js | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/notifications_dropdown.js b/app/assets/javascripts/notifications_dropdown.js index c4c8cf86cb0..e7fa05faa8a 100644 --- a/app/assets/javascripts/notifications_dropdown.js +++ b/app/assets/javascripts/notifications_dropdown.js @@ -12,6 +12,10 @@ export default function notificationsDropdown() { const form = $(this).parents('.notification-form:first'); form.find('.js-notification-loading').toggleClass('fa-bell fa-spin fa-spinner'); + if (form.hasClass('no-label')) { + form.find('.js-notification-loading').toggleClass('hidden'); + form.find('.js-notifications-icon').toggleClass('hidden'); + } form.find('#notification_setting_level').val(notificationLevel); form.submit(); }); diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js index a6bee49a6b1..b288989b252 100644 --- a/app/assets/javascripts/pages/projects/project.js +++ b/app/assets/javascripts/pages/projects/project.js @@ -13,6 +13,9 @@ export default class Project { const $cloneOptions = $('ul.clone-options-dropdown'); const $projectCloneField = $('#project_clone'); const $cloneBtnLabel = $('.js-git-clone-holder .js-clone-dropdown-label'); + const mobileCloneField = document.querySelector( + '.js-mobile-git-clone .js-clone-dropdown-label', + ); const selectedCloneOption = $cloneBtnLabel.text().trim(); if (selectedCloneOption.length > 0) { @@ -36,7 +39,11 @@ export default class Project { $label.text(activeText); }); - $projectCloneField.val(url); + if (mobileCloneField) { + mobileCloneField.dataset.clipboardText = url; + } else { + $projectCloneField.val(url); + } $('.js-git-empty .js-clone').text(url); }); // Ref switcher |