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
b6df705e
Commit
b6df705e
authored
Dec 07, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify dependency management for timetracking components.
parent
bfb5ebd6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
32 deletions
+30
-32
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
.../issuable/time_tracking/components/collapsed_state.js.es6
+3
-3
app/assets/javascripts/issuable/time_tracking/components/comparison_pane.js.es6
.../issuable/time_tracking/components/comparison_pane.js.es6
+3
-3
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js.es6
...suable/time_tracking/components/estimate_only_pane.js.es6
+3
-3
app/assets/javascripts/issuable/time_tracking/components/help_state.js.es6
...ripts/issuable/time_tracking/components/help_state.js.es6
+3
-3
app/assets/javascripts/issuable/time_tracking/components/no_tracking_pane.js.es6
...issuable/time_tracking/components/no_tracking_pane.js.es6
+3
-3
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js.es6
.../issuable/time_tracking/components/spent_only_pane.js.es6
+3
-3
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
...pts/issuable/time_tracking/components/time_tracker.js.es6
+9
-11
app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6
...cripts/issuable/time_tracking/time_tracking_bundle.js.es6
+3
-3
No files found.
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
View file @
b6df705e
...
...
@@ -3,7 +3,7 @@
(() => {
const PrettyTime = gl.PrettyTime;
gl.IssuableTimeTrackingApp.collapsedState =
{
Vue.component('time-tracking-collapsed-state',
{
name: 'time-tracking-collapsed-state',
props: [
'showComparisonState',
...
...
@@ -38,6 +38,6 @@
</div>
</div>
`,
};
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
}
)
;
})();
app/assets/javascripts/issuable/time_tracking/components/comparison_pane.js.es6
View file @
b6df705e
...
...
@@ -3,7 +3,7 @@
(() => {
const PrettyTime = gl.PrettyTime;
gl.IssuableTimeTrackingApp.comparisonPane =
{
Vue.component('time-tracking-comparison-pane',
{
name: 'time-tracking-comparison-pane',
props: [
'timeSpent',
...
...
@@ -65,5 +65,5 @@
</div>
</div>
`,
};
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
}
)
;
})();
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js.es6
View file @
b6df705e
(() => {
gl.IssuableTimeTrackingApp.estimateOnlyPane =
{
Vue.component('time-tracking-estimate-only-pane',
{
name: 'time-tracking-estimate-only-pane',
props: ['timeEstimateHuman'],
template: `
...
...
@@ -8,5 +8,5 @@
{{ timeEstimateHuman }}
</div>
`,
};
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
}
)
;
})();
app/assets/javascripts/issuable/time_tracking/components/help_state.js.es6
View file @
b6df705e
(() => {
gl.IssuableTimeTrackingApp.helpState =
{
Vue.component('time-tracking-help-state',
{
name: 'time-tracking-help-state',
props: ['docsUrl'],
template: `
...
...
@@ -19,5 +19,5 @@
</div>
</div>
`,
};
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
}
)
;
})();
app/assets/javascripts/issuable/time_tracking/components/no_tracking_pane.js.es6
View file @
b6df705e
(() => {
gl.IssuableTimeTrackingApp.noTrackingPane =
{
Vue.component('time-tracking-no-tracking-pane',
{
name: 'time-tracking-no-tracking-pane',
template: `
<div class='time-tracking-no-tracking-pane'>
<span class='no-value'>No estimate or time spent</span>
</div>
`,
};
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
}
)
;
})();
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js.es6
View file @
b6df705e
(() => {
gl.IssuableTimeTrackingApp.spentOnlyPane =
{
Vue.component('time-tracking-spent-only-pane',
{
name: 'time-tracking-spent-only-pane',
props: ['timeSpentHuman'],
template: `
...
...
@@ -8,5 +8,5 @@
{{ timeSpentHuman }}
</div>
`,
};
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
}
)
;
})();
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
View file @
b6df705e
//= require ./help_state
//= require ./collapsed_state
//= require ./spent_only_pane
//= require ./no_tracking_pane
//= require ./estimate_only_pane
//= require ./comparison_pane
(() => {
const app = gl.IssuableTimeTrackingApp;
gl.IssuableTimeTracker = Vue.component('issuable-time-tracker', {
Vue.component('issuable-time-tracker', {
name: 'issuable-time-tracker',
props: [
'time_estimate',
...
...
@@ -19,14 +25,6 @@
timeSpentHuman: this.human_time_spent,
};
},
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: {
hasTimeSpent() {
return !!this.timeSpent;
...
...
@@ -108,4 +106,4 @@
</div>
`,
});
})(
gl.IssuableTimeTrackingApp || (gl.IssuableTimeTrackingApp = {})
);
})();
app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6
View file @
b6df705e
/* eslint-disable */
//= require vue
//= require
_directory ./components
//= require
./components/time_tracker
//= require smart_interval
//= require subbable_resource
(() => {
/* This Vue instance represents what will become the parent instance for the
* sidebar. It will be responsible for managing `issuable` state and propagating
* changes to sidebar components.
* changes to sidebar components. We will want to create a separate service to
* interface with the server at that point.
*/
class IssuableTimeTracking {
...
...
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