From fe8398017c44c74d450dd44f0f8406ec4365d750 Mon Sep 17 00:00:00 2001
From: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue, 17 Jan 2017 16:29:44 -0800
Subject: [PATCH] [Style] Fix style bugs introduced in #1374

---
 platform/commonUI/dialog/src/DialogService.js | 13 +++---
 .../commonUI/dialog/test/DialogServiceSpec.js | 43 ++++++++-----------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js
index e744549ffa..cc094b2bb8 100644
--- a/platform/commonUI/dialog/src/DialogService.js
+++ b/platform/commonUI/dialog/src/DialogService.js
@@ -64,7 +64,8 @@ define(
             // input is asynchronous.
             var deferred = this.$q.defer(),
                 self = this,
-                overlay;
+                overlay,
+                handleEscKeydown;
 
             // Confirm function; this will be passed in to the
             // overlay-dialog template and associated with a
@@ -84,11 +85,11 @@ define(
                 self.dismissOverlay(overlay);
             }
 
-            function handleEscKeydown(event){
-              if (event.keyCode === 27) {
-                cancel();
-              }
-            }
+            handleEscKeydown = function (event) {
+                if (event.keyCode === 27) {
+                    cancel();
+                }
+            };
 
             // Add confirm/cancel callbacks
             model.confirm = confirm;
diff --git a/platform/commonUI/dialog/test/DialogServiceSpec.js b/platform/commonUI/dialog/test/DialogServiceSpec.js
index e7cde7b24c..0e3525ec68 100644
--- a/platform/commonUI/dialog/test/DialogServiceSpec.js
+++ b/platform/commonUI/dialog/test/DialogServiceSpec.js
@@ -62,10 +62,7 @@ define(
                   "$document",
                   ["find"]
                 );
-                mockBody = angular.element(document.createElement('body'));
-                spyOn(mockBody, 'on').andCallThrough();
-                spyOn(mockBody, 'off').andCallThrough();
-
+                mockBody = jasmine.createSpyObj('body', ['on', 'off']);
                 mockDocument.find.andReturn(mockBody);
 
                 mockDeferred.promise = "mock promise";
@@ -144,35 +141,33 @@ define(
             });
 
             it("adds a keydown event listener to the body", function () {
-              dialogService.getUserInput({}, {});
-              expect(mockDocument.find).toHaveBeenCalledWith("body");
-              expect(mockBody.on).toHaveBeenCalledWith("keydown", jasmine.any(Function));
+                dialogService.getUserInput({}, {});
+                expect(mockDocument.find).toHaveBeenCalledWith("body");
+                expect(mockBody.on).toHaveBeenCalledWith("keydown", jasmine.any(Function));
             });
 
             it("destroys the event listener when the dialog is cancelled", function () {
-              dialogService.getUserInput({}, {});
-              mockOverlayService.createOverlay.mostRecentCall.args[1].cancel();
-              expect(mockBody.off).toHaveBeenCalledWith("keydown", jasmine.any(Function));
+                dialogService.getUserInput({}, {});
+                mockOverlayService.createOverlay.mostRecentCall.args[1].cancel();
+                expect(mockBody.off).toHaveBeenCalledWith("keydown", jasmine.any(Function));
             });
 
             it("cancels the dialog when an escape keydown event is triggered", function () {
-              dialogService.getUserInput({}, {});
-              mockBody.triggerHandler({
-                  type: 'keydown',
-                  keyCode: 27
-              });
-              expect(mockDeferred.reject).toHaveBeenCalled();
-              expect(mockDeferred.resolve).not.toHaveBeenCalled();
+                dialogService.getUserInput({}, {});
+                mockBody.on.mostRecentCall.args[1]({
+                    keyCode: 27
+                });
+                expect(mockDeferred.reject).toHaveBeenCalled();
+                expect(mockDeferred.resolve).not.toHaveBeenCalled();
             });
 
             it("ignores non escape keydown events", function () {
-              dialogService.getUserInput({}, {});
-              mockBody.triggerHandler({
-                  type: 'keydown',
-                  keyCode: 13
-              });
-              expect(mockDeferred.reject).not.toHaveBeenCalled();
-              expect(mockDeferred.resolve).not.toHaveBeenCalled();
+                dialogService.getUserInput({}, {});
+                mockBody.on.mostRecentCall.args[1]({
+                    keyCode: 13
+                });
+                expect(mockDeferred.reject).not.toHaveBeenCalled();
+                expect(mockDeferred.resolve).not.toHaveBeenCalled();
             });
 
             describe("the blocking message dialog", function () {