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
0b5e227d
Commit
0b5e227d
authored
Nov 28, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Register timetracking components locally.
parent
dec5b363
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
26 deletions
+34
-26
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
.../issuable/time_tracking/components/collapsed_state.js.es6
+4
-4
app/assets/javascripts/issuable/time_tracking/components/comparison_pane.js.es6
.../issuable/time_tracking/components/comparison_pane.js.es6
+4
-4
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js.es6
...suable/time_tracking/components/estimate_only_pane.js.es6
+4
-4
app/assets/javascripts/issuable/time_tracking/components/help_state.js.es6
...ripts/issuable/time_tracking/components/help_state.js.es6
+4
-4
app/assets/javascripts/issuable/time_tracking/components/no_tracking_pane.js.es6
...issuable/time_tracking/components/no_tracking_pane.js.es6
+4
-4
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js.es6
.../issuable/time_tracking/components/spent_only_pane.js.es6
+4
-4
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
...pts/issuable/time_tracking/components/time_tracker.js.es6
+10
-2
No files found.
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
View file @
0b5e227d
//= require lib/utils/pretty_time
//= require lib/utils/pretty_time
((
gl
) => {
((
app
) => {
const PrettyTime = gl.PrettyTime;
const PrettyTime = gl.PrettyTime;
Vue.component('time-tracking-collapsed-state',
{
app.collapsedState =
{
name: 'time-tracking-collapsed-state',
name: 'time-tracking-collapsed-state',
props: ['showComparisonState', 'showSpentOnlyState', 'showEstimateOnlyState', 'showNoTimeTrackingState', 'timeSpentHuman', 'timeEstimateHuman', 'stopwatchSvg'],
props: ['showComparisonState', 'showSpentOnlyState', 'showEstimateOnlyState', 'showNoTimeTrackingState', 'timeSpentHuman', 'timeEstimateHuman', 'stopwatchSvg'],
methods: {
methods: {
...
@@ -30,6 +30,6 @@
...
@@ -30,6 +30,6 @@
</div>
</div>
</div>
</div>
`,
`,
}
)
;
};
})(
window.gl || (window.gl
= {}));
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp
= {}));
app/assets/javascripts/issuable/time_tracking/components/comparison_pane.js.es6
View file @
0b5e227d
//= require lib/utils/pretty_time
//= require lib/utils/pretty_time
((
gl
) => {
((
app
) => {
const PrettyTime = gl.PrettyTime;
const PrettyTime = gl.PrettyTime;
Vue.component('time-tracking-comparison-pane',
{
app.comparisonPane =
{
name: 'time-tracking-comparison-pane',
name: 'time-tracking-comparison-pane',
props: ['timeSpent', 'timeEstimate', 'timeSpentHuman', 'timeEstimateHuman'],
props: ['timeSpent', 'timeEstimate', 'timeSpentHuman', 'timeEstimateHuman'],
computed: {
computed: {
...
@@ -60,5 +60,5 @@
...
@@ -60,5 +60,5 @@
</div>
</div>
</div>
</div>
`,
`,
}
)
;
};
})(
window.gl || (window.gl
= {}));
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp
= {}));
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js.es6
View file @
0b5e227d
((
gl
) => {
((
app
) => {
Vue.component('time-tracking-estimate-only-pane',
{
app.estimateOnlyPane =
{
name: 'time-tracking-estimate-only-pane',
name: 'time-tracking-estimate-only-pane',
props: ['timeEstimateHuman'],
props: ['timeEstimateHuman'],
template: `
template: `
...
@@ -8,5 +8,5 @@
...
@@ -8,5 +8,5 @@
{{ timeEstimateHuman }}
{{ timeEstimateHuman }}
</div>
</div>
`,
`,
}
)
;
};
})(
window.gl || (window.gl
= {}));
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp
= {}));
app/assets/javascripts/issuable/time_tracking/components/help_state.js.es6
View file @
0b5e227d
(() => {
((
app
) => {
Vue.component('time-tracking-help-state',
{
app.helpState =
{
name: 'time-tracking-help-state',
name: 'time-tracking-help-state',
data() {
data() {
return {
return {
...
@@ -23,5 +23,5 @@
...
@@ -23,5 +23,5 @@
</div>
</div>
</div>
</div>
`,
`,
}
)
;
};
})();
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
app/assets/javascripts/issuable/time_tracking/components/no_tracking_pane.js.es6
View file @
0b5e227d
((
gl
) => {
((
app
) => {
Vue.component('time-tracking-no-tracking-pane',
{
app.noTrackingPane =
{
name: 'time-tracking-no-tracking-pane',
name: 'time-tracking-no-tracking-pane',
template: `
template: `
<div class='time-tracking-no-tracking-pane'>
<div class='time-tracking-no-tracking-pane'>
<span class='no-value'>No estimate or time spent</span>
<span class='no-value'>No estimate or time spent</span>
</div>
</div>
`,
`,
}
)
;
};
})(
window.gl || (window.gl
= {}));
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp
= {}));
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js.es6
View file @
0b5e227d
((
gl
) => {
((
app
) => {
Vue.component('time-tracking-spent-only-pane',
{
app.spentOnlyPane =
{
name: 'time-tracking-spent-only-pane',
name: 'time-tracking-spent-only-pane',
props: ['timeSpentHuman'],
props: ['timeSpentHuman'],
template: `
template: `
...
@@ -8,5 +8,5 @@
...
@@ -8,5 +8,5 @@
{{ timeSpentHuman }}
{{ timeSpentHuman }}
</div>
</div>
`,
`,
}
)
;
};
})(
window.gl || (window.gl
= {}));
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp
= {}));
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
View file @
0b5e227d
(() => {
((
app
) => {
gl.IssuableTimeTracker = Vue.component('issuable-time-tracker', {
gl.IssuableTimeTracker = Vue.component('issuable-time-tracker', {
name: 'issuable-time-tracker',
name: 'issuable-time-tracker',
props: ['time_estimate', 'time_spent', 'human_time_estimate', 'human_time_spent', 'stopwatchSvg'],
props: ['time_estimate', 'time_spent', 'human_time_estimate', 'human_time_spent', 'stopwatchSvg'],
...
@@ -7,6 +7,14 @@
...
@@ -7,6 +7,14 @@
showHelp: false,
showHelp: false,
};
};
},
},
components: {
'time-tracking-spent-only-pane': app.spentOnlyPane,
'time-tracking-estimate-only-pane': app.estimateOnlyPane,
'time-tracking-comparison-pane': app.comparisonPane,
'time-tracking-no-tracking-pane': app.noTrackingPane,
'time-tracking-help-state': app.helpState,
'time-tracking-collapsed-state': app.collapsedState,
},
computed: {
computed: {
timeSpent() {
timeSpent() {
return this.time_spent;
return this.time_spent;
...
@@ -99,4 +107,4 @@
...
@@ -99,4 +107,4 @@
</div>
</div>
`,
`,
});
});
})();
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
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