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

cssclass is now cssClass

Browse Source 
Make property name consistent with standard camelCase naming.
This commit is contained in:
Pete Richards
2017-02-15 15:02:39 -08:00
parent 46c7399867
commit aaedf5d576
66 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/features/clock/bundle.js
View File

@@ -136,7 +136,7 @@ define([
],
"category": "contextual",
"name": "Start",
"cssclass": "icon-play",
"cssClass": "icon-play",
"priority": "preferred"
},
{
@@ -147,7 +147,7 @@ define([
],
"category": "contextual",
"name": "Restart at 0",
"cssclass": "icon-refresh",
"cssClass": "icon-refresh",
"priority": "preferred"
}
],
@@ -155,7 +155,7 @@ define([
{
"key": "clock",
"name": "Clock",
"cssclass": "icon-clock",
"cssClass": "icon-clock",
"description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.",
"priority": 101,
"features": [
@@ -183,7 +183,7 @@ define([
"name": "hh:mm:ss"
}
],
"cssclass": "l-inline"
"cssClass": "l-inline"
},
{
"control": "select",
@@ -197,7 +197,7 @@ define([
"name": "24hr"
}
],
"cssclass": "l-inline"
"cssClass": "l-inline"
}
]
}
@@ -212,7 +212,7 @@ define([
{
"key": "timer",
"name": "Timer",
"cssclass": "icon-timer",
"cssClass": "icon-timer",
"description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.",
"priority": 100,
"features": [

4
platform/features/clock/src/controllers/TimerController.js
View File

@@ -131,11 +131,11 @@ define(
/**
* Get the CSS class to display the right icon
* for the start/restart button.
* @returns {string} cssclass to display
* @returns {string} cssClass to display
*/
TimerController.prototype.buttonCssClass = function () {
return this.relevantAction ?
this.relevantAction.getMetadata().cssclass : "";
this.relevantAction.getMetadata().cssClass : "";
};
/**

6
platform/features/clock/test/controllers/TimerControllerSpec.js
View File

@@ -85,8 +85,8 @@ define(
'timer.restart': mockRestart
}[k]];
});
mockStart.getMetadata.andReturn({ cssclass: "icon-play", name: "Start" });
mockRestart.getMetadata.andReturn({ cssclass: "icon-refresh", name: "Restart" });
mockStart.getMetadata.andReturn({ cssClass: "icon-play", name: "Start" });
mockRestart.getMetadata.andReturn({ cssClass: "icon-refresh", name: "Restart" });
mockScope.domainObject = mockDomainObject;
testModel = {};
@@ -144,7 +144,7 @@ define(
expect(controller.text()).toEqual("0D 00:00:00");
});
it("shows cssclass & name for the applicable start/restart action", function () {
it("shows cssClass & name for the applicable start/restart action", function () {
invokeWatch('domainObject', mockDomainObject);
expect(controller.buttonCssClass()).toEqual("icon-play");
expect(controller.buttonText()).toEqual("Start");

4
platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
View File

@@ -26,7 +26,7 @@
ng-click="ngModel.selectedKey=key">
<a ng-mouseover="ngModel.activeMetadata = metadata"
ng-mouseleave="ngModel.activeMetadata = undefined"
class="menu-item-a {{metadata.cssclass}}">
class="menu-item-a {{metadata.cssClass}}">
{{metadata.name}}
</a>
</li>
@@ -34,7 +34,7 @@
</div>
<div class="pane right menu-item-description">
<div
class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssclass}}"></div>
class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssClass}}"></div>
<div class="desc-area title">
{{ngModel.activeMetadata.name}}
</div>

2
platform/features/conductor/core/src/timeSystems/LocalClock.js
View File

@@ -31,7 +31,7 @@ define(['./TickSource'], function (TickSource) {
this.metadata = {
key: 'local',
mode: 'realtime',
cssclass: 'icon-clock',
cssClass: 'icon-clock',
label: 'Real-time',
name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'

6
platform/features/conductor/core/src/ui/TimeConductorViewService.js
View File

@@ -60,7 +60,7 @@ define(
this.availModes = {
'fixed': {
key: 'fixed',
cssclass: 'icon-calendar',
cssClass: 'icon-calendar',
label: 'Fixed',
name: 'Fixed Timespan Mode',
description: 'Query and explore data that falls between two fixed datetimes.'
@@ -81,7 +81,7 @@ define(
if (timeSystemsForMode('realtime').length > 0) {
var realtimeMode = {
key: 'realtime',
cssclass: 'icon-clock',
cssClass: 'icon-clock',
label: 'Real-time',
name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
@@ -93,7 +93,7 @@ define(
if (timeSystemsForMode('lad').length > 0) {
var ladMode = {
key: 'lad',
cssclass: 'icon-database',
cssClass: 'icon-database',
label: 'LAD',
name: 'LAD Mode',
description: 'Latest Available Data mode monitors real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'

4
platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
View File

@@ -38,12 +38,12 @@ define([
/**
* Some metadata, which will be used to identify the time system in
* the UI
* @type {{key: string, name: string, cssclass: string}}
* @type {{key: string, name: string, cssClass: string}}
*/
this.metadata = {
'key': 'utc',
'name': 'UTC',
'cssclass': 'icon-clock'
'cssClass': 'icon-clock'
};
this.fmts = ['utc'];

46
platform/features/fixed/bundle.js
View File

@@ -36,7 +36,7 @@ define([
{
"key": "fixed-display",
"name": "Fixed Position Display",
"cssclass": "icon-box-with-dashed-lines",
"cssClass": "icon-box-with-dashed-lines",
"type": "telemetry.fixed",
"template": fixedTemplate,
"uses": [
@@ -49,28 +49,28 @@ define([
"items": [
{
"method": "add",
"cssclass": "icon-plus",
"cssClass": "icon-plus",
"control": "menu-button",
"text": "Add",
"options": [
{
"name": "Box",
"cssclass": "icon-box",
"cssClass": "icon-box",
"key": "fixed.box"
},
{
"name": "Line",
"cssclass": "icon-line-horz",
"cssClass": "icon-line-horz",
"key": "fixed.line"
},
{
"name": "Text",
"cssclass": "icon-T",
"cssClass": "icon-T",
"key": "fixed.text"
},
{
"name": "Image",
"cssclass": "icon-image",
"cssClass": "icon-image",
"key": "fixed.image"
}
]
@@ -81,50 +81,50 @@ define([
"items": [
{
"method": "order",
"cssclass": "icon-layers",
"cssClass": "icon-layers",
"control": "menu-button",
"title": "Layering",
"description": "Move the selected object above or below other objects",
"options": [
{
"name": "Move to Top",
"cssclass": "icon-arrow-double-up",
"cssClass": "icon-arrow-double-up",
"key": "top"
},
{
"name": "Move Up",
"cssclass": "icon-arrow-up",
"cssClass": "icon-arrow-up",
"key": "up"
},
{
"name": "Move Down",
"cssclass": "icon-arrow-down",
"cssClass": "icon-arrow-down",
"key": "down"
},
{
"name": "Move to Bottom",
"cssclass": "icon-arrow-double-down",
"cssClass": "icon-arrow-double-down",
"key": "bottom"
}
]
},
{
"property": "fill",
"cssclass": "icon-paint-bucket",
"cssClass": "icon-paint-bucket",
"title": "Fill color",
"description": "Set fill color",
"control": "color"
},
{
"property": "stroke",
"cssclass": "icon-line-horz",
"cssClass": "icon-line-horz",
"title": "Border color",
"description": "Set border color",
"control": "color"
},
{
"property": "color",
"cssclass": "icon-T",
"cssClass": "icon-T",
"title": "Text color",
"description": "Set text color",
"mandatory": true,
@@ -132,20 +132,20 @@ define([
},
{
"property": "url",
"cssclass": "icon-image",
"cssClass": "icon-image",
"control": "dialog-button",
"title": "Image Properties",
"description": "Edit image properties",
"dialog": {
"control": "textfield",
"name": "Image URL",
"cssclass": "l-input-lg",
"cssClass": "l-input-lg",
"required": true
}
},
{
"property": "text",
"cssclass": "icon-gear",
"cssClass": "icon-gear",
"control": "dialog-button",
"title": "Text Properties",
"description": "Edit text properties",
@@ -157,14 +157,14 @@ define([
},
{
"method": "showTitle",
"cssclass": "icon-two-parts-both",
"cssClass": "icon-two-parts-both",
"control": "button",
"title": "Show title",
"description": "Show telemetry element title"
},
{
"method": "hideTitle",
"cssclass": "icon-two-parts-one-only",
"cssClass": "icon-two-parts-one-only",
"control": "button",
"title": "Hide title",
"description": "Hide telemetry element title"
@@ -176,7 +176,7 @@ define([
{
"method": "remove",
"control": "button",
"cssclass": "icon-trash"
"cssClass": "icon-trash"
}
]
}
@@ -188,7 +188,7 @@ define([
{
"key": "telemetry.fixed",
"name": "Fixed Position Display",
"cssclass": "icon-box-with-dashed-lines",
"cssClass": "icon-box-with-dashed-lines",
"description": "Collect and display telemetry elements in " +
"alphanumeric format in a simple canvas workspace. " +
"Elements can be positioned and sized. " +
@@ -215,12 +215,12 @@ define([
{
"name": "Horizontal grid (px)",
"control": "textfield",
"cssclass": "l-input-sm l-numeric"
"cssClass": "l-input-sm l-numeric"
},
{
"name": "Vertical grid (px)",
"control": "textfield",
"cssclass": "l-input-sm l-numeric"
"cssClass": "l-input-sm l-numeric"
}
],
"pattern": "^(\\d*[1-9]\\d*)?$",

2
platform/features/imagery/bundle.js
View File

@@ -41,7 +41,7 @@ define([
{
"name": "Imagery",
"key": "imagery",
"cssclass": "icon-image",
"cssClass": "icon-image",
"template": imageryTemplate,
"priority": "preferred",
"needs": [

54
platform/features/layout/bundle.js
View File

@@ -56,7 +56,7 @@ define([
{
"key": "layout",
"name": "Display Layout",
"cssclass": "icon-layout",
"cssClass": "icon-layout",
"type": "layout",
"template": layoutTemplate,
"editable": true,
@@ -65,7 +65,7 @@ define([
{
"key": "fixed",
"name": "Fixed Position",
"cssclass": "icon-box-with-dashed-lines",
"cssClass": "icon-box-with-dashed-lines",
"type": "telemetry.panel",
"template": fixedTemplate,
"uses": [
@@ -77,7 +77,7 @@ define([
"items": [
{
"method": "add",
"cssclass": "icon-plus",
"cssClass": "icon-plus",
"control": "menu-button",
"text": "Add",
"title": "Add",
@@ -85,22 +85,22 @@ define([
"options": [
{
"name": "Box",
"cssclass": "icon-box",
"cssClass": "icon-box",
"key": "fixed.box"
},
{
"name": "Line",
"cssclass": "icon-line-horz",
"cssClass": "icon-line-horz",
"key": "fixed.line"
},
{
"name": "Text",
"cssclass": "icon-T",
"cssClass": "icon-T",
"key": "fixed.text"
},
{
"name": "Image",
"cssclass": "icon-image",
"cssClass": "icon-image",
"key": "fixed.image"
}
]
@@ -111,50 +111,50 @@ define([
"items": [
{
"method": "order",
"cssclass": "icon-layers",
"cssClass": "icon-layers",
"control": "menu-button",
"title": "Layering",
"description": "Move the selected object above or below other objects",
"options": [
{
"name": "Move to Top",
"cssclass": "icon-arrow-double-up",
"cssClass": "icon-arrow-double-up",
"key": "top"
},
{
"name": "Move Up",
"cssclass": "icon-arrow-up",
"cssClass": "icon-arrow-up",
"key": "up"
},
{
"name": "Move Down",
"cssclass": "icon-arrow-down",
"cssClass": "icon-arrow-down",
"key": "down"
},
{
"name": "Move to Bottom",
"cssclass": "icon-arrow-double-down",
"cssClass": "icon-arrow-double-down",
"key": "bottom"
}
]
},
{
"property": "fill",
"cssclass": "icon-paint-bucket",
"cssClass": "icon-paint-bucket",
"title": "Fill color",
"description": "Set fill color",
"control": "color"
},
{
"property": "stroke",
"cssclass": "icon-line-horz",
"cssClass": "icon-line-horz",
"title": "Border color",
"description": "Set border color",
"control": "color"
},
{
"property": "color",
"cssclass": "icon-T",
"cssClass": "icon-T",
"title": "Text color",
"description": "Set text color",
"mandatory": true,
@@ -162,20 +162,20 @@ define([
},
{
"property": "url",
"cssclass": "icon-image",
"cssClass": "icon-image",
"control": "dialog-button",
"title": "Image Properties",
"description": "Edit image properties",
"dialog": {
"control": "textfield",
"name": "Image URL",
"cssclass": "l-input-lg",
"cssClass": "l-input-lg",
"required": true
}
},
{
"property": "text",
"cssclass": "icon-gear",
"cssClass": "icon-gear",
"control": "dialog-button",
"title": "Text Properties",
"description": "Edit text properties",
@@ -187,14 +187,14 @@ define([
},
{
"method": "showTitle",
"cssclass": "icon-two-parts-both",
"cssClass": "icon-two-parts-both",
"control": "button",
"title": "Show title",
"description": "Show telemetry element title"
},
{
"method": "hideTitle",
"cssclass": "icon-two-parts-one-only",
"cssClass": "icon-two-parts-one-only",
"control": "button",
"title": "Hide title",
"description": "Hide telemetry element title"
@@ -206,7 +206,7 @@ define([
{
"method": "remove",
"control": "button",
"cssclass": "icon-trash",
"cssClass": "icon-trash",
"title": "Delete",
"description": "Delete the selected item"
}
@@ -275,7 +275,7 @@ define([
{
"key": "layout",
"name": "Display Layout",
"cssclass": "icon-layout",
"cssClass": "icon-layout",
"description": "Assemble other objects and components together into a reusable screen layout. Working in a simple canvas workspace, simply drag in the objects you want, position and size them. Save your design and view or edit it at any time.",
"priority": 900,
"features": "creation",
@@ -291,12 +291,12 @@ define([
{
"name": "Horizontal grid (px)",
"control": "textfield",
"cssclass": "l-input-sm l-numeric"
"cssClass": "l-input-sm l-numeric"
},
{
"name": "Vertical grid (px)",
"control": "textfield",
"cssclass": "l-input-sm l-numeric"
"cssClass": "l-input-sm l-numeric"
}
],
"key": "layoutGrid",
@@ -307,7 +307,7 @@ define([
{
"key": "telemetry.panel",
"name": "Telemetry Panel",
"cssclass": "icon-telemetry-panel",
"cssClass": "icon-telemetry-panel",
"description": "A panel for collecting telemetry elements.",
"priority": 899,
"delegates": [
@@ -330,12 +330,12 @@ define([
{
"name": "Horizontal grid (px)",
"control": "textfield",
"cssclass": "l-input-sm l-numeric"
"cssClass": "l-input-sm l-numeric"
},
{
"name": "Vertical grid (px)",
"control": "textfield",
"cssclass": "l-input-sm l-numeric"
"cssClass": "l-input-sm l-numeric"
}
],
"pattern": "^(\\d*[1-9]\\d*)?$",

2
platform/features/layout/src/elements/ElementFactory.js
View File

@@ -55,7 +55,7 @@ define(
key: "url",
control: "textfield",
name: "Image URL",
"cssclass": "l-input-lg",
"cssClass": "l-input-lg",
required: true
}
]

4
platform/features/pages/bundle.js
View File

@@ -36,7 +36,7 @@ define([
{
"key": "example.page",
"name": "Web Page",
"cssclass": "icon-page",
"cssClass": "icon-page",
"description": "Embed a web page or web-based image in a resizeable window component. Can be added to Display Layouts. Note that the URL being embedded must allow iframing.",
"priority": 50,
"features": [
@@ -49,7 +49,7 @@ define([
"control": "textfield",
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
"required": true,
"cssclass": "l-input-lg"
"cssClass": "l-input-lg"
}
]
}

2
platform/features/plot/bundle.js
View File

@@ -47,7 +47,7 @@ define([
{
"name": "Plot",
"key": "plot",
"cssclass": "icon-sine",
"cssClass": "icon-sine",
"template": plotTemplate,
"needs": [
"telemetry"

4
platform/features/plot/res/templates/plot.html
View File

@@ -121,7 +121,7 @@
ng-show="plot.isZoomed()"
title="Reset pan/zoom">
</a>
<div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssclass}}"
<div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssClass}}"
ng-if="plot.getModeOptions().length > 1"
ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span>
@@ -130,7 +130,7 @@
<ul>
<li ng-repeat="option in plot.getModeOptions()"
ng-click="plot.setMode(option); toggle.setState(false)"
class="{{option.cssclass}}">
class="{{option.cssClass}}">
{{option.name}}
</li>
</ul>

2
platform/features/plot/src/PlotController.js
View File

@@ -352,7 +352,7 @@ define(
/**
* Get the current mode that is applicable to this plot. This
* will include key, name, and cssclass fields.
* will include key, name, and cssClass fields.
*/
PlotController.prototype.getMode = function () {
return this.modeOptions.getMode();

6
platform/features/plot/src/modes/PlotModeOptions.js
View File

@@ -27,13 +27,13 @@ define(
var STACKED = {
key: "stacked",
name: "Stacked",
cssclass: "icon-plot-stacked",
cssClass: "icon-plot-stacked",
Constructor: PlotStackMode
},
OVERLAID = {
key: "overlaid",
name: "Overlaid",
cssclass: "icon-plot-overlay",
cssClass: "icon-plot-overlay",
Constructor: PlotOverlayMode
};
@@ -115,7 +115,7 @@ define(
/**
* Get all mode options available for each plot. Each
* mode contains a `name` and `cssclass` field suitable
* mode contains a `name` and `cssClass` field suitable
* for display in a template.
* @return {Array} the available modes
*/

2
platform/features/static-markup/bundle.js
View File

@@ -36,7 +36,7 @@ define([
{
"key": "static.markup",
"name": "Static Markup",
"cssclass": "icon-pencil",
"cssClass": "icon-pencil",
"description": "Static markup sandbox",
"features": [
"creation"

8
platform/features/table/bundle.js
View File

@@ -66,7 +66,7 @@ define([
{
"key": "table",
"name": "Historical Telemetry Table",
"cssclass": "icon-tabular",
"cssClass": "icon-tabular",
"description": "A static table of all values over time for all included telemetry elements. Rows are timestamped data values for each telemetry element; columns are data fields. The number of rows is based on the range of your query. New incoming data must be manually re-queried for.",
"priority": 861,
"features": "creation",
@@ -89,7 +89,7 @@ define([
{
"key": "rttable",
"name": "Real-time Telemetry Table",
"cssclass": "icon-tabular-realtime",
"cssClass": "icon-tabular-realtime",
"description": "A scrolling table of latest values for all included telemetry elements. Rows are timestamped data values for each telemetry element; columns are data fields. New incoming data is automatically added to the view.",
"priority": 860,
"features": "creation",
@@ -134,7 +134,7 @@ define([
"name": "Historical Table",
"key": "table",
"template": historicalTableTemplate,
"cssclass": "icon-tabular",
"cssClass": "icon-tabular",
"needs": [
"telemetry"
],
@@ -144,7 +144,7 @@ define([
{
"name": "Real-time Table",
"key": "rt-table",
"cssclass": "icon-tabular-realtime",
"cssClass": "icon-tabular-realtime",
"template": rtTableTemplate,
"needs": [
"telemetry"

26
platform/features/timeline/bundle.js
View File

@@ -153,7 +153,7 @@ define([
{
"key": "timeline",
"name": "Timeline",
"cssclass": "icon-timeline",
"cssClass": "icon-timeline",
"description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.",
"priority": 502,
"features": [
@@ -206,7 +206,7 @@ define([
{
"key": "activity",
"name": "Activity",
"cssclass": "icon-activity",
"cssClass": "icon-activity",
"features": [
"creation"
],
@@ -252,7 +252,7 @@ define([
{
"key": "mode",
"name": "Activity Mode",
"cssclass": "icon-activity-mode",
"cssClass": "icon-activity-mode",
"features": [
"creation"
],
@@ -292,7 +292,7 @@ define([
{
"key": "values",
"name": "Values",
"cssclass": "icon-activity-mode",
"cssClass": "icon-activity-mode",
"template": valuesTemplate,
"type": "mode",
"uses": [
@@ -303,7 +303,7 @@ define([
{
"key": "timeline",
"name": "Timeline",
"cssclass": "icon-timeline",
"cssClass": "icon-timeline",
"type": "timeline",
"description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.",
"template": timelineTemplate,
@@ -319,12 +319,12 @@ define([
"options": [
{
"name": "Timeline",
"cssclass": "icon-timeline",
"cssClass": "icon-timeline",
"key": "timeline"
},
{
"name": "Activity",
"cssclass": "icon-activity",
"cssClass": "icon-activity",
"key": "activity"
}
]
@@ -334,13 +334,13 @@ define([
{
"items": [
{
"cssclass": "icon-plot-resource",
"cssClass": "icon-plot-resource",
"description": "Graph Resource Utilization",
"control": "button",
"method": "toggleGraph"
},
{
"cssclass": "icon-activity-mode",
"cssClass": "icon-activity-mode",
"control": "dialog-button",
"description": "Apply Activity Modes...",
"title": "Apply Activity Modes",
@@ -353,7 +353,7 @@ define([
"property": "modes"
},
{
"cssclass": "icon-chain-links",
"cssClass": "icon-chain-links",
"description": "Edit Activity Link",
"title": "Activity Link",
"control": "dialog-button",
@@ -361,12 +361,12 @@ define([
"control": "textfield",
"name": "Link",
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
"cssclass": "l-input-lg"
"cssClass": "l-input-lg"
},
"property": "link"
},
{
"cssclass": "icon-gear",
"cssClass": "icon-gear",
"description": "Edit Properties...",
"control": "button",
"method": "properties"
@@ -379,7 +379,7 @@ define([
"method": "remove",
"description": "Remove Item",
"control": "button",
"cssclass": "icon-trash"
"cssClass": "icon-trash"
}
]
}