From f8a04d0fc2b3e31cbee1d8620dc4fcac1856f4d0 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 3 May 2017 16:30:06 -0700 Subject: [PATCH] [Timer] cssclass to cssClass Along with preceding changes, fixes #623 --- platform/features/clock/bundle.js | 4 ++-- .../features/clock/src/controllers/TimerController.js | 2 +- .../clock/test/controllers/TimerControllerSpec.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/features/clock/bundle.js b/platform/features/clock/bundle.js index 1078bcb1bd..022f81f809 100644 --- a/platform/features/clock/bundle.js +++ b/platform/features/clock/bundle.js @@ -151,7 +151,7 @@ define([ ], "category": "contextual", "name": "Pause", - "cssclass": "icon-pause", + "cssClass": "icon-pause", "priority": "preferred" }, { @@ -173,7 +173,7 @@ define([ ], "category": "contextual", "name": "Stop", - "cssclass": "icon-box", + "cssClass": "icon-box", "priority": "preferred" } ], diff --git a/platform/features/clock/src/controllers/TimerController.js b/platform/features/clock/src/controllers/TimerController.js index b4cd63c0ba..5c92ee4991 100644 --- a/platform/features/clock/src/controllers/TimerController.js +++ b/platform/features/clock/src/controllers/TimerController.js @@ -172,7 +172,7 @@ define( */ TimerController.prototype.buttonCssClass = function () { return this.relevantAction ? - this.relevantAction.getMetadata().cssclass : ""; + this.relevantAction.getMetadata().cssClass : ""; }; /** diff --git a/platform/features/clock/test/controllers/TimerControllerSpec.js b/platform/features/clock/test/controllers/TimerControllerSpec.js index 8a5ad70113..002ce5c007 100644 --- a/platform/features/clock/test/controllers/TimerControllerSpec.js +++ b/platform/features/clock/test/controllers/TimerControllerSpec.js @@ -92,9 +92,9 @@ define( }[k]]; }); - mockStart.getMetadata.andReturn({cssclass: "icon-play", name: "Start"}); - mockPause.getMetadata.andReturn({cssclass: "icon-pause", name: "Pause"}); - mockStop.getMetadata.andReturn({cssclass: "icon-box", name: "Stop"}); + mockStart.getMetadata.andReturn({cssClass: "icon-play", name: "Start"}); + mockPause.getMetadata.andReturn({cssClass: "icon-pause", name: "Pause"}); + mockStop.getMetadata.andReturn({cssClass: "icon-box", name: "Stop"}); mockScope.domainObject = mockDomainObject; testModel = {}; @@ -152,7 +152,7 @@ define( 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); expect(controller.buttonCssClass()).toEqual("icon-play"); expect(controller.buttonText()).toEqual("Start");