Skip to content

Commit 2c7ae95

Browse files
charlesh88charlesh88
committed
Merge branch 'open1182' into open1193
2 parents 2c81b72 + 41a160f commit 2c7ae95

File tree

10 files changed

+294
-178
lines changed

10 files changed

+294
-178
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Differences between the two APIs include a move away from a declarative system o
1717
## Building and Running Open MCT Locally
1818

1919
Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
20+
(These instructions assume you are installing as a non-root user; developers have [reported issues](https://github.com/nasa/openmct/issues/1151) running these steps with root privileges.)
2021

2122
1. Clone the source code
2223

‎app.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,10 @@
6767
});
6868

6969
app.use('/proxyUrl', function proxyRequest(req, res, next) {
70-
var targetUrl = req.query.url;
71-
var queryParameters = req.query;
72-
console.log('Proxying request to: ', targetUrl);
73-
delete queryParameters['url'];
70+
console.log('Proxying request to: ', req.query.url);
7471
req.pipe(request({
75-
url: targetUrl,
76-
strictSSL: false,
77-
qs: queryParameters
72+
url: req.query.url,
73+
strictSSL: false
7874
}).on('error', next)).pipe(res);
7975
});
8076

‎gulpfile.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ gulp.task('stylesheets', function () {
103103
.pipe(gulp.dest(__dirname));
104104
});
105105

