summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-27 20:01:47 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-27 20:01:47 +0200
commit01441f544ecd32d6a820d2908413ff0cb6ff1245 (patch)
treeed0c247004bec74b0c167cd8624660028647ac5f
parent367d4db4cd335cfa3145f7cc501b82ce63d0adb4 (diff)
parent93e8a0563da89a59e35a876788d0a8bd442640da (diff)
downloadgitlab-ce-01441f544ecd32d6a820d2908413ff0cb6ff1245.tar.gz
Merge pull request #8120 from cirosantilli/profile-js-only-needed
Only run profile js on pages that need it
-rw-r--r--app/assets/javascripts/dispatcher.js.coffee4
-rw-r--r--app/assets/javascripts/profile.js.coffee45
-rw-r--r--app/assets/javascripts/user.js.coffee3
3 files changed, 29 insertions, 23 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index fb0560dba49..d3e595ae7b2 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -76,6 +76,8 @@ class Dispatcher
# Ensure we don't create a particular shortcut handler here. This is
# already created, where the network graph is created.
shortcut_handler = true
+ when 'users:show'
+ new User()
switch path.first()
when 'admin'
@@ -85,6 +87,8 @@ class Dispatcher
new NamespaceSelect()
when 'dashboard'
shortcut_handler = new ShortcutsDashboardNavigation()
+ when 'profiles'
+ new Profile()
when 'projects'
new Project()
switch path[1]
diff --git a/app/assets/javascripts/profile.js.coffee b/app/assets/javascripts/profile.js.coffee
index 0e99921f899..de356fbec77 100644
--- a/app/assets/javascripts/profile.js.coffee
+++ b/app/assets/javascripts/profile.js.coffee
@@ -1,30 +1,29 @@
-$ ->
- $('.edit_user .application-theme input, .edit_user .code-preview-theme input').click ->
- # Submit the form
- $('.edit_user').submit()
+class @Profile
+ constructor: ->
+ $('.edit_user .application-theme input, .edit_user .code-preview-theme input').click ->
+ # Submit the form
+ $('.edit_user').submit()
- new Flash("Appearance settings saved", "notice")
+ new Flash("Appearance settings saved", "notice")
- $('.update-username form').on 'ajax:before', ->
- $('.loading-gif').show()
- $(this).find('.update-success').hide()
- $(this).find('.update-failed').hide()
+ $('.update-username form').on 'ajax:before', ->
+ $('.loading-gif').show()
+ $(this).find('.update-success').hide()
+ $(this).find('.update-failed').hide()
- $('.update-username form').on 'ajax:complete', ->
- $(this).find('.btn-save').enableButton()
- $(this).find('.loading-gif').hide()
+ $('.update-username form').on 'ajax:complete', ->
+ $(this).find('.btn-save').enableButton()
+ $(this).find('.loading-gif').hide()
- $('.update-notifications').on 'ajax:complete', ->
- $(this).find('.btn-save').enableButton()
+ $('.update-notifications').on 'ajax:complete', ->
+ $(this).find('.btn-save').enableButton()
- $('.js-choose-user-avatar-button').bind "click", ->
- form = $(this).closest("form")
- form.find(".js-user-avatar-input").click()
+ $('.js-choose-user-avatar-button').bind "click", ->
+ form = $(this).closest("form")
+ form.find(".js-user-avatar-input").click()
- $('.js-user-avatar-input').bind "change", ->
- form = $(this).closest("form")
- filename = $(this).val().replace(/^.*[\\\/]/, '')
- form.find(".js-avatar-filename").text(filename)
-
- $('.profile-groups-avatars').tooltip("placement": "top")
+ $('.js-user-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/user.js.coffee b/app/assets/javascripts/user.js.coffee
new file mode 100644
index 00000000000..8a2e2421c2e
--- /dev/null
+++ b/app/assets/javascripts/user.js.coffee
@@ -0,0 +1,3 @@
+class @User
+ constructor: ->
+ $('.profile-groups-avatars').tooltip("placement": "top")