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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
17617a32
Commit
17617a32
authored
May 22, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved value into computed property
Changed jQuery selector into document.querySelector [ci skip]
parent
7a21e26f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
app/assets/javascripts/issue_show/components/fields/description_template.vue
...pts/issue_show/components/fields/description_template.vue
+7
-2
app/assets/javascripts/issue_show/components/form.vue
app/assets/javascripts/issue_show/components/form.vue
+1
-4
app/assets/javascripts/issue_show/index.js
app/assets/javascripts/issue_show/index.js
+1
-0
No files found.
app/assets/javascripts/issue_show/components/fields/description_template.vue
View file @
17617a32
...
@@ -19,9 +19,14 @@
...
@@ -19,9 +19,14 @@
required
:
true
,
required
:
true
,
},
},
},
},
computed
:
{
issuableTemplatesJson
()
{
return
JSON
.
stringify
(
this
.
issuableTemplates
);
},
},
mounted
()
{
mounted
()
{
// Create the editor for the template
// Create the editor for the template
const
editor
=
$
(
'
.detail-page-description .note-textarea
'
);
const
editor
=
document
.
querySelector
(
'
.detail-page-description .note-textarea
'
);
editor
.
setValue
=
(
val
)
=>
{
editor
.
setValue
=
(
val
)
=>
{
this
.
formState
.
description
=
val
;
this
.
formState
.
description
=
val
;
};
};
...
@@ -48,7 +53,7 @@
...
@@ -48,7 +53,7 @@
data-toggle=
"dropdown"
data-toggle=
"dropdown"
:data-namespace-path=
"projectNamespace"
:data-namespace-path=
"projectNamespace"
:data-project-path=
"projectPath"
:data-project-path=
"projectPath"
:data-data=
"
JSON.stringify(issuableTemplates)
"
>
:data-data=
"
issuableTemplatesJson
"
>
<span
class=
"dropdown-toggle-text"
>
<span
class=
"dropdown-toggle-text"
>
Choose a template
Choose a template
</span>
</span>
...
...
app/assets/javascripts/issue_show/components/form.vue
View file @
17617a32
...
@@ -2,11 +2,8 @@
...
@@ -2,11 +2,8 @@
import
titleField
from
'
./fields/title.vue
'
;
import
titleField
from
'
./fields/title.vue
'
;
import
descriptionField
from
'
./fields/description.vue
'
;
import
descriptionField
from
'
./fields/description.vue
'
;
import
editActions
from
'
./edit_actions.vue
'
;
import
editActions
from
'
./edit_actions.vue
'
;
<<<<<<<
HEAD
import
descriptionTemplate
from
'
./fields/description_template.vue
'
;
import
descriptionTemplate
from
'
./fields/description_template.vue
'
;
=======
import
projectMove
from
'
./fields/project_move.vue
'
;
import
projectMove
from
'
./fields/project_move.vue
'
;
>>>>>>>
issue
-
edit
-
inline
import
confidentialCheckbox
from
'
./fields/confidential_checkbox.vue
'
;
import
confidentialCheckbox
from
'
./fields/confidential_checkbox.vue
'
;
export
default
{
export
default
{
...
@@ -59,7 +56,7 @@
...
@@ -59,7 +56,7 @@
},
},
computed
:
{
computed
:
{
hasIssuableTemplates
()
{
hasIssuableTemplates
()
{
return
this
.
issuableTemplates
.
length
!==
0
;
return
this
.
issuableTemplates
.
length
;
},
},
},
},
};
};
...
...
app/assets/javascripts/issue_show/index.js
View file @
17617a32
...
@@ -49,6 +49,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -49,6 +49,7 @@ document.addEventListener('DOMContentLoaded', () => {
projectPath
:
initialData
.
project_path
,
projectPath
:
initialData
.
project_path
,
projectNamespace
:
initialData
.
namespace_path
,
projectNamespace
:
initialData
.
namespace_path
,
projectsAutocompleteUrl
,
projectsAutocompleteUrl
,
issuableTemplates
:
initialData
.
templates
,
};
};
},
},
render
(
createElement
)
{
render
(
createElement
)
{
...
...
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