alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into persist-on-mutation-825

Browse Source
This commit is contained in:
Victor Woeltjen
2016-10-07 11:27:58 -07:00
parent 385d90b056 cbd001e280
commit 1a88c9a651
314 changed files with 6153 additions and 7464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/core/bundle.js
View File

@@ -254,18 +254,26 @@ define([
"pattern": "\\S+",
"required": true,
"cssclass": "l-input-lg"
},
{
"name": "Notes",
"key": "notes",
"property": "notes",
"control": "textarea",
"required": false,
"cssclass": "l-textarea-sm"
}
]
},
{
"key": "root",
"name": "Root",
"glyph": "\u0046"
"cssclass": "icon-folder"
},
{
"key": "folder",
"name": "Folder",
"glyph": "\u0046",
"cssclass": "icon-folder",
"features": "creation",
"description": "Create folders to organize other objects or links to objects.",
"priority": 1000,
@@ -276,11 +284,11 @@ define([
{
"key": "unknown",
"name": "Unknown Type",
"glyph": "\u003f"
"cssclass": "icon-object-unknown"
},
{
"name": "Unknown Type",
"glyph": "\u003f"
"cssclass": "icon-object-unknown"
}
],
"capabilities": [

2
platform/core/src/actions/ActionAggregator.js
View File

@@ -58,7 +58,7 @@ define(
* @property {string} key machine-readable identifier for this action
* @property {string} name human-readable name for this action
* @property {string} description human-readable description
* @property {string} glyph character to display as icon
* @property {string} cssclass CSS class for icon
* @property {ActionContext} context the context in which the action
* will be performed.
*/

2
platform/core/src/models/ModelCacheService.js
View File

@@ -24,7 +24,7 @@ define([], function () {
/**
* Provides a cache for domain object models which exist in memory,
* but may or may not exist in backing persistene stores.
* but may or may not exist in backing persistence stores.
* @constructor
* @memberof platform/core
*/

2
platform/core/src/models/RootModelProvider.js
View File

@@ -42,7 +42,7 @@ define(
* @implements {ModelService}
* @param {Array} roots all `roots[]` extensions
* @param $q Angular's $q, for promises
* @param $log Anuglar's $log, for logging
* @param $log Angular's $log, for logging
*/
function RootModelProvider(roots, $q, $log) {
// Pull out identifiers to used as ROOT's

2
platform/core/src/models/StaticModelProvider.js
View File

@@ -49,7 +49,7 @@ define(
}
}
// Prepoulate maps with models to make subsequent lookup faster.
// Prepopulate maps with models to make subsequent lookup faster.
models.forEach(addModelToMap);
this.modelMap = modelMap;

12
platform/core/src/types/TypeImpl.js
View File

@@ -56,13 +56,13 @@ define(
* @method Type#getDescription
*/
/**
* Get the glyph associated with this type. Glyphs are
* single-character strings which will appear as icons (when
* Get the cssclass associated with this type. cssclass is a
* string which will appear as an icon (when
* displayed in an appropriate font) which visually
* distinguish types from one another.
*
* @returns {string} the glyph to be displayed
* @method Type#getGlyph
* @returns {string} the cssclass for this type
* @method Type#getCssClass
*/
/**
* Get an array of properties associated with objects of
@@ -144,8 +144,8 @@ define(
return this.typeDef.description;
};
TypeImpl.prototype.getGlyph = function () {
return this.typeDef.glyph;
TypeImpl.prototype.getCssClass = function () {
return this.typeDef.cssclass;
};
TypeImpl.prototype.getProperties = function () {

2
platform/core/src/types/TypePropertyConversion.js
View File

@@ -43,7 +43,7 @@ define(
},
ARRAY_SUFFIX = '[]';
// Utility function to handle arrays of conversiions
// Utility function to handle arrays of conversions
function ArrayConversion(conversion) {
return {
toModelValue: function (formValue) {

2
platform/core/src/types/TypeProvider.js
View File

@@ -68,7 +68,7 @@ define(
}) : array;
}
// Reduce an array of type definitions to a single type definiton,
// Reduce an array of type definitions to a single type definition,
// which has merged all properties in order.
function collapse(typeDefs) {
var collapsed = typeDefs.reduce(function (a, b) {

2
platform/core/src/views/ViewProvider.js
View File

@@ -61,7 +61,7 @@ define(
* domain object's whose `type` capability matches or inherits
* from that type.
*
* Views themselves are primarily metadata, such as name, glyph, and
* Views themselves are primarily metadata, such as name, icon and
* description (to be shown in the UI); they do not contain any
* information directly applicable to rendering to the DOM, although
* they do contain sufficient information (such as a `templateUrl`,

6
platform/core/test/types/TypeImplSpec.js
View File

@@ -33,7 +33,7 @@ define(
key: 'test-type',
name: 'Test Type',
description: 'A type, for testing',
glyph: 't',
cssclass: 'icon-telemetry-panel',
inherits: ['test-parent-1', 'test-parent-2'],
features: ['test-feature-1'],
properties: [{}],
@@ -54,8 +54,8 @@ define(
expect(type.getDescription()).toEqual('A type, for testing');
});
it("exposes glyph from definition", function () {
expect(type.getGlyph()).toEqual('t');
it("exposes CSS class from definition", function () {
expect(type.getCssClass()).toEqual('icon-telemetry-panel');
});
it("exposes its underlying type definition", function () {

12
platform/core/test/types/TypeProviderSpec.js
View File

@@ -30,18 +30,18 @@ define(
testTypeDefinitions = [
{
key: 'basic',
glyph: "X",
cssclass: "icon-magnify-in",
name: "Basic Type"
},
{
key: 'multi1',
glyph: "Z",
cssclass: "icon-trash",
description: "Multi1 Description",
capabilities: ['a1', 'b1']
},
{
key: 'multi2',
glyph: "Y",
cssclass: "icon-magnify-out",
capabilities: ['a2', 'b2', 'c2']
},
{
@@ -70,7 +70,7 @@ define(
it("looks up non-inherited types by name", function () {
captured.type = provider.getType('basic');
expect(captured.type.getGlyph()).toEqual("X");
expect(captured.type.getCssClass()).toEqual("icon-magnify-in");
expect(captured.type.getName()).toEqual("Basic Type");
expect(captured.type.getDescription()).toBeUndefined();
});
@@ -78,7 +78,7 @@ define(
it("supports single inheritance", function () {
captured.type = provider.getType('single-subtype');
expect(captured.type.getGlyph()).toEqual("X");
expect(captured.type.getCssClass()).toEqual("icon-magnify-in");
expect(captured.type.getName()).toEqual("Basic Subtype");
expect(captured.type.getDescription()).toEqual("A test subtype");
});
@@ -86,7 +86,7 @@ define(
it("supports multiple inheritance", function () {
captured.type = provider.getType('multi-subtype');
expect(captured.type.getGlyph()).toEqual("Y");
expect(captured.type.getCssClass()).toEqual("icon-magnify-out");
expect(captured.type.getName()).toEqual("Multi-parent Subtype");
expect(captured.type.getDescription()).toEqual("Multi1 Description");
});