[Search] Removed unused

Removed incorrect 'uses' statements from
bundle.json. Also removed unused controller
ToggleController. Edited some comments.

platform/features/search/bundle.json

@@ -12,11 +12,6 @@
                 "key": "SearchItemController",
                 "implementation": "controllers/SearchItemController.js",
                 "depends": [ "$scope" ]
-            },
-            {
-                "key": "ToggleController",
-                "implementation": "controllers/ToggleController.js",
-                "depends": [  ]
             }
         ],        
         "controls": [
@@ -28,15 +23,13 @@
         "templates": [
             {
                 "key": "search",
-                "templateUrl": "templates/search.html",
-                "uses": [ "composition" ]
+                "templateUrl": "templates/search.html"
             }
         ],
         "representations": [
             {
                 "key": "search-item",
-                "templateUrl": "templates/search-item.html",
-                "uses": [ "composition" ]
+                "templateUrl": "templates/search-item.html"
             }
         ],
         "components": [

platform/features/search/res/templates/search.html

@@ -32,18 +32,17 @@
                      ng-model="ngModel"
                      structure="{cssclass: search-input, size: 50}">asdf
         </mct-control>
-        <mct-control key="textfield"
-                     ng-model="ngModel"
-                     ng-required="false"
-                     ng-pattern=""
-                     structure="{cssclass: search-input, size: 50}">
-        </mct-control>
+
         <mct-include key="textfield"
                      ng-model="ngModel"
                      ng-required="false"
                      ng-pattern=""
                      structure="{cssclass: search-input, size: 50}">
         </mct-include-->
+        <mct-control key="textfield"
+                     ng-model="ngModel"
+                     structure="{cssclass: 'search-input', size: '50px'}">
+        </mct-control>
     </div>
     
     <!-- This div exists to determine scroll bar location -->

platform/features/search/src/SearchAggregator.js

@@ -43,7 +43,7 @@ define(
         function SearchAggregator(providers) {
             var latestMergedResults = [],
                 lastMergeTimestamps = [],
-                returnObject;
+                aggregator = {};
             
             // Remove duplicate objects that have the same ID 
             function filterRepeats(results) {
@@ -123,7 +123,7 @@ define(
                 // After all that is done, now replace latestMergedResults with this
                 latestMergedResults = newerResults;
                 lastMergeTimestamps = providerTimestamps;
-                returnObject.latestResults = latestMergedResults;
+                aggregator.latestResults = latestMergedResults;
             }
             
             // For documentation, see sendQuery below.
@@ -143,7 +143,7 @@ define(
                 updateResults();
             }
             
-            returnObject = {
+            aggregator = {
                 /** 
                  * Sends a query to each of the providers, then updates the global
                  *   latestMergedResults accordingly. 
@@ -203,7 +203,8 @@ define(
                     return latestMergedResults.length;
                 }
             };
-            return returnObject;
+            
+            return aggregator;
         }
 
         return SearchAggregator;

platform/features/search/src/controllers/ToggleController.js

@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * A ToggleController is used to activate/deactivate things.
-         * A common usage is for "twistie"
-         *
-         * @constructor
-         */
-        function ToggleController() {
-            var state = false;
-
-            return {
-                /**
-                 * Get the current state of the toggle.
-                 * @return {boolean} true if active
-                 */
-                isActive: function () {
-                    return state;
-                },
-                /**
-                 * Set a new state for the toggle.
-                 * @return {boolean} true to activate
-                 */
-                setState: function (newState) {
-                    state = newState;
-                },
-                /**
-                 * Toggle the current state; activate if it is inactive,
-                 * deactivate if it is active.
-                 */
-                toggle: function () {
-                    state = !state;
-                }
-            };
-
-        }
-
-        return ToggleController;
-    }
-);