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
a59f2369
Commit
a59f2369
authored
Jul 21, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: camelCase component names.
parent
0b4a3d84
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
69 additions
and
67 deletions
+69
-67
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+6
-6
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+21
-21
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+8
-8
app/assets/javascripts/notes/components/issue_note_body.vue
app/assets/javascripts/notes/components/issue_note_body.vue
+6
-6
app/assets/javascripts/notes/components/issue_note_edited_text.vue
...s/javascripts/notes/components/issue_note_edited_text.vue
+2
-2
app/assets/javascripts/notes/components/issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+2
-2
app/assets/javascripts/notes/components/issue_note_header.vue
...assets/javascripts/notes/components/issue_note_header.vue
+2
-2
app/assets/javascripts/notes/components/issue_notes.vue
app/assets/javascripts/notes/components/issue_notes.vue
+16
-16
app/assets/javascripts/notes/components/issue_system_note.vue
...assets/javascripts/notes/components/issue_system_note.vue
+2
-2
app/assets/javascripts/notes/index.js
app/assets/javascripts/notes/index.js
+4
-2
No files found.
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
a59f2369
<
script
>
<
script
>
/* global Flash */
/* global Flash */
import
U
serAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
u
serAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
M
arkdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
m
arkdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
I
ssueNoteSignedOutWidget
from
'
./issue_note_signed_out_widget.vue
'
;
import
i
ssueNoteSignedOutWidget
from
'
./issue_note_signed_out_widget.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
export
default
{
export
default
{
...
@@ -22,9 +22,9 @@ export default {
...
@@ -22,9 +22,9 @@ export default {
};
};
},
},
components
:
{
components
:
{
U
serAvatarLink
,
u
serAvatarLink
,
M
arkdownField
,
m
arkdownField
,
I
ssueNoteSignedOutWidget
,
i
ssueNoteSignedOutWidget
,
},
},
computed
:
{
computed
:
{
isLoggedIn
()
{
isLoggedIn
()
{
...
...
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
a59f2369
<
script
>
<
script
>
/* global Flash */
/* global Flash */
import
I
ssueNote
from
'
./issue_note.vue
'
;
import
i
ssueNote
from
'
./issue_note.vue
'
;
import
U
serAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
u
serAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
I
ssueNoteHeader
from
'
./issue_note_header.vue
'
;
import
i
ssueNoteHeader
from
'
./issue_note_header.vue
'
;
import
I
ssueNoteActions
from
'
./issue_note_actions.vue
'
;
import
i
ssueNoteActions
from
'
./issue_note_actions.vue
'
;
import
I
ssueNoteSignedOutWidget
from
'
./issue_note_signed_out_widget.vue
'
;
import
i
ssueNoteSignedOutWidget
from
'
./issue_note_signed_out_widget.vue
'
;
import
I
ssueNoteEditedText
from
'
./issue_note_edited_text.vue
'
;
import
i
ssueNoteEditedText
from
'
./issue_note_edited_text.vue
'
;
import
I
ssueNoteForm
from
'
./issue_note_form.vue
'
;
import
i
ssueNoteForm
from
'
./issue_note_form.vue
'
;
import
P
laceholderNote
from
'
./issue_placeholder_note.vue
'
;
import
p
laceholderNote
from
'
./issue_placeholder_note.vue
'
;
import
P
laceholderSystemNote
from
'
./issue_placeholder_system_note.vue
'
;
import
p
laceholderSystemNote
from
'
./issue_placeholder_system_note.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -36,26 +36,26 @@ export default {
...
@@ -36,26 +36,26 @@ export default {
},
},
},
},
components
:
{
components
:
{
I
ssueNote
,
i
ssueNote
,
U
serAvatarLink
,
u
serAvatarLink
,
I
ssueNoteHeader
,
i
ssueNoteHeader
,
I
ssueNoteActions
,
i
ssueNoteActions
,
IssueNoteEditedTex
t
,
issueNoteSignedOutWidge
t
,
IssueNoteSignedOutWidge
t
,
issueNoteEditedTex
t
,
I
ssueNoteForm
,
i
ssueNoteForm
,
P
laceholderNote
,
p
laceholderNote
,
P
laceholderSystemNote
,
p
laceholderSystemNote
,
},
},
methods
:
{
methods
:
{
componentName
(
note
)
{
componentName
(
note
)
{
if
(
note
.
isPlaceholderNote
)
{
if
(
note
.
isPlaceholderNote
)
{
if
(
note
.
placeholderType
===
'
systemNote
'
)
{
if
(
note
.
placeholderType
===
'
systemNote
'
)
{
return
P
laceholderSystemNote
;
return
p
laceholderSystemNote
;
}
}
return
P
laceholderNote
;
return
p
laceholderNote
;
}
}
return
I
ssueNote
;
return
i
ssueNote
;
},
},
componentData
(
note
)
{
componentData
(
note
)
{
return
note
.
isPlaceholderNote
?
note
.
notes
[
0
]
:
note
;
return
note
.
isPlaceholderNote
?
note
.
notes
[
0
]
:
note
;
...
...
app/assets/javascripts/notes/components/issue_note.vue
View file @
a59f2369
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
/* global Flash */
/* global Flash */
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
U
serAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
u
serAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
I
ssueNoteHeader
from
'
./issue_note_header.vue
'
;
import
i
ssueNoteHeader
from
'
./issue_note_header.vue
'
;
import
I
ssueNoteActions
from
'
./issue_note_actions.vue
'
;
import
i
ssueNoteActions
from
'
./issue_note_actions.vue
'
;
import
I
ssueNoteBody
from
'
./issue_note_body.vue
'
;
import
i
ssueNoteBody
from
'
./issue_note_body.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
export
default
{
export
default
{
...
@@ -22,10 +22,10 @@ export default {
...
@@ -22,10 +22,10 @@ export default {
};
};
},
},
components
:
{
components
:
{
U
serAvatarLink
,
u
serAvatarLink
,
I
ssueNoteHeader
,
i
ssueNoteHeader
,
I
ssueNoteActions
,
i
ssueNoteActions
,
I
ssueNoteBody
,
i
ssueNoteBody
,
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
...
...
app/assets/javascripts/notes/components/issue_note_body.vue
View file @
a59f2369
<
script
>
<
script
>
import
I
ssueNoteEditedText
from
'
./issue_note_edited_text.vue
'
;
import
i
ssueNoteEditedText
from
'
./issue_note_edited_text.vue
'
;
import
I
ssueNoteAwardsList
from
'
./issue_note_awards_list.vue
'
;
import
i
ssueNoteAwardsList
from
'
./issue_note_awards_list.vue
'
;
import
I
ssueNoteForm
from
'
./issue_note_form.vue
'
;
import
i
ssueNoteForm
from
'
./issue_note_form.vue
'
;
import
TaskList
from
'
../../task_list
'
;
import
TaskList
from
'
../../task_list
'
;
export
default
{
export
default
{
...
@@ -34,9 +34,9 @@ export default {
...
@@ -34,9 +34,9 @@ export default {
},
},
},
},
components
:
{
components
:
{
I
ssueNoteEditedText
,
i
ssueNoteEditedText
,
I
ssueNoteAwardsList
,
i
ssueNoteAwardsList
,
I
ssueNoteForm
,
i
ssueNoteForm
,
},
},
methods
:
{
methods
:
{
renderGFM
()
{
renderGFM
()
{
...
...
app/assets/javascripts/notes/components/issue_note_edited_text.vue
View file @
a59f2369
<
script
>
<
script
>
import
T
imeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
import
t
imeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -22,7 +22,7 @@ export default {
...
@@ -22,7 +22,7 @@ export default {
},
},
},
},
components
:
{
components
:
{
T
imeAgoTooltip
,
t
imeAgoTooltip
,
},
},
};
};
</
script
>
</
script
>
...
...
app/assets/javascripts/notes/components/issue_note_form.vue
View file @
a59f2369
<
script
>
<
script
>
import
M
arkdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
m
arkdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
export
default
{
export
default
{
...
@@ -46,7 +46,7 @@ export default {
...
@@ -46,7 +46,7 @@ export default {
},
},
},
},
components
:
{
components
:
{
M
arkdownField
,
m
arkdownField
,
},
},
methods
:
{
methods
:
{
handleUpdate
()
{
handleUpdate
()
{
...
...
app/assets/javascripts/notes/components/issue_note_header.vue
View file @
a59f2369
<
script
>
<
script
>
import
T
imeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
import
t
imeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -36,7 +36,7 @@ export default {
...
@@ -36,7 +36,7 @@ export default {
},
},
},
},
components
:
{
components
:
{
T
imeAgoTooltip
,
t
imeAgoTooltip
,
},
},
data
()
{
data
()
{
return
{
return
{
...
...
app/assets/javascripts/notes/components/issue_notes.vue
View file @
a59f2369
...
@@ -6,12 +6,12 @@ import Vuex from 'vuex';
...
@@ -6,12 +6,12 @@ import Vuex from 'vuex';
import
VueResource
from
'
vue-resource
'
;
import
VueResource
from
'
vue-resource
'
;
import
storeOptions
from
'
../stores/issue_notes_store
'
;
import
storeOptions
from
'
../stores/issue_notes_store
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
import
I
ssueNote
from
'
./issue_note.vue
'
;
import
i
ssueNote
from
'
./issue_note.vue
'
;
import
I
ssueDiscussion
from
'
./issue_discussion.vue
'
;
import
i
ssueDiscussion
from
'
./issue_discussion.vue
'
;
import
I
ssueSystemNote
from
'
./issue_system_note.vue
'
;
import
i
ssueSystemNote
from
'
./issue_system_note.vue
'
;
import
I
ssueCommentForm
from
'
./issue_comment_form.vue
'
;
import
i
ssueCommentForm
from
'
./issue_comment_form.vue
'
;
import
P
laceholderNote
from
'
./issue_placeholder_note.vue
'
;
import
p
laceholderNote
from
'
./issue_placeholder_note.vue
'
;
import
P
laceholderSystemNote
from
'
./issue_placeholder_system_note.vue
'
;
import
p
laceholderSystemNote
from
'
./issue_placeholder_system_note.vue
'
;
Vue
.
use
(
Vuex
);
Vue
.
use
(
Vuex
);
Vue
.
use
(
VueResource
);
Vue
.
use
(
VueResource
);
...
@@ -26,12 +26,12 @@ export default {
...
@@ -26,12 +26,12 @@ export default {
};
};
},
},
components
:
{
components
:
{
I
ssueNote
,
i
ssueNote
,
I
ssueDiscussion
,
i
ssueDiscussion
,
I
ssueSystemNote
,
i
ssueSystemNote
,
I
ssueCommentForm
,
i
ssueCommentForm
,
P
laceholderNote
,
p
laceholderNote
,
P
laceholderSystemNote
,
p
laceholderSystemNote
,
},
},
computed
:
{
computed
:
{
...
Vuex
.
mapGetters
([
...
Vuex
.
mapGetters
([
...
@@ -43,14 +43,14 @@ export default {
...
@@ -43,14 +43,14 @@ export default {
componentName
(
note
)
{
componentName
(
note
)
{
if
(
note
.
isPlaceholderNote
)
{
if
(
note
.
isPlaceholderNote
)
{
if
(
note
.
placeholderType
===
'
systemNote
'
)
{
if
(
note
.
placeholderType
===
'
systemNote
'
)
{
return
P
laceholderSystemNote
;
return
p
laceholderSystemNote
;
}
}
return
P
laceholderNote
;
return
p
laceholderNote
;
}
else
if
(
note
.
individual_note
)
{
}
else
if
(
note
.
individual_note
)
{
return
note
.
notes
[
0
].
system
?
IssueSystemNote
:
I
ssueNote
;
return
note
.
notes
[
0
].
system
?
issueSystemNote
:
i
ssueNote
;
}
}
return
I
ssueDiscussion
;
return
i
ssueDiscussion
;
},
},
componentData
(
note
)
{
componentData
(
note
)
{
return
note
.
individual_note
?
note
.
notes
[
0
]
:
note
;
return
note
.
individual_note
?
note
.
notes
[
0
]
:
note
;
...
...
app/assets/javascripts/notes/components/issue_system_note.vue
View file @
a59f2369
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
iconsMap
from
'
./issue_note_icons
'
;
import
iconsMap
from
'
./issue_note_icons
'
;
import
I
ssueNoteHeader
from
'
./issue_note_header.vue
'
;
import
i
ssueNoteHeader
from
'
./issue_note_header.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -16,7 +16,7 @@ export default {
...
@@ -16,7 +16,7 @@ export default {
};
};
},
},
components
:
{
components
:
{
I
ssueNoteHeader
,
i
ssueNoteHeader
,
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
...
...
app/assets/javascripts/notes/index.js
View file @
a59f2369
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
I
ssueNotes
from
'
./components/issue_notes.vue
'
;
import
i
ssueNotes
from
'
./components/issue_notes.vue
'
;
import
'
../vue_shared/vue_resource_interceptor
'
;
import
'
../vue_shared/vue_resource_interceptor
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
vm
=
new
Vue
({
const
vm
=
new
Vue
({
el
:
'
#js-notes
'
,
el
:
'
#js-notes
'
,
components
:
{
IssueNotes
},
components
:
{
issueNotes
},
template
:
`
template
:
`
<issue-notes ref="notes" />
<issue-notes ref="notes" />
`
,
`
,
...
...
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