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
Jérome Perrin
gitlab-ce
Commits
57731bbc
Commit
57731bbc
authored
May 04, 2017
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better name for zeroData - use insteaf importing Vue
parent
05c409d2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
app/assets/javascripts/issue_show/actions/tasks.js
app/assets/javascripts/issue_show/actions/tasks.js
+7
-7
app/assets/javascripts/issue_show/issue_title_description.vue
...assets/javascripts/issue_show/issue_title_description.vue
+1
-2
No files found.
app/assets/javascripts/issue_show/actions/tasks.js
View file @
57731bbc
...
@@ -2,25 +2,25 @@ export default (apiData, tasks) => {
...
@@ -2,25 +2,25 @@ export default (apiData, tasks) => {
const
$tasks
=
$
(
'
#task_status
'
);
const
$tasks
=
$
(
'
#task_status
'
);
const
$tasksShort
=
$
(
'
#task_status_short
'
);
const
$tasksShort
=
$
(
'
#task_status_short
'
);
const
$issueableHeader
=
$
(
'
.issuable-header
'
);
const
$issueableHeader
=
$
(
'
.issuable-header
'
);
const
zeroData
=
{
api
:
null
,
tasks
:
null
};
const
tasksStates
=
{
api
:
null
,
tasks
:
null
};
if
(
$tasks
.
length
===
0
)
{
if
(
$tasks
.
length
===
0
)
{
if
(
!
(
apiData
.
task_status
.
indexOf
(
'
0 of 0
'
)
>
=
0
))
{
if
(
!
(
apiData
.
task_status
.
indexOf
(
'
0 of 0
'
)
==
=
0
))
{
$issueableHeader
.
append
(
`<span id="task_status">
${
apiData
.
task_status
}
</span>`
);
$issueableHeader
.
append
(
`<span id="task_status">
${
apiData
.
task_status
}
</span>`
);
}
else
{
}
else
{
$issueableHeader
.
append
(
'
<span id="task_status"></span>
'
);
$issueableHeader
.
append
(
'
<span id="task_status"></span>
'
);
}
}
}
else
{
}
else
{
zeroData
.
api
=
apiData
.
task_status
.
indexOf
(
'
0 of 0
'
)
>
=
0
;
tasksStates
.
api
=
apiData
.
task_status
.
indexOf
(
'
0 of 0
'
)
==
=
0
;
zeroData
.
tasks
=
tasks
.
indexOf
(
'
0 of 0
'
)
>
=
0
;
tasksStates
.
tasks
=
tasks
.
indexOf
(
'
0 of 0
'
)
==
=
0
;
}
}
if
(
$tasks
&&
!
zeroData
.
api
)
{
if
(
$tasks
&&
!
tasksStates
.
api
)
{
$tasks
.
text
(
apiData
.
task_status
);
$tasks
.
text
(
apiData
.
task_status
);
$tasksShort
.
text
(
apiData
.
task_status
);
$tasksShort
.
text
(
apiData
.
task_status
);
}
else
if
(
zeroData
.
tasks
)
{
}
else
if
(
tasksStates
.
tasks
)
{
$issueableHeader
.
append
(
`<span id="task_status">
${
apiData
.
task_status
}
</span>`
);
$issueableHeader
.
append
(
`<span id="task_status">
${
apiData
.
task_status
}
</span>`
);
}
else
if
(
zeroData
.
api
)
{
}
else
if
(
tasksStates
.
api
)
{
$tasks
.
remove
();
$tasks
.
remove
();
$tasksShort
.
remove
();
$tasksShort
.
remove
();
}
}
...
...
app/assets/javascripts/issue_show/issue_title_description.vue
View file @
57731bbc
<
script
>
<
script
>
import
Vue
from
'
vue
'
;
import
Visibility
from
'
visibilityjs
'
;
import
Visibility
from
'
visibilityjs
'
;
import
Poll
from
'
./../lib/utils/poll
'
;
import
Poll
from
'
./../lib/utils/poll
'
;
import
Service
from
'
./services/index
'
;
import
Service
from
'
./services/index
'
;
...
@@ -91,7 +90,7 @@ export default {
...
@@ -91,7 +90,7 @@ export default {
this
.
description
=
description
;
this
.
description
=
description
;
this
.
setTabTitle
();
this
.
setTabTitle
();
Vue
.
nextTick
(()
=>
{
this
.
$
nextTick
(()
=>
{
elementsToVisualize
.
forEach
((
element
)
=>
{
elementsToVisualize
.
forEach
((
element
)
=>
{
if
(
element
)
{
if
(
element
)
{
element
.
classList
.
remove
(
'
issue-realtime-pre-pulse
'
);
element
.
classList
.
remove
(
'
issue-realtime-pre-pulse
'
);
...
...
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