diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-10-23 12:07:45 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-10-23 12:07:45 +0200 |
| commit | e80ef19b310ee4057f6227c4b906d97fbec63683 (patch) | |
| tree | 1a52eaeca247bc0581d4df74df20097eb0bbb111 | |
| parent | e6e5e63c29c0456c174e76a9275084d05cb71fa6 (diff) | |
| parent | 38670a663c30ed2fb2b10ac51d5d6bc56b4101a3 (diff) | |
| download | gitlab-ce-e80ef19b310ee4057f6227c4b906d97fbec63683.tar.gz | |
Merge pull request #8114 from cirosantilli/rm-global-avatar-js
Only run avatar chooser Js on pages that need it
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/group_avatar.js.coffee | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/groups.js.coffee | 11 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 00b52758fa8..61f272fda30 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -67,6 +67,8 @@ class Dispatcher new TeamMembers() when 'groups:members' new GroupMembers() + when 'groups:new', 'groups:edit', 'admin:groups:edit' + new GroupAvatar() when 'projects:tree:show' new TreeView() shortcut_handler = new ShortcutsNavigation() diff --git a/app/assets/javascripts/group_avatar.js.coffee b/app/assets/javascripts/group_avatar.js.coffee new file mode 100644 index 00000000000..0825fd3ce52 --- /dev/null +++ b/app/assets/javascripts/group_avatar.js.coffee @@ -0,0 +1,9 @@ +class @GroupAvatar + constructor: -> + $('.js-choose-group-avatar-button').bind "click", -> + form = $(this).closest("form") + form.find(".js-group-avatar-input").click() + $('.js-group-avatar-input').bind "change", -> + form = $(this).closest("form") + filename = $(this).val().replace(/^.*[\\\/]/, '') + form.find(".js-avatar-filename").text(filename) diff --git a/app/assets/javascripts/groups.js.coffee b/app/assets/javascripts/groups.js.coffee index 90122044248..cc905e91ea2 100644 --- a/app/assets/javascripts/groups.js.coffee +++ b/app/assets/javascripts/groups.js.coffee @@ -2,14 +2,3 @@ class @GroupMembers constructor: -> $('li.group_member').bind 'ajax:success', -> $(this).fadeOut() - -$ -> - # avatar - $('.js-choose-group-avatar-button').bind "click", -> - form = $(this).closest("form") - form.find(".js-group-avatar-input").click() - - $('.js-group-avatar-input').bind "change", -> - form = $(this).closest("form") - filename = $(this).val().replace(/^.*[\\\/]/, '') - form.find(".js-avatar-filename").text(filename) |