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");