Merge remote-tracking branch 'origin/master' into persist-on-mutation-825

platform/features/timeline/src/capabilities/GraphCapability.js

@@ -37,7 +37,8 @@ define(
             // Build graphs for this group of utilizations
             function buildGraphs(utilizations) {
                 var utilizationMap = {},
-                    result = {};
+                    result = {},
+                    startingSOC;
 
                 // Bucket utilizations by type
                 utilizations.forEach(function (u) {
@@ -55,12 +56,14 @@ define(
                 if (domainObject.getModel().type === 'timeline' &&
                         result.power &&
                             domainObject.getModel().capacity > 0) {
+                    startingSOC = isNaN(parseFloat(domainObject.getModel().startingSOC)) ?
+                                    100 : parseFloat(domainObject.getModel().startingSOC);
 
                     result.battery = new CumulativeGraph(
                         result.power,
                         0,
                         domainObject.getModel().capacity, // Watts
-                        domainObject.getModel().capacity,
+                        (startingSOC / 100) * domainObject.getModel().capacity,
                         1 / 3600000 // millis-to-hour (since units are watt-hours)
                     );
                 }

platform/features/timeline/src/controllers/TimelineGanttController.js

@@ -26,7 +26,7 @@ define(
 
         /**
          * Control for Gantt bars in a timeline view.
-         * Primarily reesponsible for supporting the positioning of Gantt
+         * Primarily responsible for supporting the positioning of Gantt
          * bars; particularly, this ensures that the left and right edges
          * never go to far off screen, because in some environments this
          * will effect rendering performance without visible results.

platform/features/timeline/src/controllers/TimelineTickController.js

@@ -28,7 +28,7 @@ define(
 
         /**
          * Provides labels for the tick mark area of a timeline view.
-         * Since the tick mark regin is potentially extremeley large,
+         * Since the tick mark region is potentially extremely large,
          * only the subset of ticks which will actually be shown in
          * view are provided.
          * @constructor

platform/features/timeline/src/controllers/drag/TimelineDragHandler.js

@@ -140,7 +140,7 @@ define(
                     var timespan = timespans[toId(id)];
                     // Use as setter if argument is present
                     if ((typeof value === 'number') && timespan) {
-                        // Set the end (ensuring it doesn't preceed start)
+                        // Set the end (ensuring it doesn't precede start)
                         timespan.setEnd(
                             Math.max(value, timespan.getStart())
                         );

platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js

@@ -41,7 +41,7 @@ define(
                     ids,
                     candidates;
 
-                // Filter an id for inclustion
+                // Filter an id for inclusion
                 function include(id) {
                     return id !== exclude;
                 }