Merge branch 'master' of github.com:nasa/openmct into open1185

platform/features/layout/src/FixedDragHandle.js

@@ -94,7 +94,7 @@ define(
         };
 
         /**
-         * End a drag gesture. This should be callled when a drag
+         * End a drag gesture. This should be called when a drag
          * concludes to trigger commit of changes.
          */
         FixedDragHandle.prototype.endDrag = function () {

platform/features/layout/src/LayoutController.js

@@ -152,7 +152,7 @@ define(
         }
 
         // Convert from { positions: ..., dimensions: ... } to an
-        // apropriate ng-style argument, to position frames.
+        // appropriate ng-style argument, to position frames.
         LayoutController.prototype.convertPosition = function (raw) {
             var gridSize = this.gridSize;
             // Multiply position/dimensions by grid size

platform/features/layout/test/LayoutControllerSpec.js

@@ -164,7 +164,7 @@ define(
                 // Populate scope
                 mockScope.$watchCollection.mostRecentCall.args[1]();
 
-                // Verify precondtion
+                // Verify precondition
                 expect(testConfiguration.panels.b).not.toBeDefined();
 
                 // Do a drag

platform/features/plot/test/Canvas2DChartSpec.js

@@ -59,7 +59,7 @@ define(
                 expect(mock2d.clearRect).toHaveBeenCalled();
             });
 
-            it("doees not construct if 2D is unavailable", function () {
+            it("does not construct if 2D is unavailable", function () {
                 mockCanvas.getContext.andReturn(undefined);
                 expect(function () {
                     return new Canvas2DChart(mockCanvas);

platform/features/plot/test/GLChartSpec.js

@@ -82,7 +82,7 @@ define(
                 expect(mockGL.clear).toHaveBeenCalled();
             });
 
-            it("doees not construct if WebGL is unavailable", function () {
+            it("does not construct if WebGL is unavailable", function () {
                 mockCanvas.getContext.andReturn(undefined);
                 expect(function () {
                     return new GLChart(mockCanvas);

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

@@ -148,7 +148,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;
                 }