summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MacBook-Pro.local>2016-03-26 12:43:08 -0400
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-03-30 07:26:09 -0400
commit697895676f7811dd5b185aed1676dd02563f928e (patch)
tree05fc8ffcf23a701728ddb5dd1df9c935685f9a19
parent750cd5c0e0a7c8d911f44caa9bf6950b0018dee5 (diff)
downloadgitlab-ce-697895676f7811dd5b185aed1676dd02563f928e.tar.gz
User selection from collapsed sidebar
-rw-r--r--app/assets/javascripts/users_select.js.coffee17
1 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index 1ed552270a6..a25836a140a 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -17,6 +17,9 @@ class @UsersSelect
issueURL = $dropdown.data('issueUpdate')
$selectbox = $dropdown.closest('.selectbox')
$block = $selectbox.closest('.block')
+ $gutterToggle = $block
+ .closest('aside')
+ .find('.gutter-toggle')
abilityName = $dropdown.data('ability-name')
$value = $block.find('.value')
$collapsedSidebar = $block.find('.sidebar-collapsed-user')
@@ -27,6 +30,16 @@ class @UsersSelect
assignTo(@currentUser.id)
)
+ $block.on('click', '.author_link', (e) =>
+ e.preventDefault()
+ $gutterToggle
+ .trigger('click')
+ $block
+ .find('.edit-link')
+ .trigger('click')
+ $block.addClass('collapse-after-update')
+ )
+
assignTo = (selected) ->
data = {}
data[abilityName] = {}
@@ -54,6 +67,10 @@ class @UsersSelect
avatar: ''
$value.html(assigneeTemplate(user))
$collapsedSidebar.html(collapsedAssigneeTemplate(user))
+ if $block.hasClass('collapse-after-update')
+ $block.removeClass('collapse-after-update')
+ $gutterToggle.trigger('click')
+
collapsedAssigneeTemplate = _.template(
'<% if( avatar ) { %>