Merge branch 'master' into open1233a

Author: charlesh88

.jshintrc

@@ -15,7 +15,8 @@
     "predef": [
         "define",
         "Promise",
-        "WeakMap"
+        "WeakMap",
+        "Map"
     ],
     "shadow": "outer",
     "strict": "implied",

API.md

@@ -43,9 +43,9 @@ the check-in process. These roles are:
 
 Three basic types of branches may be included in the above repository:
 
-1. Master branch.
-2. Topic branches.
-3. Developer branches.
+1. Master branch
+2. Topic branches
+3. Developer branches
 
 Branches which do not fit into the above categories may be created and used
 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
 should meet code, test, and commit message standards as described below,
 and the pull request should include a completed author checklist, also
 as described below. Pull requests may be assigned to specific team
-members when appropriate (e.g. to draw to a specific person's attention.)
+members when appropriate (e.g. to draw to a specific person's attention).
 
 Code review should take place using discussion features within the pull
 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.
 JavaScript sources in Open MCT should:
 
 * Use four spaces for indentation. Tabs should not be used.
-* Include JSDoc for any exposed API (e.g. public methods, constructors.)
+* Include JSDoc for any exposed API (e.g. public methods, constructors).
 * Include non-JSDoc comments as-needed for explaining private variables,
   methods, or algorithms when they are non-obvious.
 * Define one public class per script, expressed as a constructor function
   returned from an AMD-style module.
 * Follow “Java-like” naming conventions. These includes:
   * Classes should use camel case, first letter capitalized
-    (e.g. SomeClassName.)
+    (e.g. SomeClassName).
   * Methods, variables, fields, and function names should use camel case,
-    first letter lower-case (e.g. someVariableName.) Constants
-    (variables or fields which are meant to be declared and initialized
-    statically, and never changed) should use only capital letters, with
-    underscores between words (e.g. SOME_CONSTANT.)
-  * File name should be the name of the exported class, plus a .js extension
-    (e.g. SomeClassName.js)
+    first letter lower-case (e.g. someVariableName).
+  * Constants (variables or fields which are meant to be declared and 
+    initialized statically, and never changed) should use only capital 
+    letters, with underscores between words (e.g. SOME_CONSTANT).
+  * File names should be the name of the exported class, plus a .js extension
+    (e.g. SomeClassName.js).
 * Avoid anonymous functions, except when functions are short (a few lines)
   and/or their inclusion makes sense within the flow of the code
-  (e.g. as arguments to a forEach call.)
+  (e.g. as arguments to a forEach call).
 * Avoid deep nesting (especially of functions), except where necessary
-  (e.g. due to closure scope.)
+  (e.g. due to closure scope).
 * End with a single new-line character.
 * Expose public methods by declaring them on the class's prototype.
 * Within a given function's scope, do not mix declarations and imperative
@@ -234,7 +234,7 @@ Commit messages should:
   line of white space.
 * Contain a short (usually one word) reference to the feature or subsystem
   the commit effects, in square brackets, at the start of the subject line
-  (e.g. `[Documentation] Draft of check-in process`)
+  (e.g. `[Documentation] Draft of check-in process`).
 * Contain a reference to a relevant issue number in the body of the commit.
   * This is important for traceability; while branch names also provide this,
     you cannot tell from looking at a commit what branch it was authored on.
@@ -250,17 +250,17 @@ Commit messages should:
 Commit messages should not:
 
 * Exceed 54 characters in length on the subject line.
-* Exceed 72 characters in length in the body of the commit.
+* Exceed 72 characters in length in the body of the commit,
   * Except where necessary to maintain the structure of machine-readable or
-    machine-generated text (e.g. error messages)
+    machine-generated text (e.g. error messages).
 
 See [Contributing to a Project](http://git-scm.com/book/ch5-2.html) from
 Pro Git by Shawn Chacon and Ben Straub for a bit of the rationale behind
 these standards.
 
 ## Issue Reporting
 
-Issues are tracked at https://github.com/nasa/openmct/issues
+Issues are tracked at https://github.com/nasa/openmct/issues.
 
 Issues should include:
 
@@ -284,7 +284,7 @@ Issue severity is categorized as follows (in ascending order):
 
 The following check lists should be completed and attached to pull requests
 when they are filed (author checklist) and when they are merged (reviewer
-checklist.)
+checklist).
 
 ### Author Checklist
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Open MCT Licenses
 
-Open MCT, Copyright (c) 2014-2016, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, Copyright (c) 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
 
 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.
 

LICENSES.md

@@ -55,7 +55,7 @@ Documentation is available on the [Open MCT website](https://nasa.github.io/open
 ### Examples
 
 The clearest examples for developing Open MCT plugins are in the
-[tutorials](https://nasa.github.io/openmct/docs/tutorials/) provided in
+[tutorials](https://github.com/nasa/openmct-tutorial) provided in
 our documentation.
 
 For a practical example of a telemetry adapter, see David Hudson's

README.md

@@ -22,7 +22,6 @@
     "eventemitter3": "^1.2.0",
     "lodash": "3.10.1",
     "almond": "~0.3.2",
-    "d3": "~4.1.0",
     "html2canvas": "^0.4.1"
   }
 }

bower.json

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2016, United States Government
+#* Open MCT, Copyright (c) 2014-2017, United States Government
 #* as represented by the Administrator of the National Aeronautics and Space
 #* Administration. All rights reserved.
 #*

build-docs.sh

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

docs/gendocs.js

@@ -2261,7 +2261,7 @@ The platform understands the following policy categories (specifiable as the
 
 * `action`: Determines whether or not a given action is allowable. The candidate 
 argument here is an Action; the context is its action context object.
-* `composition`: Determines whether or not domain objects of a given type (first argument, `parentType`) can contain a given object (second argument, `child`).
+* `composition`: Determines whether or not a given domain object(first argument, `parent`) can contain a candidate child object (second argument, `child`).
 * `view`: Determines whether or not a view is applicable for a domain object. 
 The candidate argument is the view's extension definition; the context argument 
 is the `DomainObject` to be viewed.

docs/src/guide/index.md

@@ -156,7 +156,7 @@ has been finalized.
 #### Before
 ```html
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -221,7 +221,7 @@ __index.html__
 
 ```html
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -2356,7 +2356,7 @@ If we include this in our set of active bundles:
 
 ```html
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

docs/src/tutorials/index.md

@@ -5,4 +5,4 @@ These are:
 * Controllers
 * Directives
 * Routes
-* Services
+* Services

example/builtins/README.md

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

example/builtins/bundle.js

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -21,4 +21,4 @@
 -->
 <p>Hello, world! I am the default route.</p>
 <p ng-controller="ExampleController">My controller has told me: "{{phrase}}"</p>
-<span example-directive></span>
+<span example-directive></span>

example/builtins/res/templates/example.html

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -39,4 +39,4 @@ define(
 
         return ExampleController;
     }
-);
+);

example/builtins/src/ExampleController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -63,4 +63,4 @@ define(
 
         return ExampleDirective;
     }
-);
+);

example/builtins/src/ExampleDirective.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -43,4 +43,4 @@ define(
 
         return ExampleService;
     }
-);
+);

example/builtins/src/ExampleService.js

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

example/composite/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -47,4 +47,4 @@ define(
 
         return SomeAggregator;
     }
-);
+);

example/composite/src/SomeAggregator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,4 +45,4 @@ define(
 
         return SomeDecorator;
     }
-);
+);

example/composite/src/SomeDecorator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,4 +45,4 @@ define(
 
         return SomeOtherDecorator;
     }
-);
+);

example/composite/src/SomeOtherDecorator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -43,4 +43,4 @@ define(
 
         return SomeOtherExample;
     }
-);
+);

example/composite/src/SomeOtherExample.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,4 +45,4 @@ define(
 
         return SomeOtherProvider;
     }
-);
+);

example/composite/src/SomeOtherProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,4 +45,4 @@ define(
 
         return SomeProvider;
     }
-);
+);

example/composite/src/SomeProvider.js

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

example/eventGenerator/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -60,4 +60,4 @@ define(
 
         return EventTelemetry;
     }
-);
+);

example/eventGenerator/src/EventTelemetry.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -118,4 +118,4 @@ define(
 
         return EventTelemetryProvider;
     }
-);
+);

example/eventGenerator/src/EventTelemetryProvider.js

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

example/export/ExportTelemetryAsCSVAction.js

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