Merge pull request #52 from nasa/continuous-deployment

Support continuous deployment of open source Open MCT Web.
This commit is contained in:
Victor Woeltjen
2015-07-27 07:51:54 -07:00
13 changed files with 355 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ define(
*
* @param {string} id the object's unique identifier
* @param {object} model the "JSONifiable" state of the object
* @param {Object.<string, Capability|function} capabilities all
* @param {Object.<string, Capability>|function} capabilities all
* capabilities to be exposed by this object
* @constructor
*/

View File

@@ -45,7 +45,7 @@ define(
* into one large object containing resolved extensions from
* all bundles (in the same form.)
*
* @param {Object.<string, object[]>[]} resolvedBundles
* @param {Object.<string, object[]>|Array} resolvedBundles
* @returns {Object.<string, object[]>}
*/
function mergeResolvedBundles(resolvedBundles) {