BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
83446ce7
Commit
83446ce7
authored
Jun 17, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug with clicking custom again not opening modal
parent
fd15e814
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
notifications_dropdown.js.coffee
app/assets/javascripts/notifications_dropdown.js.coffee
+3
-0
_notification_dropdown.html.haml
...ews/shared/notifications/_notification_dropdown.html.haml
+1
-1
No files found.
app/assets/javascripts/notifications_dropdown.js.coffee
View file @
83446ce7
...
...
@@ -4,6 +4,9 @@ class @NotificationsDropdown
.
off
'click'
,
'.update-notification'
.
on
'click'
,
'.update-notification'
,
(
e
)
->
e
.
preventDefault
()
return
if
$
(
this
).
is
(
'.is-active'
)
and
$
(
this
).
data
(
'notification-level'
)
is
'custom'
notificationLevel
=
$
(
@
).
data
'notification-level'
label
=
$
(
@
).
data
'notification-title'
form
=
$
(
this
).
parents
(
'form:first'
)
...
...
app/views/shared/notifications/_notification_dropdown.html.haml
View file @
83446ce7
...
...
@@ -8,6 +8,6 @@
%li
.divider
%li
%a
.update-notification
{
href:
"#"
,
role:
"button"
,
data:
{
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
notification_level:
"custom"
,
notification_title:
"Custom"
}
}
%a
.update-notification
{
href:
"#"
,
role:
"button"
,
class:
(
"is-active"
if
notification_setting
.
level
==
"custom"
),
data:
{
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
notification_level:
"custom"
,
notification_title:
"Custom"
}
}
%strong
.dropdown-menu-inner-title
Custom
%span
.dropdown-menu-inner-content
=
notification_description
(
"custom"
)
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