diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-21 01:57:17 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 12:15:26 +0300 |
| commit | b9e7f6d1186ca9cd8cebb88af3305d396ef2bc60 (patch) | |
| tree | 356f0c70cc80c902e2838d59b9d79ed790f648e8 | |
| parent | e853f0670e82b9eb4def4e28afb76649abbe879f (diff) | |
Merge branch 'sidebar-clipboard-toggle' into 'master'
Prevent toggling sidebar when clipboard icon clicked.
Prevents sidebar being toggle when copy to clipboard icon clicked.
Fixes #19399
See merge request !5326
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/right_sidebar.js.coffee | 3 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 49b994638d4..bbfac51eff8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -134,6 +134,7 @@ v 8.10.0 (unreleased) - Fix issues importing projects from EE to CE - Fix creating group with space in group path - Improve cron_jobs loading error messages !5318 / !5360 + - Prevent toggling sidebar when clipboard icon clicked - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska) - Limit the number of retries on error to 3 for exporting projects - Allow empty repositories on project import/export diff --git a/app/assets/javascripts/right_sidebar.js.coffee b/app/assets/javascripts/right_sidebar.js.coffee index 12340bbce54..0c95301e380 100644 --- a/app/assets/javascripts/right_sidebar.js.coffee +++ b/app/assets/javascripts/right_sidebar.js.coffee @@ -120,6 +120,9 @@ class @Sidebar i.show() sidebarCollapseClicked: (e) -> + + return if $(e.currentTarget).hasClass('dont-change-state') + sidebar = e.data e.preventDefault() $block = $(@).closest('.block') diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e020a7d4d00..8e2fcbdfab8 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -156,7 +156,7 @@ - project_ref = cross_project_reference(@project, issuable) .block.project-reference - .sidebar-collapsed-icon + .sidebar-collapsed-icon.dont-change-state = clipboard_button(clipboard_text: project_ref) .cross-project-reference.hide-collapsed %span |