Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
93e8a056
Commit
93e8a056
authored
Oct 21, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only run profile js on pages that need it
parent
72abe9f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
23 deletions
+29
-23
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+4
-0
app/assets/javascripts/profile.js.coffee
app/assets/javascripts/profile.js.coffee
+22
-23
app/assets/javascripts/user.js.coffee
app/assets/javascripts/user.js.coffee
+3
-0
No files found.
app/assets/javascripts/dispatcher.js.coffee
View file @
93e8a056
...
@@ -79,11 +79,15 @@ class Dispatcher
...
@@ -79,11 +79,15 @@ class Dispatcher
# Ensure we don't create a particular shortcut handler here. This is
# Ensure we don't create a particular shortcut handler here. This is
# already created, where the network graph is created.
# already created, where the network graph is created.
shortcut_handler
=
true
shortcut_handler
=
true
when
'users:show'
new
User
()
switch
path
.
first
()
switch
path
.
first
()
when
'admin'
then
new
Admin
()
when
'admin'
then
new
Admin
()
when
'dashboard'
when
'dashboard'
shortcut_handler
=
new
ShortcutsDashboardNavigation
()
shortcut_handler
=
new
ShortcutsDashboardNavigation
()
when
'profiles'
new
Profile
()
when
'projects'
when
'projects'
switch
path
[
1
]
switch
path
[
1
]
when
'wikis'
when
'wikis'
...
...
app/assets/javascripts/profile.js.coffee
View file @
93e8a056
$
->
class
@
Profile
$
(
'.edit_user .application-theme input, .edit_user .code-preview-theme input'
).
click
->
constructor
:
->
# Submit the form
$
(
'.edit_user .application-theme input, .edit_user .code-preview-theme input'
).
click
->
$
(
'.edit_user'
).
submit
()
# Submit the form
$
(
'.edit_user'
).
submit
()
new
Flash
(
"Appearance settings saved"
,
"notice"
)
new
Flash
(
"Appearance settings saved"
,
"notice"
)
$
(
'.update-username form'
).
on
'ajax:before'
,
->
$
(
'.update-username form'
).
on
'ajax:before'
,
->
$
(
'.loading-gif'
).
show
()
$
(
'.loading-gif'
).
show
()
$
(
this
).
find
(
'.update-success'
).
hide
()
$
(
this
).
find
(
'.update-success'
).
hide
()
$
(
this
).
find
(
'.update-failed'
).
hide
()
$
(
this
).
find
(
'.update-failed'
).
hide
()
$
(
'.update-username form'
).
on
'ajax:complete'
,
->
$
(
'.update-username form'
).
on
'ajax:complete'
,
->
$
(
this
).
find
(
'.btn-save'
).
enableButton
()
$
(
this
).
find
(
'.btn-save'
).
enableButton
()
$
(
this
).
find
(
'.loading-gif'
).
hide
()
$
(
this
).
find
(
'.loading-gif'
).
hide
()
$
(
'.update-notifications'
).
on
'ajax:complete'
,
->
$
(
'.update-notifications'
).
on
'ajax:complete'
,
->
$
(
this
).
find
(
'.btn-save'
).
enableButton
()
$
(
this
).
find
(
'.btn-save'
).
enableButton
()
$
(
'.js-choose-user-avatar-button'
).
bind
"click"
,
->
$
(
'.js-choose-user-avatar-button'
).
bind
"click"
,
->
form
=
$
(
this
).
closest
(
"form"
)
form
=
$
(
this
).
closest
(
"form"
)
form
.
find
(
".js-user-avatar-input"
).
click
()
form
.
find
(
".js-user-avatar-input"
).
click
()
$
(
'.js-user-avatar-input'
).
bind
"change"
,
->
$
(
'.js-user-avatar-input'
).
bind
"change"
,
->
form
=
$
(
this
).
closest
(
"form"
)
form
=
$
(
this
).
closest
(
"form"
)
filename
=
$
(
this
).
val
().
replace
(
/^.*[\\\/]/
,
''
)
filename
=
$
(
this
).
val
().
replace
(
/^.*[\\\/]/
,
''
)
form
.
find
(
".js-avatar-filename"
).
text
(
filename
)
form
.
find
(
".js-avatar-filename"
).
text
(
filename
)
$
(
'.profile-groups-avatars'
).
tooltip
(
"placement"
:
"top"
)
app/assets/javascripts/user.js.coffee
0 → 100644
View file @
93e8a056
class
@
User
constructor
:
->
$
(
'.profile-groups-avatars'
).
tooltip
(
"placement"
:
"top"
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment