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
1dae4367
Commit
1dae4367
authored
Dec 08, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move camelCased props to computed, to fix mutation propagation.
parent
2fd57321
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
19 deletions
+25
-19
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
.../issuable/time_tracking/components/collapsed_state.js.es6
+1
-3
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
...pts/issuable/time_tracking/components/time_tracker.js.es6
+24
-16
No files found.
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
View file @
1dae4367
//= require lib/utils/pretty_time
(() => {
const PrettyTime = gl.PrettyTime;
Vue.component('time-tracking-collapsed-state', {
name: 'time-tracking-collapsed-state',
props: [
...
...
@@ -16,7 +14,7 @@
],
methods: {
abbreviateTime(timeStr) {
return PrettyTime.abbreviateTime(timeStr);
return
gl.
PrettyTime.abbreviateTime(timeStr);
},
},
template: `
...
...
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
View file @
1dae4367
...
...
@@ -19,13 +19,21 @@
data() {
return {
showHelp: false,
timeSpent: this.time_spent,
timeEstimate: this.time_estimate,
timeEstimateHuman: this.human_time_estimate,
timeSpentHuman: this.human_time_spent,
};
},
computed: {
timeSpent() {
return this.time_spent;
},
timeEstimate() {
return this.time_estimate;
},
timeEstimateHuman() {
return this.human_time_estimate;
},
timeSpentHuman() {
return this.human_time_spent;
},
hasTimeSpent() {
return !!this.timeSpent;
},
...
...
@@ -56,12 +64,12 @@
template: `
<div class='time_tracker time-tracking-component-wrap' v-cloak>
<time-tracking-collapsed-state
:show
ComparisonS
tate='showComparisonState'
:show
HelpS
tate='showHelpState'
:show
SpentOnlyS
tate='showSpentOnlyState'
:show
EstimateOnlyS
tate='showEstimateOnlyState'
:time
SpentH
uman='timeSpentHuman'
:time
EstimateH
uman='timeEstimateHuman'
:show
-comparison-s
tate='showComparisonState'
:show
-help-s
tate='showHelpState'
:show
-spent-only-s
tate='showSpentOnlyState'
:show
-estimate-only-s
tate='showEstimateOnlyState'
:time
-spent-h
uman='timeSpentHuman'
:time
-estimate-h
uman='timeEstimateHuman'
:stopwatch-svg='stopwatchSvg'>
</time-tracking-collapsed-state>
<div class='title hide-collapsed'>
...
...
@@ -80,21 +88,21 @@
<div class='time-tracking-content hide-collapsed'>
<time-tracking-estimate-only-pane
v-if='showEstimateOnlyState'
:time
EstimateH
uman='timeEstimateHuman'>
:time
-estimate-h
uman='timeEstimateHuman'>
</time-tracking-estimate-only-pane>
<time-tracking-spent-only-pane
v-if='showSpentOnlyState'
:time
SpentH
uman='timeSpentHuman'>
:time
-spent-h
uman='timeSpentHuman'>
</time-tracking-spent-only-pane>
<time-tracking-no-tracking-pane
v-if='showNoTimeTrackingState'>
</time-tracking-no-tracking-pane>
<time-tracking-comparison-pane
v-if='showComparisonState'
:time
E
stimate='timeEstimate'
:time
S
pent='timeSpent'
:time
SpentH
uman='timeSpentHuman'
:time
EstimateH
uman='timeEstimateHuman'>
:time
-e
stimate='timeEstimate'
:time
-s
pent='timeSpent'
:time
-spent-h
uman='timeSpentHuman'
:time
-estimate-h
uman='timeEstimateHuman'>
</time-tracking-comparison-pane>
<transition name='help-state-toggle'>
<time-tracking-help-state
...
...
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