Merge pull request nasa#891 from nasa/fix-clickaway-888

VWoeltjen · VWoeltjen · commit 2fe9698ea8e1 · 2016-05-06T09:49:13.000-07:00
[General] remove dupe, debounce inputs
diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js
@@ -268,8 +268,8 @@ define([
                     "key": "ClickAwayController",
                     "implementation": ClickAwayController,
                     "depends": [
-                        "$scope",
-                        "$document"
+                        "$document",
+                        "$timeout"
                     ]
                 },
                 {
diff --git a/platform/commonUI/general/src/controllers/ClickAwayController.js b/platform/commonUI/general/src/controllers/ClickAwayController.js
@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,Promise*/
+/*global define*/
 
 define(
     [],
@@ -36,20 +36,19 @@ define(
          * @param $scope the scope in which this controller is active
          * @param $document the document element, injected by Angular
          */
-        function ClickAwayController($scope, $document) {
+        function ClickAwayController($document, $timeout) {
             var self = this;
 
             this.state = false;
-            this.$scope = $scope;
             this.$document = $document;
 
-            // Callback used by the document listener. Deactivates;
-            // note also $scope.$apply is invoked to indicate that
-            // the state of this controller has changed.
+            // Callback used by the document listener. Timeout ensures that
+            // `clickaway` action occurs after `toggle` if `toggle` is
+            // triggered by a click/mouseup.
             this.clickaway = function () {
-                self.deactivate();
-                $scope.$apply();
-                return false;
+                $timeout(function () {
+                    self.deactivate();
+                });
             };
         }
 
diff --git a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js
@@ -19,28 +19,28 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
+/*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/controllers/ClickAwayController"],
     function (ClickAwayController) {
         "use strict";
 
         describe("The click-away controller", function () {
-            var mockScope,
-                mockDocument,
+            var mockDocument,
+                mockTimeout,
                 controller;
 
             beforeEach(function () {
-                mockScope = jasmine.createSpyObj(
-                    "$scope",
-                    [ "$apply" ]
-                );
                 mockDocument = jasmine.createSpyObj(
                     "$document",
                     [ "on", "off" ]
                 );
-                controller = new ClickAwayController(mockScope, mockDocument);
+                mockTimeout = jasmine.createSpy('timeout');
+                controller = new ClickAwayController(
+                    mockDocument,
+                    mockTimeout
+                );
             });
 
             it("is initially inactive", function () {
@@ -79,10 +79,12 @@ define(
             });
 
             it("deactivates and detaches listener on document click", function () {
-                var callback;
+                var callback, timeout;
                 controller.setState(true);
                 callback = mockDocument.on.mostRecentCall.args[1];
                 callback();
+                timeout = mockTimeout.mostRecentCall.args[0];
+                timeout();
                 expect(controller.isActive()).toEqual(false);
                 expect(mockDocument.off).toHaveBeenCalledWith("mouseup", callback);
             });
@@ -91,4 +93,4 @@ define(
 
         });
     }
-);
+);
diff --git a/platform/search/bundle.js b/platform/search/bundle.js
@@ -24,7 +24,6 @@
 define([
     "./src/controllers/SearchController",
     "./src/controllers/SearchMenuController",
-    "./src/controllers/ClickAwayController",
     "./src/services/GenericSearchProvider",
     "./src/services/SearchAggregator",
     "text!./res/templates/search-item.html",
@@ -34,7 +33,6 @@ define([
 ], function (
     SearchController,
     SearchMenuController,
-    ClickAwayController,
     GenericSearchProvider,
     SearchAggregator,
     searchItemTemplate,
@@ -73,14 +71,6 @@ define([
                         "$scope",
                         "types[]"
                     ]
-                },
-                {
-                    "key": "ClickAwayController",
-                    "implementation": ClickAwayController,
-                    "depends": [
-                        "$scope",
-                        "$document"
-                    ]
                 }
             ],
             "representations": [
diff --git a/platform/search/src/controllers/ClickAwayController.js b/platform/search/src/controllers/ClickAwayController.js
diff --git a/platform/search/test/controllers/ClickAwayControllerSpec.js b/platform/search/test/controllers/ClickAwayControllerSpec.js

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,8 @@ define([`
`268`	`268`	`"key": "ClickAwayController",`
`269`	`269`	`"implementation": ClickAwayController,`
`270`	`270`	`"depends": [`
`271`		`- "$scope",`
`272`		`- "$document"`
	`271`	`+ "$document",`
	`272`	`+ "$timeout"`
`273`	`273`	`]`
`274`	`274`	`},`
`275`	`275`	`{`