Skip to content

Commit 5f8a35e

Browse files
authored
Merge branch 'master' into open1233a
2 parents 977aea4 + fd33127 commit 5f8a35e

File tree

978 files changed

+3887
-2050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

978 files changed

+3887
-2050
lines changed

.jshintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"predef": [
1616
"define",
1717
"Promise",
18-
"WeakMap"
18+
"WeakMap",
19+
"Map"
1920
],
2021
"shadow": "outer",
2122
"strict": "implied",

API.md

Lines changed: 319 additions & 229 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ the check-in process. These roles are:
4343

4444
Three basic types of branches may be included in the above repository:
4545

46-
1. Master branch.
47-
2. Topic branches.
48-
3. Developer branches.
46+
1. Master branch
47+
2. Topic branches
48+
3. Developer branches
4949

5050
Branches which do not fit into the above categories may be created and used
5151
during the course of development for various reasons, such as large-scale
@@ -107,7 +107,7 @@ back into the master branch is to file a Pull Request. The contributions
107107
should meet code, test, and commit message standards as described below,
108108
and the pull request should include a completed author checklist, also
109109
as described below. Pull requests may be assigned to specific team
110-
members when appropriate (e.g. to draw to a specific person's attention.)
110+
members when appropriate (e.g. to draw to a specific person's attention).
111111

112112
Code review should take place using discussion features within the pull
113113
request. When the reviewer is satisfied, they should add a comment to
@@ -130,26 +130,26 @@ settings. This is verified by the command line build.
130130
JavaScript sources in Open MCT should:
131131

132132
* Use four spaces for indentation. Tabs should not be used.
133-
* Include JSDoc for any exposed API (e.g. public methods, constructors.)
133+
* Include JSDoc for any exposed API (e.g. public methods, constructors).
134134
* Include non-JSDoc comments as-needed for explaining private variables,
135135
methods, or algorithms when they are non-obvious.
136136
* Define one public class per script, expressed as a constructor function
137137
returned from an AMD-style module.
138138
* Follow “Java-like” naming conventions. These includes:
139139
* Classes should use camel case, first letter capitalized
140-
(e.g. SomeClassName.)
140+
(e.g. SomeClassName).
141141
* Methods, variables, fields, and function names should use camel case,
142-
first letter lower-case (e.g. someVariableName.) Constants
143-
(variables or fields which are meant to be declared and initialized
144-
statically, and never changed) should use only capital letters, with
145-
underscores between words (e.g. SOME_CONSTANT.)
146-
* File name should be the name of the exported class, plus a .js extension
147-
(e.g. SomeClassName.js)
142+
first letter lower-case (e.g. someVariableName).
143+
* Constants (variables or fields which are meant to be declared and
144+
initialized statically, and never changed) should use only capital
145+
letters, with underscores between words (e.g. SOME_CONSTANT).
146+
* File names should be the name of the exported class, plus a .js extension
147+
(e.g. SomeClassName.js).
148148
* Avoid anonymous functions, except when functions are short (a few lines)
149149
and/or their inclusion makes sense within the flow of the code
150-
(e.g. as arguments to a forEach call.)
150+
(e.g. as arguments to a forEach call).
151151
* Avoid deep nesting (especially of functions), except where necessary
152-
(e.g. due to closure scope.)
152+
(e.g. due to closure scope).
153153
* End with a single new-line character.
154154
* Expose public methods by declaring them on the class's prototype.
155155
* Within a given function's scope, do not mix declarations and imperative
@@ -234,7 +234,7 @@ Commit messages should:
234234
 line of white space.
235235
* Contain a short (usually one word) reference to the feature or subsystem
236236
the commit effects, in square brackets, at the start of the subject line
237-
(e.g. `[Documentation] Draft of check-in process`)
237+
(e.g. `[Documentation] Draft of check-in process`).
238238
* Contain a reference to a relevant issue number in the body of the commit.
239239
* This is important for traceability; while branch names also provide this,
240240
you cannot tell from looking at a commit what branch it was authored on.
@@ -250,17 +250,17 @@ Commit messages should:
250250
Commit messages should not:
251251

252252
* Exceed 54 characters in length on the subject line.
253-
* Exceed 72 characters in length in the body of the commit.
253+
* Exceed 72 characters in length in the body of the commit,
254254
* Except where necessary to maintain the structure of machine-readable or
255-
machine-generated text (e.g. error messages)
255+
machine-generated text (e.g. error messages).
256256

257257
See [Contributing to a Project](http://git-scm.com/book/ch5-2.html) from
258258
Pro Git by Shawn Chacon and Ben Straub for a bit of the rationale behind
259259
these standards.
260260

261261
## Issue Reporting
262262

263-
Issues are tracked at https://github.com/nasa/openmct/issues
263+
Issues are tracked at https://github.com/nasa/openmct/issues.
264264

265265
Issues should include:
266266

@@ -284,7 +284,7 @@ Issue severity is categorized as follows (in ascending order):
284284

285285
The following check lists should be completed and attached to pull requests
286286
when they are filed (author checklist) and when they are merged (reviewer
287-
checklist.)
287+
checklist).
288288

289289
### Author Checklist
290290

LICENSES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Open MCT Licenses
22

3-
Open MCT, Copyright (c) 2014-2016, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
3+
Open MCT, Copyright (c) 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
44

55
Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Documentation is available on the [Open MCT website](https://nasa.github.io/open
5555
### Examples
5656

5757
The clearest examples for developing Open MCT plugins are in the
58-
[tutorials](https://nasa.github.io/openmct/docs/tutorials/) provided in
58+
[tutorials](https://github.com/nasa/openmct-tutorial) provided in
5959
our documentation.
6060

6161
For a practical example of a telemetry adapter, see David Hudson's

bower.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"eventemitter3": "^1.2.0",
2323
"lodash": "3.10.1",
2424
"almond": "~0.3.2",
25-
"d3": "~4.1.0",
2625
"html2canvas": "^0.4.1"
2726
}
2827
}

build-docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
#*****************************************************************************
4-
#* Open MCT, Copyright (c) 2014-2016, United States Government
4+
#* Open MCT, Copyright (c) 2014-2017, United States Government
55
#* as represented by the Administrator of the National Aeronautics and Space
66
#* Administration. All rights reserved.
77
#*

docs/gendocs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

docs/src/guide/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ The platform understands the following policy categories (specifiable as the
22612261

22622262
* `action`: Determines whether or not a given action is allowable. The candidate
22632263
argument here is an Action; the context is its action context object.
2264-
* `composition`: Determines whether or not domain objects of a given type (first argument, `parentType`) can contain a given object (second argument, `child`).
2264+
* `composition`: Determines whether or not a given domain object(first argument, `parent`) can contain a candidate child object (second argument, `child`).
22652265
* `view`: Determines whether or not a view is applicable for a domain object.
22662266
The candidate argument is the view's extension definition; the context argument
22672267
is the `DomainObject` to be viewed.

docs/src/tutorials/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ has been finalized.
156156
#### Before
157157
```html
158158
<!--
159-
Open MCT, Copyright (c) 2014-2016, United States Government
159+
Open MCT, Copyright (c) 2014-2017, United States Government
160160
as represented by the Administrator of the National Aeronautics and Space
161161
Administration. All rights reserved.
162162
@@ -221,7 +221,7 @@ __index.html__
221221

222222
```html
223223
<!--
224-
Open MCT, Copyright (c) 2014-2016, United States Government
224+
Open MCT, Copyright (c) 2014-2017, United States Government
225225
as represented by the Administrator of the National Aeronautics and Space
226226
Administration. All rights reserved.
227227
@@ -2356,7 +2356,7 @@ If we include this in our set of active bundles:
23562356

23572357
```html
23582358
<!--
2359-
Open MCT, Copyright (c) 2014-2016, United States Government
2359+
Open MCT, Copyright (c) 2014-2017, United States Government
23602360
as represented by the Administrator of the National Aeronautics and Space
23612361
Administration. All rights reserved.
23622362

example/builtins/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ These are:
55
* Controllers
66
* Directives
77
* Routes
8-
* Services
8+
* Services

example/builtins/bundle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

example/builtins/res/templates/example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Open MCT, Copyright (c) 2014-2016, United States Government
2+
Open MCT, Copyright (c) 2014-2017, United States Government
33
as represented by the Administrator of the National Aeronautics and Space
44
Administration. All rights reserved.
55
@@ -21,4 +21,4 @@
2121
-->
2222
<p>Hello, world! I am the default route.</p>
2323
<p ng-controller="ExampleController">My controller has told me: "{{phrase}}"</p>
24-
<span example-directive></span>
24+
<span example-directive></span>

example/builtins/src/ExampleController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -39,4 +39,4 @@ define(
3939

4040
return ExampleController;
4141
}
42-
);
42+
);

example/builtins/src/ExampleDirective.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -63,4 +63,4 @@ define(
6363

6464
return ExampleDirective;
6565
}
66-
);
66+
);

example/builtins/src/ExampleService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -43,4 +43,4 @@ define(
4343

4444
return ExampleService;
4545
}
46-
);
46+
);

example/composite/bundle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

example/composite/src/SomeAggregator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -47,4 +47,4 @@ define(
4747

4848
return SomeAggregator;
4949
}
50-
);
50+
);

example/composite/src/SomeDecorator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -45,4 +45,4 @@ define(
4545

4646
return SomeDecorator;
4747
}
48-
);
48+
);

example/composite/src/SomeOtherDecorator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -45,4 +45,4 @@ define(
4545

4646
return SomeOtherDecorator;
4747
}
48-
);
48+
);

example/composite/src/SomeOtherExample.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -43,4 +43,4 @@ define(
4343

4444
return SomeOtherExample;
4545
}
46-
);
46+
);

example/composite/src/SomeOtherProvider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -45,4 +45,4 @@ define(
4545

4646
return SomeOtherProvider;
4747
}
48-
);
48+
);

example/composite/src/SomeProvider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -45,4 +45,4 @@ define(
4545

4646
return SomeProvider;
4747
}
48-
);
48+
);

example/eventGenerator/bundle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

example/eventGenerator/src/EventTelemetry.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -60,4 +60,4 @@ define(
6060

6161
return EventTelemetry;
6262
}
63-
);
63+
);

example/eventGenerator/src/EventTelemetryProvider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -118,4 +118,4 @@ define(
118118

119119
return EventTelemetryProvider;
120120
}
121-
);
121+
);

example/export/ExportTelemetryAsCSVAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

example/export/bundle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2016, United States Government
2+
* Open MCT, Copyright (c) 2014-2017, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

0 commit comments

Comments
 (0)