ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-05 09:00:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Timer] cssclass to cssClass

Browse Source 
Along with preceding changes, fixes #623
This commit is contained in:
Victor Woeltjen 2017-05-03 16:30:06 -07:00
parent 6e1a43130d
commit f8a04d0fc2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ define([
], ],
"category": "contextual", "category": "contextual",
"name": "Pause", "name": "Pause",
"cssclass": "icon-pause", "cssClass": "icon-pause",
"priority": "preferred" "priority": "preferred"
}, },
{ {
@ -173,7 +173,7 @@ define([
], ],
"category": "contextual", "category": "contextual",
"name": "Stop", "name": "Stop",
"cssclass": "icon-box", "cssClass": "icon-box",
"priority": "preferred" "priority": "preferred"
} }
], ],

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

@ -172,7 +172,7 @@ define(
*/ */
TimerController.prototype.buttonCssClass = function () { TimerController.prototype.buttonCssClass = function () {
return this.relevantAction ? return this.relevantAction ?
this.relevantAction.getMetadata().cssclass : ""; this.relevantAction.getMetadata().cssClass : "";
}; };
/** /**

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

@ -92,9 +92,9 @@ define(
}[k]]; }[k]];
}); });
mockStart.getMetadata.andReturn({cssclass: "icon-play", name: "Start"}); mockStart.getMetadata.andReturn({cssClass: "icon-play", name: "Start"});
mockPause.getMetadata.andReturn({cssclass: "icon-pause", name: "Pause"}); mockPause.getMetadata.andReturn({cssClass: "icon-pause", name: "Pause"});
mockStop.getMetadata.andReturn({cssclass: "icon-box", name: "Stop"}); mockStop.getMetadata.andReturn({cssClass: "icon-box", name: "Stop"});
mockScope.domainObject = mockDomainObject; mockScope.domainObject = mockDomainObject;
testModel = {}; testModel = {};
@ -152,7 +152,7 @@ define(
expect(controller.text()).toEqual("0D 00:00:00"); expect(controller.text()).toEqual("0D 00:00:00");
}); });
it("shows cssclass & name for the applicable start/pause action", function () { it("shows cssClass & name for the applicable start/pause action", function () {
invokeWatch('domainObject', mockDomainObject); invokeWatch('domainObject', mockDomainObject);
expect(controller.buttonCssClass()).toEqual("icon-play"); expect(controller.buttonCssClass()).toEqual("icon-play");
expect(controller.buttonText()).toEqual("Start"); expect(controller.buttonText()).toEqual("Start");