106-
gulp.task('nsp', function (done) {
107-
var nsp = require('gulp-nsp');
108-
nsp({package: __dirname + '/package.json'}, done);
109-
});
110-
111106
gulp.task('lint', function () {
112107
var nonspecs = paths.specs.map(function (glob) {
113108
return "!" + glob;
@@ -157,6 +152,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']);
157152

158153
gulp.task('install', [ 'static', 'scripts' ]);
159154

160-
gulp.task('verify', [ 'lint', 'test', 'checkstyle', 'nsp' ]);
155+
gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
161156

162157
gulp.task('build', [ 'verify', 'install' ]);

‎package.json

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"gulp-jscs": "^3.0.2",
1616
"gulp-jshint": "^2.0.0",
1717
"gulp-jshint-html-reporter": "^0.1.3",
18-
"gulp-nsp": "^2.4.2",
1918
"gulp-rename": "^1.2.2",
2019
"gulp-replace-task": "^0.11.0",
2120
"gulp-requirejs-optimize": "^0.3.1",

‎platform/features/conductor-v2/conductor/bundle.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ define([
2424
"./src/ui/TimeConductorViewService",
2525
"./src/ui/TimeConductorController",
2626
"./src/TimeConductor",
27+
"./src/ui/ConductorAxisController",
2728
"./src/ui/MctConductorAxis",
2829
"./src/ui/NumberFormat",
2930
"text!./res/templates/time-conductor.html",
3031
"text!./res/templates/mode-selector/mode-selector.html",
3132
"text!./res/templates/mode-selector/mode-menu.html",
32-
'legacyRegistry'
33+
"legacyRegistry"
3334
], function (
3435
TimeConductorViewService,
3536
TimeConductorController,
3637
TimeConductor,
38+
ConductorAxisController,
3739
MCTConductorAxis,
3840
NumberFormat,
3941
timeConductorTemplate,
@@ -69,6 +71,14 @@ define([
6971
"timeConductorViewService",
7072
"timeSystems[]"
7173
]
74+
},
75+
{
76+
"key": "ConductorAxisController",
77+
"implementation": ConductorAxisController,
78+
"depends": [
79+
"timeConductor",
80+
"formatService"
81+
]
7282
}
7383
],
7484
"directives": [

‎platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss

+4
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
bottom: 0;
138138
left: 0;
139139
z-index: 1;
140+
pointer-events: none;
140141
.l-time-range-w {
141142
// Wraps a datetime text input field
142143
height: 100%;
@@ -160,6 +161,9 @@
160161
content: 'End';
161162
}
162163
}
164+
.l-time-conductor-inputs {
165+
pointer-events: auto;
166+
}
163167
input[type="text"] {
164168
@include trans-prop-nice(padding, 250ms);
165169
}

‎platform/features/conductor-v2/conductor/res/templates/time-conductor.html

+71-55
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
<!-- Parent holder for time conductor. follow-mode | fixed-mode -->
2+
<style>
3+
.fixed-mode .l-axis-holder {
4+
cursor: grab;
5+
cursor: -webkit-grab;
6+
}
7+
8+
.fixed-mode .l-axis-holder:active {
9+
cursor: grabbing;
10+
cursor: -webkit-grabbing;
11+
}
12+
</style>
213
<div ng-controller="TimeConductorController as tcController"
3-
class="holder grows flex-elem l-flex-row l-time-conductor {{modeModel.selectedKey}}-mode {{timeSystemModel.selected.metadata.key}}-time-system">
14+
class="holder grows flex-elem l-flex-row l-time-conductor {{modeModel.selectedKey}}-mode {{timeSystemModel.selected.metadata.key}}-time-system"
15+
ng-class="{'status-panning': panning}">
416

517
<div class="flex-elem holder time-conductor-icon">
618
<div class="hand-little"></div>
@@ -13,63 +25,67 @@
1325
<form class="l-time-conductor-inputs-holder"
1426
ng-submit="tcController.updateBoundsFromForm(boundsModel)">
1527
<span class="l-time-range-w start-w">
16-
<span class="l-time-range-input-w start-date">
17-
<span class="title"></span>
18-
<mct-control key="'datetime-field'"
19-
structure="{
20-
format: timeSystemModel.format,
21-
validate: tcController.validation.validateStart
22-
}"
23-
ng-model="boundsModel"
24-
ng-blur="tcController.updateBoundsFromForm(boundsModel)"
25-
field="'start'"
26-
class="time-range-input">
27-
</mct-control>
28-
</span>
29-
<span class="l-time-range-input-w time-delta start-delta"
30-
ng-class="{'hide':(modeModel.selectedKey === 'fixed')}">
31-
-
32-
<mct-control key="'datetime-field'"
33-
structure="{
34-
format: timeSystemModel.deltaFormat,
35-
validate: tcController.validation.validateStartDelta
36-
}"
37-
ng-model="boundsModel"
38-
ng-blur="tcController.updateDeltasFromForm(boundsModel)"
39-
field="'startDelta'"
40-
class="hrs-min-input">
41-
</mct-control>
28+
<span class="l-time-conductor-inputs">
29+
<span class="l-time-range-input-w start-date">
30+
<span class="title"></span>
31+
<mct-control key="'datetime-field'"
32+
structure="{
33+
format: timeSystemModel.format,
34+
validate: tcController.validation.validateStart
35+
}"
36+
ng-model="boundsModel"
37+
ng-blur="tcController.updateBoundsFromForm(boundsModel)"
38+
field="'start'"
39+
class="time-range-input">
40+
</mct-control>
41+
</span>
42+
<span class="l-time-range-input-w time-delta start-delta"
43+
ng-class="{'hide':(modeModel.selectedKey === 'fixed')}">
44+
-
45+
<mct-control key="'datetime-field'"
46+
structure="{
47+
format: timeSystemModel.deltaFormat,
48+
validate: tcController.validation.validateStartDelta
49+
}"
50+
ng-model="boundsModel"
51+
ng-blur="tcController.updateDeltasFromForm(boundsModel)"
52+
field="'startDelta'"
53+
class="hrs-min-input">
54+
</mct-control>
55+
</span>
4256
</span>
4357
</span>
4458
<span class="l-time-range-w end-w">
45-
<span class="l-time-range-input-w end-date"
46-
ng-controller="ToggleController as t2">
47-
<span class="title"></span>
48-
<mct-control key="'datetime-field'"
49-
structure="{
50-
format: timeSystemModel.format,
51-
validate: tcController.validation.validateEnd
52-
}"
53-
ng-model="boundsModel"
54-
ng-blur="tcController.updateBoundsFromForm(boundsModel)"
55-
ng-disabled="modeModel.selectedKey !== 'fixed'"
56-
field="'end'"
57-
class="time-range-input">
58-
</mct-control>
59-
</span>
60-
<span class="l-time-range-input-w time-delta end-delta"
61-
ng-class="{'hide':(modeModel.selectedKey === 'fixed')}">
62-
+
63-
<mct-control key="'datetime-field'"
64-
structure="{
65-
format: timeSystemModel.deltaFormat,
66-
validate: tcController.validation.validateEndDelta
67-
}"
68-
ng-model="boundsModel"
69-
ng-blur="tcController.updateDeltasFromForm(boundsModel)"
70-
field="'endDelta'"
71-
class="hrs-min-input">
72-
</mct-control>
59+
<span class="l-time-conductor-inputs">
60+
<span class="l-time-range-input-w end-date"
61+
ng-controller="ToggleController as t2">
62+
<span class="title"></span>
63+
<mct-control key="'datetime-field'"
64+
structure="{
65+
format: timeSystemModel.format,
66+
validate: tcController.validation.validateEnd
67+
}"
68+
ng-model="boundsModel"
69+
ng-blur="tcController.updateBoundsFromForm(boundsModel)"
70+
ng-disabled="modeModel.selectedKey !== 'fixed'"
71+
field="'end'"
72+
class="time-range-input">
73+
</mct-control>
74+
</span>
75+
<span class="l-time-range-input-w time-delta end-delta"
76+
ng-class="{'hide':(modeModel.selectedKey === 'fixed')}">
77+
+
78+
<mct-control key="'datetime-field'"
79+
structure="{
80+
format: timeSystemModel.deltaFormat,
81+
validate: tcController.validation.validateEndDelta
82+
}"
83+
ng-model="boundsModel"
84+
ng-blur="tcController.updateDeltasFromForm(boundsModel)"
85+
field="'endDelta'"
86+
class="hrs-min-input">
87+
</mct-control>
88+
</span>
7389
</span>
7490
</span>
7591

0 commit comments

Comments
 (0)