Merge remote-tracking branch 'origin/open1223' into open-1338

Resolve merge conflicts due to whitespace changes.

platform/features/layout/res/templates/elements/telemetry.html

@@ -26,14 +26,14 @@
     <span
         class="l-elem l-value l-obj-val-format"
         data-value="{{ngModel.value}}"
-        ng-class="{ 'telem-only': !ngModel.element.titled }"
+        ng-class="ngModel.cssClass"
         >
         {{ngModel.value}}
     </span>
     <span
         class="l-elem l-title"
-         ng-show="ngModel.element.titled"
+        ng-show="ngModel.element.titled"
         >
         {{ngModel.name}}
     </span>
-</div>
+</div>

platform/features/layout/src/FixedController.js

@@ -123,7 +123,13 @@ define(
 
             // Update the displayed value for this object
             function updateValue(telemetryObject) {
-                var id = telemetryObject && telemetryObject.getId();
+                var id = telemetryObject && telemetryObject.getId(),
+                    limit = telemetryObject &&
+                        telemetryObject.getCapability('limit'),
+                    datum = telemetryObject &&
+                        subscription.getDatum(telemetryObject),
+                    alarm = limit && datum && limit.evaluate(datum);
+
                 if (id) {
                     (elementProxiesById[id] || []).forEach(function (element) {
                         names[id] = telemetryObject.getModel().name;
@@ -132,6 +138,7 @@ define(
                         );
                         element.name = names[id];
                         element.value = values[id];
+                        element.cssClass = alarm && alarm.cssClass;
                     });
                 }
             }
@@ -372,4 +379,4 @@ define(
 
         return FixedController;
     }
-);
+);

platform/features/layout/test/FixedControllerSpec.js

@@ -65,7 +65,7 @@ define(
             function makeMockDomainObject(id) {
                 var mockObject = jasmine.createSpyObj(
                     'domainObject-' + id,
-                    [ 'getId', 'getModel' ]
+                    [ 'getId', 'getModel', 'getCapability' ]
                 );
                 mockObject.getId.andReturn(id);
                 mockObject.getModel.andReturn({ name: "Point " + id});
@@ -96,7 +96,7 @@ define(
                 );
                 mockSubscription = jasmine.createSpyObj(
                     'subscription',
-                    [ 'unsubscribe', 'getTelemetryObjects', 'getRangeValue' ]
+                    [ 'unsubscribe', 'getTelemetryObjects', 'getRangeValue', 'getDatum' ]
                 );
 
                 testGrid = [ 123, 456 ];
@@ -403,4 +403,4 @@ define(
             });
         });
     }
-);
+);