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
a9186d07
Commit
a9186d07
authored
Apr 06, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed close button text
parent
5200686b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/javascripts/comment_type_toggle.js
app/assets/javascripts/comment_type_toggle.js
+4
-0
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+3
-3
app/views/shared/_comment_type_toggle.html.haml
app/views/shared/_comment_type_toggle.html.haml
+0
-0
No files found.
app/assets/javascripts/comment_type_toggle.js
View file @
a9186d07
...
...
@@ -25,6 +25,10 @@ class CommentTypeToggle {
inputSetterConfig
.
push
({
input
:
this
.
secondaryButton
,
valueAttribute
:
'
data-secondary-button-text
'
,
},
{
input
:
this
.
secondaryButton
,
valueAttribute
:
'
data-secondary-button-text
'
,
inputAttribute
:
'
data-alternative-text
'
,
});
}
...
...
app/assets/javascripts/notes.js
View file @
a9186d07
...
...
@@ -149,9 +149,9 @@ require('./task_list');
this
.
commentTypeToggle
=
new
CommentTypeToggle
(
form
.
querySelector
(
'
.js-comment-type-dropdown .dropdown-toggle
'
),
form
.
querySelector
(
'
.js-comment-type-dropdown .dropdown-menu
'
),
document
.
querySelector
(
'
.
timeline-conten
t-form #note_type
'
),
document
.
querySelector
(
'
.
js-main-targe
t-form #note_type
'
),
form
.
querySelector
(
'
.js-comment-type-dropdown .js-comment-submit-button
'
),
document
.
querySelector
(
'
.js-note-target-close
'
),
document
.
querySelector
(
'
.js-
main-target-form .js-
note-target-close
'
),
);
this
.
commentTypeToggle
.
initDroplab
();
...
...
@@ -949,7 +949,7 @@ require('./task_list');
discardbtn
=
form
.
find
(
'
.js-note-discard
'
);
if
(
textarea
.
val
().
trim
().
length
>
0
)
{
reopentext
=
reopenbtn
.
data
(
'
alternative-text
'
);
closetext
=
closebtn
.
data
(
'
alternative-text
'
);
closetext
=
closebtn
.
attr
(
'
data-
alternative-text
'
);
if
(
reopenbtn
.
text
()
!==
reopentext
)
{
reopenbtn
.
text
(
reopentext
);
}
...
...
app/views/shared/_comment_type_toggle.html.haml
deleted
100644 → 0
View file @
5200686b
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