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
175fc75f
Commit
175fc75f
authored
Feb 14, 2020
by
Shubham Pandey
Committed by
Martin Wortschack
Feb 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[UPDATE] Migrating `fa-spinner` from `app/views/shared/notifications`
parent
1ea6cbbb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/notifications_form.js
app/assets/javascripts/notifications_form.js
+3
-3
app/views/shared/notifications/_custom_notifications.html.haml
...iews/shared/notifications/_custom_notifications.html.haml
+1
-1
No files found.
app/assets/javascripts/notifications_form.js
View file @
175fc75f
...
@@ -26,7 +26,7 @@ export default class NotificationsForm {
...
@@ -26,7 +26,7 @@ export default class NotificationsForm {
.
addClass
(
'
is-loading
'
)
.
addClass
(
'
is-loading
'
)
.
find
(
'
.custom-notification-event-loading
'
)
.
find
(
'
.custom-notification-event-loading
'
)
.
removeClass
(
'
fa-check
'
)
.
removeClass
(
'
fa-check
'
)
.
addClass
(
'
fa-spin fa-spinner
'
)
.
addClass
(
'
spinner align-middle
'
)
.
removeClass
(
'
is-done
'
);
.
removeClass
(
'
is-done
'
);
}
}
...
@@ -41,12 +41,12 @@ export default class NotificationsForm {
...
@@ -41,12 +41,12 @@ export default class NotificationsForm {
if
(
data
.
saved
)
{
if
(
data
.
saved
)
{
$parent
$parent
.
find
(
'
.custom-notification-event-loading
'
)
.
find
(
'
.custom-notification-event-loading
'
)
.
toggleClass
(
'
fa-spin fa-spinner fa-check is-don
e
'
);
.
toggleClass
(
'
spinner fa-check is-done align-middl
e
'
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
$parent
$parent
.
removeClass
(
'
is-loading
'
)
.
removeClass
(
'
is-loading
'
)
.
find
(
'
.custom-notification-event-loading
'
)
.
find
(
'
.custom-notification-event-loading
'
)
.
toggleClass
(
'
fa-spin fa-spinner fa-check is-don
e
'
);
.
toggleClass
(
'
spinner fa-check is-done align-middl
e
'
);
},
2000
);
},
2000
);
}
}
})
})
...
...
app/views/shared/notifications/_custom_notifications.html.haml
View file @
175fc75f
...
@@ -30,4 +30,4 @@
...
@@ -30,4 +30,4 @@
%label
.form-check-label
{
for:
field_id
}
%label
.form-check-label
{
for:
field_id
}
%strong
%strong
=
notification_event_name
(
event
)
=
notification_event_name
(
event
)
=
icon
(
"spinner spin"
,
class:
"custom-notification-event-loading"
)
.fa.custom-notification-event-loading.spinner
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