Merge branch 'Esri#64/update-header-controller-widget-config' into de…

…velop
adgiles · Mar 2, 2013 · e258ec4 · e258ec4
2 parents c7efc67 + 7ff6a22
commit e258ec4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/widgets/HeaderController/HeaderControllerWidget.mxml b/src/widgets/HeaderController/HeaderControllerWidget.mxml
@@ -119,11 +119,10 @@
             {
                 if (configXML)
                 {
-                    var searchConfig:XML = configXML.geocoder[0] || configXML.search[0];
+                    var geocoderXML:XML = configXML.geocoder[0] || configXML.search[0];
 
-                    const shouldEnableSearch:Boolean = (searchConfig.@visible[0] == "true")
-                        || (searchConfig[0] && !searchConfig.@visible[0]);
-                    if (shouldEnableSearch)
+                    const shouldEnableGeocoder:Boolean = geocoderXML && (geocoderXML.@visible[0] != "false");
+                    if (shouldEnableGeocoder)
                     {
                         singleLineSearch.hostBaseWidget = this;
                         singleLineSearch.includeInLayout = true;

diff --git a/src/widgets/HeaderController/HeaderControllerWidget.xml b/src/widgets/HeaderController/HeaderControllerWidget.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
-    <search>
-        <geocoding>
-            <locator>http://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer</locator>
-        </geocoding>
-    </search>
+    <geocoder/>
+
     <links>
         <link>
             <content>