From 1c007ea2561ce1047ecc88e113e641d0c86f84d0 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 23 May 2016 14:55:04 -0700 Subject: [PATCH 1/3] [Code Style] Remove trailing whitespace ...to fix build after changes for #142. --- platform/representation/src/gestures/DropGesture.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index 7f94dad223..966618d88c 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -46,7 +46,7 @@ define( // Find the relevant scope... var rect, scope = element.scope && element.scope(); - + if (scope && scope.$broadcast) { // Get the representation's bounds, to convert // drop position From ab64b682c3ccc5d69e7aa27ba6f81c506ba4c876 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 23 May 2016 14:58:23 -0700 Subject: [PATCH 2/3] [Code Style] Run checkstyle on CircleCI Run the full gulp verify task for testing on CircleCI, to handle unit tests as well as code style checks and linting (and other verification steps that may be added in the future.) --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 7caa57740d..3b245f7941 100644 --- a/circle.yml +++ b/circle.yml @@ -15,8 +15,8 @@ deployment: heroku: appname: openmctweb-staging-deux test: - post: - - gulp lint + override: + - gulp verify general: branches: From 9a8bcc055002729a791656529781c5f413f8cc5f Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 23 May 2016 15:10:05 -0700 Subject: [PATCH 3/3] [Code Style] Specify lint, codestyle in CircleCI config ...to work around unexpected failure running test suite via gulp verify, https://circleci.com/gh/nasa/openmct/1981 --- circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 3b245f7941..b075c1f5fe 100644 --- a/circle.yml +++ b/circle.yml @@ -15,8 +15,9 @@ deployment: heroku: appname: openmctweb-staging-deux test: - override: - - gulp verify + post: + - gulp lint + - gulp checkstyle general: branches: