Merge branch 'master' into open671

2016-05-09 10:19:24 -07:00
parent 934eb13813 d6aa31e4aa
commit f3b265bdd5
70 changed files with 2241 additions and 1786 deletions
--- a/platform/search/bundle.js
+++ b/platform/search/bundle.js
@@ -23,7 +23,6 @@
 define([
    "./src/controllers/SearchController",
    "./src/controllers/SearchMenuController",
-    "./src/controllers/ClickAwayController",
    "./src/services/GenericSearchProvider",
    "./src/services/SearchAggregator",
    "text!./res/templates/search-item.html",
@@ -33,7 +32,6 @@ define([
 ], function (
    SearchController,
    SearchMenuController,
-    ClickAwayController,
    GenericSearchProvider,
    SearchAggregator,
    searchItemTemplate,
@@ -71,14 +69,6 @@ define([
                        "$scope",
                        "types[]"
                    ]
-                },
-                {
-                    "key": "ClickAwayController",
-                    "implementation": ClickAwayController,
-                    "depends": [
-                        "$scope",
-                        "$document"
-                    ]
                }
            ],
            "representations": [