From 71eac8bbd246173c4446f671185bbb0fa0493de7 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Tue, 18 Feb 2014 11:12:37 -0800
Subject: [PATCH 01/14] Issue #244: Update Viewer version to 3.7.

---
 locale/en_US/ViewerStrings.properties | 2 +-
 src/version.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/en_US/ViewerStrings.properties b/locale/en_US/ViewerStrings.properties
index 5e41b91..d95da90 100644
--- a/locale/en_US/ViewerStrings.properties
+++ b/locale/en_US/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=About ArcGIS Viewer for Flex...
-aboutText=This application is using ArcGIS Viewer for Flex version 3.6.
+aboutText=This application is using ArcGIS Viewer for Flex version 3.7.
 aboutLearnMoreBtn=Learn more
 aboutCloseBtn=Close
 
diff --git a/src/version.xml b/src/version.xml
index e3be70c..63d18af 100644
--- a/src/version.xml
+++ b/src/version.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<esrifv apiversion="3.6" builddate="@BUILD_DATE@"/>
+<esrifv apiversion="3.7" builddate="@BUILD_DATE@"/>

From 5f1b0c41e09443e9dad7e46e4f8dde04f143c31a Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Tue, 25 Feb 2014 21:34:40 -0800
Subject: [PATCH 02/14] Issue #246: Ensure MapSwitcher widget selects matching
 basemap when switched externally.

---
 src/widgets/MapSwitcher/MapSwitcherWidget.mxml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/widgets/MapSwitcher/MapSwitcherWidget.mxml b/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
index 284e635..2452982 100644
--- a/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
+++ b/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
@@ -109,6 +109,7 @@
                 {
                     currentState = showThumbnails ? "thumbnailOptions" : "buttonOptions";
                     initBasemapSelectionComponent(showThumbnails);
+                    AppEvent.addListener(AppEvent.BASEMAP_SWITCH, checkSelectedBasemap);
                 }
             }
 
@@ -119,6 +120,20 @@
                 hideBasemapsTimer.addEventListener(TimerEvent.TIMER, hideBasemapsTimer_timerHandler, false, 0, true);
             }
 
+            private function checkSelectedBasemap(event:AppEvent):void
+            {
+                var selectedBasemapId:String = event.data as String;
+
+                for each (var basemap:Basemap in basemapList.toArray())
+                {
+                    if (basemap.id == selectedBasemapId)
+                    {
+                        basemapSelectionComponent.selectedItem = basemap;
+                        break;
+                    }
+                }
+            }
+
             private function initBasemapList():void
             {
                 basemapList = new ArrayList();

From 6758c8bf6f2e95c18fa222003ca0048918219de6 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Tue, 25 Feb 2014 22:00:13 -0800
Subject: [PATCH 03/14] Issue #231: Set proper culture code for Bing layers.

---
 src/com/esri/viewer/utils/LayerObjectUtil.as       | 7 ++++++-
 src/com/esri/viewer/utils/PortalBasemapAppender.as | 7 +------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/com/esri/viewer/utils/LayerObjectUtil.as b/src/com/esri/viewer/utils/LayerObjectUtil.as
index 64dc4dc..ac6f6f9 100644
--- a/src/com/esri/viewer/utils/LayerObjectUtil.as
+++ b/src/com/esri/viewer/utils/LayerObjectUtil.as
@@ -152,7 +152,7 @@ public class LayerObjectUtil
         {
             key = obj.@key[0] ? obj.@key : "";
         }
-        var culture:String = obj.@culture[0] ? obj.@culture : "";
+        var culture:String = toCultureCode(obj.@culture[0]);
 
         var showInLegend:Boolean = obj.@showinlegend[0] != "false";
 
@@ -294,6 +294,11 @@ public class LayerObjectUtil
         return resultObject;
     }
 
+    public static function toCultureCode(locale:String):String
+    {
+        return locale ? locale.replace('_', '-') : "";
+    }
+
     private static function isSupportedImageType(filePath:String):Boolean
     {
         var fp:String = filePath;
diff --git a/src/com/esri/viewer/utils/PortalBasemapAppender.as b/src/com/esri/viewer/utils/PortalBasemapAppender.as
index faf2382..84853be 100644
--- a/src/com/esri/viewer/utils/PortalBasemapAppender.as
+++ b/src/com/esri/viewer/utils/PortalBasemapAppender.as
@@ -72,7 +72,7 @@ public class PortalBasemapAppender extends EventDispatcher
         portal.addEventListener(PortalEvent.LOAD, portal_loadHandler);
         portal.addEventListener(FaultEvent.FAULT, portal_faultHandler);
 
-        cultureCode = toCultureCode(ResourceManager.getInstance().localeChain[0]);
+        cultureCode = LayerObjectUtil.toCultureCode(ResourceManager.getInstance().localeChain[0]);
         portal.load(portalURL, cultureCode);
     }
 
@@ -535,11 +535,6 @@ public class PortalBasemapAppender extends EventDispatcher
         AppEvent.showError(LocalizationUtil.getDefaultString("couldNotConnectToPortal"), PORTAL_BASEMAP_APPENDER);
         dispatchComplete();
     }
-
-    private function toCultureCode(locale:String):String
-    {
-        return locale ? locale.replace('_', '-') : locale;
-    }
 }
 
 }

From 5d40bea3678c478c865c7c5b4d79fddf0d9e40b6 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Mon, 4 Aug 2014 12:21:39 -0700
Subject: [PATCH 04/14] Issue #236: Add configurable label for Geoprocessing
 task failures.

---
 locale/en_US/ViewerStrings.properties              |  1 +
 src/widgets/Geoprocessing/GeoprocessingWidget.mxml | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/locale/en_US/ViewerStrings.properties b/locale/en_US/ViewerStrings.properties
index d95da90..d953f78 100644
--- a/locale/en_US/ViewerStrings.properties
+++ b/locale/en_US/ViewerStrings.properties
@@ -117,6 +117,7 @@ uploadUnknownError=Unknown error occurred while uploading file.
 couldNotProcessUploadResponse=Could not process upload complete response.
 fileExceedsAllowedUploadSize=File exceeds max allowed upload size. ({0} MB)
 fileUploadError=File upload error
+gpTaskFailed=Geoprocessing task failed: {0}
 
 ########## Base Widget and MapManager
 configFileCrossDomain=Possible crossdomain issue: {0}{1}
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
index 52da2ee..4ec1750 100644
--- a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
+++ b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
@@ -65,6 +65,7 @@
             import mx.rpc.AsyncResponder;
             import mx.rpc.Fault;
             import mx.rpc.events.FaultEvent;
+            import mx.utils.StringUtil;
 
             import widgets.Geoprocessing.parameters.GPParameterTypes;
             import widgets.Geoprocessing.parameters.IGPFeatureParameter;
@@ -109,6 +110,8 @@
 
             private var version:Number;
 
+            private var gpTaskFailureLabel:String;
+
             [Bindable]
             private var submitLabel:String;
             [Bindable]
@@ -193,6 +196,7 @@
                         helpLabel = configXML.labels.helplabel || getDefaultString("helpLabel");
                         inputLabel = configXML.labels.inputlabel || getDefaultString("inputLabel");
                         outputLabel = configXML.labels.outputlabel || getDefaultString("outputLabel");
+                        gpTaskFailureLabel = configXML.labels.taskfailedlabel || getDefaultString("gpTaskFailed");
 
                         fetchGPTaskInfo();
                     }
@@ -614,7 +618,11 @@
             private function gp_faultHandler(event:FaultEvent):void
             {
                 busyAnimation.visible = false;
-                showError(ErrorMessageUtil.makeHTMLSafe(event.fault.toString()));
+
+                showError(
+                    StringUtil.substitute(gpTaskFailureLabel,
+                                          ErrorMessageUtil.makeHTMLSafe(event.fault.toString()))
+                    );
             }
 
             private function gp_resultDataCompleteHandler(event:GeoprocessorEvent):void

From 333f587074643c4c649be3de7c61e6b232777cb0 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Mon, 4 Aug 2014 11:11:19 -0700
Subject: [PATCH 05/14] Issue #274: Honor user-set widget width/height if
 greater than the widget's minimum dimensions.

---
 src/widgets/AttributeTable/AttributeTableWidget.mxml | 2 +-
 src/widgets/Bookmark/BookmarkWidget.mxml             | 3 ++-
 src/widgets/Chart/ChartWidget.mxml                   | 4 ++--
 src/widgets/DataExtract/DataExtractWidget.mxml       | 4 ++--
 src/widgets/Directions/DirectionsWidget.mxml         | 2 +-
 src/widgets/Draw/DrawWidget.mxml                     | 4 ++--
 src/widgets/Edit/EditWidget.mxml                     | 4 ++--
 src/widgets/GeoRSS/GeoRSSWidget.mxml                 | 4 ++--
 src/widgets/Geoprocessing/GeoprocessingWidget.mxml   | 4 ++--
 src/widgets/LayerList/LayerListWidget.mxml           | 3 ++-
 src/widgets/Legend/LegendWidget.mxml                 | 3 ++-
 src/widgets/Locate/LocateWidget.mxml                 | 4 ++--
 src/widgets/Print/PrintWidget.mxml                   | 4 ++--
 src/widgets/Query/QueryWidget.mxml                   | 3 ++-
 src/widgets/Search/SearchWidget.mxml                 | 4 ++--
 src/widgets/Time/TimeWidget.mxml                     | 4 ++--
 16 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/widgets/AttributeTable/AttributeTableWidget.mxml b/src/widgets/AttributeTable/AttributeTableWidget.mxml
index acf940c..aae1f35 100644
--- a/src/widgets/AttributeTable/AttributeTableWidget.mxml
+++ b/src/widgets/AttributeTable/AttributeTableWidget.mxml
@@ -89,7 +89,7 @@
                 {
                     var iconOffset:Number = wTemplate.icon ? (wTemplate.icon.width * 0.5) : 0;
                     wTemplate.width = map.width - map.width / 100 - Number(this.left) - Number(this.right) - iconOffset;
-                    wTemplate.height = 300;
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Bookmark/BookmarkWidget.mxml b/src/widgets/Bookmark/BookmarkWidget.mxml
index f406b6c..04780f4 100644
--- a/src/widgets/Bookmark/BookmarkWidget.mxml
+++ b/src/widgets/Bookmark/BookmarkWidget.mxml
@@ -90,7 +90,8 @@
                 }
                 else
                 {
-                    wTemplate.width = wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 300);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Chart/ChartWidget.mxml b/src/widgets/Chart/ChartWidget.mxml
index 81e2f32..43a0c95 100644
--- a/src/widgets/Chart/ChartWidget.mxml
+++ b/src/widgets/Chart/ChartWidget.mxml
@@ -140,8 +140,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 330
-                    wTemplate.height = 350;
+                    wTemplate.width = Math.max(width, 330);
+                    wTemplate.height = Math.max(height, 350);
                 }
             }
 
diff --git a/src/widgets/DataExtract/DataExtractWidget.mxml b/src/widgets/DataExtract/DataExtractWidget.mxml
index 2dbea70..e696039 100644
--- a/src/widgets/DataExtract/DataExtractWidget.mxml
+++ b/src/widgets/DataExtract/DataExtractWidget.mxml
@@ -132,8 +132,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 320;
-                    wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 320);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Directions/DirectionsWidget.mxml b/src/widgets/Directions/DirectionsWidget.mxml
index a524383..ef1750b 100644
--- a/src/widgets/Directions/DirectionsWidget.mxml
+++ b/src/widgets/Directions/DirectionsWidget.mxml
@@ -48,7 +48,7 @@
                 else
                 {
                     wTemplate.height = map.height - map.height / 100 - Number(this.top) - Number(this.bottom);
-                    wTemplate.width = 300;
+                    wTemplate.width = Math.max(width, 300);
                 }
             }
 
diff --git a/src/widgets/Draw/DrawWidget.mxml b/src/widgets/Draw/DrawWidget.mxml
index 20cf0f0..8e655ee 100644
--- a/src/widgets/Draw/DrawWidget.mxml
+++ b/src/widgets/Draw/DrawWidget.mxml
@@ -207,8 +207,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 420;
-                    wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 420);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Edit/EditWidget.mxml b/src/widgets/Edit/EditWidget.mxml
index a4ab76c..85b36ca 100644
--- a/src/widgets/Edit/EditWidget.mxml
+++ b/src/widgets/Edit/EditWidget.mxml
@@ -111,8 +111,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 310;
-                    wTemplate.height = 310;
+                    wTemplate.width = Math.max(width, 310);
+                    wTemplate.height = Math.max(height, 310);
                 }
             }
 
diff --git a/src/widgets/GeoRSS/GeoRSSWidget.mxml b/src/widgets/GeoRSS/GeoRSSWidget.mxml
index add0308..6e60cdb 100644
--- a/src/widgets/GeoRSS/GeoRSSWidget.mxml
+++ b/src/widgets/GeoRSS/GeoRSSWidget.mxml
@@ -104,8 +104,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 330;
-                    wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 330);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
index 4ec1750..68892f8 100644
--- a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
+++ b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
@@ -128,8 +128,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 368;
-                    wTemplate.height = 250;
+                    wTemplate.width = Math.max(width, 368);
+                    wTemplate.height = Math.max(height, 250);
                 }
             }
 
diff --git a/src/widgets/LayerList/LayerListWidget.mxml b/src/widgets/LayerList/LayerListWidget.mxml
index 61ecb74..a2d9486 100644
--- a/src/widgets/LayerList/LayerListWidget.mxml
+++ b/src/widgets/LayerList/LayerListWidget.mxml
@@ -43,7 +43,8 @@
                 }
                 else
                 {
-                    wTemplate.width = wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 300);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Legend/LegendWidget.mxml b/src/widgets/Legend/LegendWidget.mxml
index e721a5b..c9161fd 100644
--- a/src/widgets/Legend/LegendWidget.mxml
+++ b/src/widgets/Legend/LegendWidget.mxml
@@ -55,7 +55,8 @@
                 }
                 else
                 {
-                    wTemplate.width = wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 300);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Locate/LocateWidget.mxml b/src/widgets/Locate/LocateWidget.mxml
index 5d7ff24..08675f4 100644
--- a/src/widgets/Locate/LocateWidget.mxml
+++ b/src/widgets/Locate/LocateWidget.mxml
@@ -138,8 +138,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 290;
-                    wTemplate.height = 240;
+                    wTemplate.width = Math.max(width, 290);
+                    wTemplate.height = Math.max(height, 240);
                 }
             }
 
diff --git a/src/widgets/Print/PrintWidget.mxml b/src/widgets/Print/PrintWidget.mxml
index 5a2d9de..6d25979 100644
--- a/src/widgets/Print/PrintWidget.mxml
+++ b/src/widgets/Print/PrintWidget.mxml
@@ -34,8 +34,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 355;
-                    wTemplate.height = 260;
+                    wTemplate.width = Math.max(width, 355);
+                    wTemplate.height = Math.max(height, 260);
                     wTemplate.minHeight = 168;
                 }
             }
diff --git a/src/widgets/Query/QueryWidget.mxml b/src/widgets/Query/QueryWidget.mxml
index 3699eda..c9fb1a4 100644
--- a/src/widgets/Query/QueryWidget.mxml
+++ b/src/widgets/Query/QueryWidget.mxml
@@ -128,7 +128,8 @@
                 }
                 else
                 {
-                    wTemplate.width = wTemplate.height = 300;
+                    wTemplate.width = Math.max(width, 300);
+                    wTemplate.height = Math.max(height, 300);
                 }
             }
 
diff --git a/src/widgets/Search/SearchWidget.mxml b/src/widgets/Search/SearchWidget.mxml
index a0e9e69..4297375 100644
--- a/src/widgets/Search/SearchWidget.mxml
+++ b/src/widgets/Search/SearchWidget.mxml
@@ -157,8 +157,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 430;
-                    wTemplate.height = 240;
+                    wTemplate.width = Math.max(width, 430);
+                    wTemplate.height = Math.max(height, 240);
                 }
             }
 
diff --git a/src/widgets/Time/TimeWidget.mxml b/src/widgets/Time/TimeWidget.mxml
index 2ae8904..5d289ef 100644
--- a/src/widgets/Time/TimeWidget.mxml
+++ b/src/widgets/Time/TimeWidget.mxml
@@ -58,8 +58,8 @@
                 }
                 else
                 {
-                    wTemplate.width = 335;
-                    wTemplate.height = 115;
+                    wTemplate.width = Math.max(width, 335);
+                    wTemplate.height = Math.max(height, 115);
                 }
             }
 

From 2ef89a0d21962c53351956a4e4c3eb3ca6206922 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Fri, 1 Aug 2014 14:47:29 -0700
Subject: [PATCH 06/14] Issue #240: Add support to set custom draw tool
 tooltips via setMapAction.

---
 src/com/esri/viewer/BaseWidget.as            |  5 +-
 src/com/esri/viewer/DrawTooltips.as          | 55 ++++++++++++++++++++
 src/com/esri/viewer/managers/MapManager.mxml | 15 +++++-
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 src/com/esri/viewer/DrawTooltips.as

diff --git a/src/com/esri/viewer/BaseWidget.as b/src/com/esri/viewer/BaseWidget.as
index 36f86ab..557b0ac 100644
--- a/src/com/esri/viewer/BaseWidget.as
+++ b/src/com/esri/viewer/BaseWidget.as
@@ -52,6 +52,8 @@ public class BaseWidget extends Module implements IBaseWidget
 
     private static const WIDGET_CONFIG_LOADED:String = "widgetConfigLoaded";
 
+    private static const EMPTY_TOOLTIPS:DrawTooltips = new DrawTooltips();
+
     //--------------------------------------------------------------------------
     //
     //  Constructor
@@ -466,7 +468,7 @@ public class BaseWidget extends Module implements IBaseWidget
         AppEvent.dispatch(AppEvent.SHOW_INFOWINDOW, infoData);
     }
 
-    public function setMapAction(action:String, status:String, symbol:Symbol, callback:Function, callback2:Function = null, showDrawTips:Boolean = true, enableGraphicsLayerMouseEvents:Boolean = false):void
+    public function setMapAction(action:String, status:String, symbol:Symbol, callback:Function, callback2:Function = null, showDrawTips:Boolean = true, enableGraphicsLayerMouseEvents:Boolean = false, drawTooltips:DrawTooltips = null):void
     {
         var data:Object =
             {
@@ -476,6 +478,7 @@ public class BaseWidget extends Module implements IBaseWidget
                 handler: callback,
                 showDrawTips: showDrawTips,
                 enableGraphicsLayerMouseEvents: enableGraphicsLayerMouseEvents,
+                drawTooltips: drawTooltips || EMPTY_TOOLTIPS,
                 handler2: callback2
             };
         AppEvent.dispatch(AppEvent.SET_MAP_ACTION, data);
diff --git a/src/com/esri/viewer/DrawTooltips.as b/src/com/esri/viewer/DrawTooltips.as
new file mode 100644
index 0000000..2c9e157
--- /dev/null
+++ b/src/com/esri/viewer/DrawTooltips.as
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2008-2013 Esri. All Rights Reserved.
+ *
+ * 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.
+ */
+
+package com.esri.viewer
+{
+
+public class DrawTooltips
+{
+    public function DrawTooltips(
+        toolTipPoint:String = null,
+        toolTipMultipointStart:String = null,
+        toolTipMultipointEnd:String = null,
+        toolTipPolyStart:String = null,
+        toolTipPolyContinue:String = null,
+        toolTipPolyEnd:String = null,
+        toolTipStartAndLetGo:String = null
+        )
+    {
+        this.toolTipPoint = toolTipPoint;
+        this.toolTipMultipointStart = toolTipMultipointStart;
+        this.toolTipMultipointEnd = toolTipMultipointEnd;
+        this.toolTipPolyStart = toolTipPolyStart;
+        this.toolTipPolyContinue = toolTipPolyContinue;
+        this.toolTipPolyEnd = toolTipPolyEnd;
+        this.toolTipStartAndLetGo = toolTipStartAndLetGo;
+    }
+
+    public var toolTipPoint:String;
+
+    public var toolTipMultipointStart:String;
+
+    public var toolTipMultipointEnd:String;
+
+    public var toolTipPolyStart:String;
+
+    public var toolTipPolyContinue:String;
+
+    public var toolTipPolyEnd:String;
+
+    public var toolTipStartAndLetGo:String;
+}
+}
diff --git a/src/com/esri/viewer/managers/MapManager.mxml b/src/com/esri/viewer/managers/MapManager.mxml
index b326d0e..2786626 100644
--- a/src/com/esri/viewer/managers/MapManager.mxml
+++ b/src/com/esri/viewer/managers/MapManager.mxml
@@ -72,6 +72,7 @@ Class used to configure the viewer map component (including layers) and handle m
             import com.esri.ags.utils.WebMercatorUtil;
             import com.esri.viewer.AppEvent;
             import com.esri.viewer.ConfigData;
+            import com.esri.viewer.DrawTooltips;
             import com.esri.viewer.IBaseWidget;
             import com.esri.viewer.IInfowindowTemplate;
             import com.esri.viewer.ViewerContainer;
@@ -1469,6 +1470,7 @@ Class used to configure the viewer map component (including layers) and handle m
                 var symbol:Symbol = data.symbol;
                 var showDrawTips:Boolean = data.showDrawTips;
                 var enableGraphicsLayerMouseEvents:Boolean = data.enableGraphicsLayerMouseEvents;
+                var drawTooltips:DrawTooltips = data.drawTooltips;
 
                 if (tool)
                 {
@@ -1480,13 +1482,22 @@ Class used to configure the viewer map component (including layers) and handle m
                     m_drawEndFunction = data.handler;
                     m_drawUpdateFunction = data.handler2;
                     m_navTool.deactivate();
-                    m_drawTool.activate(tool, enableGraphicsLayerMouseEvents);
                     // showDrawTips
                     m_drawTool.showDrawTips = showDrawTips;
+
+                    m_drawTool.toolTipStartAndLetGo = drawTooltips.toolTipStartAndLetGo;
+                    m_drawTool.toolTipPoint = drawTooltips.toolTipPoint;
+                    m_drawTool.toolTipMultipointStart = drawTooltips.toolTipMultipointStart;
+                    m_drawTool.toolTipMultipointEnd = drawTooltips.toolTipMultipointEnd;
+                    m_drawTool.toolTipPolyStart = drawTooltips.toolTipPolyStart;
+                    m_drawTool.toolTipPolyContinue = drawTooltips.toolTipPolyContinue;
+                    m_drawTool.toolTipPolyEnd = drawTooltips.toolTipPolyEnd;
+
                     // reset symbology
                     m_drawTool.markerSymbol = new SimpleMarkerSymbol;
                     m_drawTool.lineSymbol = new SimpleLineSymbol;
                     m_drawTool.fillSymbol = new SimpleFillSymbol(SimpleFillSymbol.STYLE_SOLID, 0, 0.5, new SimpleLineSymbol);
+
                     if (symbol)
                     {
                         if (symbol is TextSymbol || symbol is SimpleMarkerSymbol || symbol is PictureMarkerSymbol)
@@ -1503,6 +1514,8 @@ Class used to configure the viewer map component (including layers) and handle m
                         }
                     }
 
+                    m_drawTool.activate(tool, enableGraphicsLayerMouseEvents);
+
                     //map.zoomSliderVisible = true;
                     AppEvent.setStatus(status);
                 }

From 061e35c463d6c8754bce0934bc1c719684dcbf20 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Mon, 4 Aug 2014 17:40:18 -0700
Subject: [PATCH 07/14] Issue #224: Honor showInLegend &
 showInLegendHiddenLayers in Print widget.

---
 src/widgets/Print/ExportWebMapForm.mxml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/widgets/Print/ExportWebMapForm.mxml b/src/widgets/Print/ExportWebMapForm.mxml
index fa9385b..5fbaa13 100644
--- a/src/widgets/Print/ExportWebMapForm.mxml
+++ b/src/widgets/Print/ExportWebMapForm.mxml
@@ -134,7 +134,9 @@
 
                 for each (var layer:Layer in hostBaseWidget.map.layers)
                 {
-                    if (layer.name.indexOf("hiddenLayer_") == -1 && !(layer is GraphicsLayer && !(layer is FeatureLayer)))
+                    if (layer.showInLegend &&
+                        layer.name.indexOf("hiddenLayer_") == -1 &&
+                        !(layer is GraphicsLayer && !(layer is FeatureLayer)))
                     {
                         var isBaseMapLayer:Boolean = false;
                         for each (var baseMapLayer:Object in hostBaseWidget.configData.basemaps)
@@ -171,6 +173,13 @@
                                     }
                                 }
                             }
+
+                            var showInLegendHiddenLayers:Array = layer["showInLegendHiddenLayers"];
+                            if (showInLegendHiddenLayers)
+                            {
+                                excludedSublayers = excludedSublayers.concat(showInLegendHiddenLayers);
+                            }
+
                             if (!isExcludedLayer)
                             {
                                 var legendLayer:LegendLayer = new LegendLayer();

From 736d138849be62eef46b890a87374973b4e60a6e Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Tue, 26 Aug 2014 09:39:37 -0700
Subject: [PATCH 08/14] Issue #258: Prevent edit tool handlers from being
 processed when the map is clicked.

---
 src/widgets/Draw/DrawWidget.mxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/Draw/DrawWidget.mxml b/src/widgets/Draw/DrawWidget.mxml
index 8e655ee..7c7242f 100644
--- a/src/widgets/Draw/DrawWidget.mxml
+++ b/src/widgets/Draw/DrawWidget.mxml
@@ -934,7 +934,7 @@
             private function map_mouseDownHandler(event:MouseEvent):void
             {
                 map.removeEventListener(MouseEvent.MOUSE_DOWN, map_mouseDownHandler);
-                map.addEventListener(MouseEvent.MOUSE_UP, map_mouseUpHandler);
+                map.addEventListener(MouseEvent.MOUSE_UP, map_mouseUpHandler, false, 1000);
                 map.addEventListener(MouseEvent.MOUSE_MOVE, map_mouseMoveHandler);
             }
 

From 1258c41b3e07322e8bb503666a1522a3b5eea6e4 Mon Sep 17 00:00:00 2001
From: Bjorn Svensson <bsvensson@esri.com>
Date: Thu, 9 Oct 2014 17:50:52 -0700
Subject: [PATCH 09/14] Issue #238: Update viewer localized files for 3.7

---
 locale/ar/ViewerStrings.properties    |  3 ++-
 locale/da_DK/ViewerStrings.properties |  3 ++-
 locale/de_DE/ViewerStrings.properties |  5 +++--
 locale/es_ES/ViewerStrings.properties |  3 ++-
 locale/et_EE/ViewerStrings.properties |  3 ++-
 locale/fi_FI/ViewerStrings.properties |  3 ++-
 locale/fr_FR/ViewerStrings.properties |  3 ++-
 locale/he_IL/ViewerStrings.properties |  3 ++-
 locale/it_IT/ViewerStrings.properties |  3 ++-
 locale/ja_JP/ViewerStrings.properties |  3 ++-
 locale/ko_KR/ViewerStrings.properties | 11 ++++++-----
 locale/lt_LT/ViewerStrings.properties |  3 ++-
 locale/lv_LV/ViewerStrings.properties |  3 ++-
 locale/nb_NO/ViewerStrings.properties |  3 ++-
 locale/nl_NL/ViewerStrings.properties |  3 ++-
 locale/pl_PL/ViewerStrings.properties |  3 ++-
 locale/pt_BR/ViewerStrings.properties |  5 +++--
 locale/pt_PT/ViewerStrings.properties |  3 ++-
 locale/ro_RO/ViewerStrings.properties |  3 ++-
 locale/ru_RU/ViewerStrings.properties |  3 ++-
 locale/sv_SE/ViewerStrings.properties |  3 ++-
 locale/zh_CN/ViewerStrings.properties |  7 ++++---
 22 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/locale/ar/ViewerStrings.properties b/locale/ar/ViewerStrings.properties
index 0ada156..f7d08ce 100644
--- a/locale/ar/ViewerStrings.properties
+++ b/locale/ar/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=حول ArcGIS Viewer for Flex...
-aboutText=يستخدم هذا التطبيق ArcGIS Viewer for Flex version 3.6.
+aboutText=يستخدم هذا التطبيق ArcGIS Viewer for Flex الإصدار 3.7.
 aboutLearnMoreBtn=تعلم المزيد
 aboutCloseBtn=إغلاق
 
@@ -117,6 +117,7 @@ uploadUnknownError=حدث خطأ غير معروف أثناء تحميل الم
 couldNotProcessUploadResponse=تعذرت معالجة تحميل الاستجابة الكاملة.
 fileExceedsAllowedUploadSize=تجاوز الملف الحد الأقصى المسموح به لحجم التحميل. ({0} ميجابايت)
 fileUploadError=حدث خطأ أثناء تحميل الملف
+gpTaskFailed=فشلت مهمة المعالجة الجغرافية: {0}
 
 
 configFileCrossDomain=مشكلة محتملة عبر المجالات: {0}{1}
diff --git a/locale/da_DK/ViewerStrings.properties b/locale/da_DK/ViewerStrings.properties
index 4939c9c..8b63d6e 100644
--- a/locale/da_DK/ViewerStrings.properties
+++ b/locale/da_DK/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Denne applikation bruger ArcGIS Viewer for Flex version 3.6.
+aboutText=Denne applikation bruger ArcGIS Viewer for Flex version 3.7.
 aboutLearnMoreBtn=Lær mere
 aboutCloseBtn=Luk
 
@@ -117,6 +117,7 @@ uploadUnknownError=Der opstod en ukendt fejl under overførsel af fil.
 couldNotProcessUploadResponse=Kunne ikke behandle komplet respons for overførsel.
 fileExceedsAllowedUploadSize=Fil overskrider den maksimalt tilladte størrelse, som kan overføres ({0} MB).
 fileUploadError=Fejl ved overførsel af fil
+gpTaskFailed=Geoprocesseringsopgave mislykkedes: {0}
 
 
 configFileCrossDomain=Muligt tværdomæneproblem: {0}{1}
diff --git a/locale/de_DE/ViewerStrings.properties b/locale/de_DE/ViewerStrings.properties
index 37d7242..4091ca6 100644
--- a/locale/de_DE/ViewerStrings.properties
+++ b/locale/de_DE/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Info zu ArcGIS Viewer for Flex...
-aboutText=Diese Anwendung verwendet ArcGIS Viewer for Flex 3.6.
+aboutText=Diese Anwendung verwendet ArcGIS Viewer for Flex 3.7.
 aboutLearnMoreBtn=Weitere Informationen
 aboutCloseBtn=Schließen
 
@@ -117,6 +117,7 @@ uploadUnknownError=Beim Hochladen der Datei ist ein unbekannter Fehler aufgetret
 couldNotProcessUploadResponse=Die Antwort beim Hochladen konnte nicht vollständig verarbeitet werden.
 fileExceedsAllowedUploadSize=Die Datei überschreitet die maximal zulässige Größe beim Hochladen. ({0} MB)
 fileUploadError=Fehler beim Hochladen der Datei.
+gpTaskFailed=Geoverarbeitungs-Task fehlgeschlagen: {0}
 
 
 configFileCrossDomain=Mögliches domänenübergreifendes Problem: {0} {1}
@@ -266,7 +267,7 @@ showRelatedRecordsText=Zugehörige Datensätze
 showAttributesText=Zurück
 selectTemplateText=Vorlage zur Feature-Erstellung auswählen
 noEditableLayersText=Keine editierbaren Layer.
-noCreateCapabilityLayersText=Kein Layer verfügt über die Funktion "Erstellen"
+noCreateCapabilityLayersText=Kein Layer verfügt über Erstellen-Funktion
 layerNotSupportingAttachmentsText=Dieser Layer unterstützt keine Anlagen
 noAttachmentsText=Keine Anlagen
 chooseFileText=Datei als Anlage wählen
diff --git a/locale/es_ES/ViewerStrings.properties b/locale/es_ES/ViewerStrings.properties
index a1661ed..3069dd7 100644
--- a/locale/es_ES/ViewerStrings.properties
+++ b/locale/es_ES/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Acerca de ArcGIS Viewer for Flex...
-aboutText=Esta aplicación utiliza ArcGIS Viewer 3.5 for Flex.
+aboutText=Esta aplicación utiliza ArcGIS Viewer for Flex versión 3.7.
 aboutLearnMoreBtn=Más información
 aboutCloseBtn=Cerrar
 
@@ -117,6 +117,7 @@ uploadUnknownError=Ha ocurrido un error desconocido mientras se cargaba el archi
 couldNotProcessUploadResponse=No se pudo procesar la respuesta de carga completa.
 fileExceedsAllowedUploadSize=El archivo supera el tamaño de carga máximo permitido. ({0} MB)
 fileUploadError=Error de carga de archivo
+gpTaskFailed=La tarea de geoprocesamiento ha generado un error: {0}
 
 
 configFileCrossDomain=Posible problema de crossdomain: {0}{1}
diff --git a/locale/et_EE/ViewerStrings.properties b/locale/et_EE/ViewerStrings.properties
index 131554a..f4f68e0 100644
--- a/locale/et_EE/ViewerStrings.properties
+++ b/locale/et_EE/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=ArcGIS Viewer for Flex rakendusest...
-aboutText=Antud rakendus kasutab ArcGIS Viewer for Flex 3.6 versiooni.
+aboutText=Antud rakendus kasutab ArcGIS Viewer for Flex 3.7 versiooni.
 aboutLearnMoreBtn=Loe lähemalt
 aboutCloseBtn=Sulge
 
@@ -117,6 +117,7 @@ uploadUnknownError=Faili üleslaadimisel tekkis tundmatu viga.
 couldNotProcessUploadResponse=Üleslaadimise täieliku vastuse käsitlemine ebaõnnestus.
 fileExceedsAllowedUploadSize=Fail ületab maksimaalselt lubatud mahtu. ({0} MB)
 fileUploadError=Faili üleslaadimise viga
+gpTaskFailed=Geoprocessing task failed: {0}
 
 
 configFileCrossDomain=Võimalik crossdomain probleem: {0}{1}
diff --git a/locale/fi_FI/ViewerStrings.properties b/locale/fi_FI/ViewerStrings.properties
index a04a83a..19035d1 100755
--- a/locale/fi_FI/ViewerStrings.properties
+++ b/locale/fi_FI/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Tietoja: ArcGIS Viewer for Flex...
-aboutText=Tämä sovellus käyttää ArcGIS Viewer for Flex -versiota 3.6.
+aboutText=Tämä sovellus käyttää ArcGIS Viewer for Flex -versiota 3.7.
 aboutLearnMoreBtn=Lisätietoja
 aboutCloseBtn=Sulje
 
@@ -117,6 +117,7 @@ uploadUnknownError=Tuntematon virhe lähetettäessä tiedostoa.
 couldNotProcessUploadResponse=Lähetyksen valmistumisvastauksen käsittely epäonnistui.
 fileExceedsAllowedUploadSize=Tiedosto ylittää lähetettävien tiedostojen enimmäiskoon. ({0} Mt)
 fileUploadError=Tiedoston lähetysvirhe
+gpTaskFailed=Geoprosessointi epäonnistui: {0}
 
 
 configFileCrossDomain=Mahdollinen toimialueiden välinen ongelma: {0}{1}
diff --git a/locale/fr_FR/ViewerStrings.properties b/locale/fr_FR/ViewerStrings.properties
index 236fc82..6cb2c74 100644
--- a/locale/fr_FR/ViewerStrings.properties
+++ b/locale/fr_FR/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=A propos d’ArcGIS Viewer for Flex...
-aboutText=Cette application utilise ArcGIS Viewer for Flex version 3.6.
+aboutText=Cette application utilise ArcGIS Viewer for Flex version 3.7.
 aboutLearnMoreBtn=En savoir plus
 aboutCloseBtn=Fermer
 
@@ -117,6 +117,7 @@ uploadUnknownError=Une erreur inconnue s’est produite durant le téléchargeme
 couldNotProcessUploadResponse=Impossible de traiter la réponse complète du téléchargement.
 fileExceedsAllowedUploadSize=Le fichier dépasse la taille de téléchargement maximale autorisée. ({0} Mo)
 fileUploadError=Erreur de téléchargement du fichier
+gpTaskFailed=Echec de la tâche de géotraitement : {0}
 
 
 configFileCrossDomain=Problème possible de domaines croisés : {0}{1}
diff --git a/locale/he_IL/ViewerStrings.properties b/locale/he_IL/ViewerStrings.properties
index 39d2404..255890c 100644
--- a/locale/he_IL/ViewerStrings.properties
+++ b/locale/he_IL/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=אודות ArcGIS Viewer for Flex...
-aboutText=אפליקציה זו משתמשת ב- ArcGIS Viewer 3.6 for Flex.
+aboutText=אפליקציה זו משתמשת ב-ArcGIS Viewer for Flex גרסה 3.7.
 aboutLearnMoreBtn=לימוד נוסף
 aboutCloseBtn=סגור
 
@@ -117,6 +117,7 @@ uploadUnknownError=שגיאה לא ידועה ארעה בזמן העלאת הק
 couldNotProcessUploadResponse=לא ניתן לעבד את התגובה לסיום תהליך ההעלאה.
 fileExceedsAllowedUploadSize=גודל הקובץ עולה על הגודל המקסימלי המותר בטעינה. ({0} MB)
 fileUploadError=שגיאה בטעינת קובץ
+gpTaskFailed=משימת עיבוד גיאוגרפי (Geoprocessing) נכשלה: {0}
 
 
 configFileCrossDomain=כנראה נושא crossdomain : {0}{1}
diff --git a/locale/it_IT/ViewerStrings.properties b/locale/it_IT/ViewerStrings.properties
index bff3db9..39df9f3 100644
--- a/locale/it_IT/ViewerStrings.properties
+++ b/locale/it_IT/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Informazioni su ArcGIS Viewer for Flex...
-aboutText=Questa applicazione utilizza ArcGIS Viewer per Flex versione 3.6.
+aboutText=Questa applicazione utilizza ArcGIS Viewer for Flex versione 3.7.
 aboutLearnMoreBtn=Ulteriori informazioni
 aboutCloseBtn=Chiudi
 
@@ -117,6 +117,7 @@ uploadUnknownError=Si è verificato un errore sconosciuto durante il caricamento
 couldNotProcessUploadResponse=Impossibile elaborare la risposta per il completamento del caricamento.
 fileExceedsAllowedUploadSize=La dimensione del file supera quella massima consentita. ({0} MB)
 fileUploadError=Errore di caricamento file
+gpTaskFailed=Attività di geoprocessing non riuscita: {0}
 
 
 configFileCrossDomain=Possibile problema di crossdomain: {0}{1}
diff --git a/locale/ja_JP/ViewerStrings.properties b/locale/ja_JP/ViewerStrings.properties
index e65ae7e..de8ad04 100644
--- a/locale/ja_JP/ViewerStrings.properties
+++ b/locale/ja_JP/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=ArcGIS Viewer for Flex について...
-aboutText=このアプリケーションは、ArcGIS Viewer 3.6 for Flex を使用しています。
+aboutText=このアプリケーションは、ArcGIS Viewer 3.7 for Flex を使用しています。
 aboutLearnMoreBtn=詳細
 aboutCloseBtn=閉じる
 
@@ -117,6 +117,7 @@ uploadUnknownError=ファイルのアップロード中に原因不明のエラ
 couldNotProcessUploadResponse=アップロード完了応答を処理できませんでした。
 fileExceedsAllowedUploadSize=ファイルが最大アップロード可能サイズ ({0} MB) を超えています。
 fileUploadError=ファイル アップロード エラー
+gpTaskFailed=ジオプロセシング タスクが失敗しました: {0}
 
 
 configFileCrossDomain=考えられるクロスドメインの問題: {0}{1}
diff --git a/locale/ko_KR/ViewerStrings.properties b/locale/ko_KR/ViewerStrings.properties
index c445689..6ee96ce 100644
--- a/locale/ko_KR/ViewerStrings.properties
+++ b/locale/ko_KR/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=ArcGIS Viewer for Flex 정보...
-aboutText=이 응용프로그램은 ArcGIS Viewer 3.6 for Flex를 사용하고 있습니다.
+aboutText=이 응용프로그램은 ArcGIS Viewer for Flex 버전 3.7을 사용합니다.
 aboutLearnMoreBtn=자세히 보기
 aboutCloseBtn=닫기
 
@@ -117,6 +117,7 @@ uploadUnknownError=파일을 업로드하는 중에 알 수 없는 오류가 발
 couldNotProcessUploadResponse=업로드 완료 응답을 처리할 수 없습니다.
 fileExceedsAllowedUploadSize=파일이 허용되는 최대 업로드 크기({0}MB)를 초과했습니다.
 fileUploadError=파일 업로드 오류
+gpTaskFailed=지오프로세싱 작업 실패: {0}
 
 
 configFileCrossDomain=가능한 교차 도메인 문제: {0}{1}
@@ -225,7 +226,7 @@ fillOutlineWidthLabel=너비
 showMeasurementsLabel=단위 표시
 distanceUnitsLabel=거리 단위
 areaUnitsLabel=면적 단위
-areaLabel=영역:
+areaLabel=면적:
 perimeterLabel=둘레:
 lengthLabel=길이:
 
@@ -235,7 +236,7 @@ addbookmarksLabel=책갈피 추가
 addLabel=현재 범위를 지정된 책갈피로 추가
 bookmarkSubmitLabel=책갈피 추가
 bookmarkMissingNameLabel=책갈피 이름을 입력하세요.
-deleteBookmarkTooltip=북마크 삭제
+deleteBookmarkTooltip=책갈피 삭제
 
 
 descLabel=데이터 추출 및 zip 파일 다운로드
@@ -270,7 +271,7 @@ noCreateCapabilityLayersText=레이어에 생성 기능 없음
 layerNotSupportingAttachmentsText=이 레이어는 첨부 파일을 지원하지 않습니다
 noAttachmentsText=첨부 파일 없음
 chooseFileText=첨부할 파일 선택
-attachmentSubmitLabel=보고
+attachmentSubmitLabel=제출
 attachmentCancelLabel=취소
 singleAttachmentText=피처에 {0} 첨부 파일이 있습니다.
 multipleAttachmentsText=피처에 {0} 첨부 파일이 있습니다.
@@ -342,7 +343,7 @@ latitudeLabel=위도
 longitudeLabel=경도
 
 
-gpSubmitLabel=보고
+gpSubmitLabel=제출
 inputLabel=입력
 helpLabel=도움말
 outputLabel=출력
diff --git a/locale/lt_LT/ViewerStrings.properties b/locale/lt_LT/ViewerStrings.properties
index cfd1288..b0184b3 100644
--- a/locale/lt_LT/ViewerStrings.properties
+++ b/locale/lt_LT/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Apie ArcGIS Viewer for Flex...
-aboutText=Aplikacija naudoja ArcGIS Viewer for Flex 3.6 versiją.
+aboutText=Aplikacija naudoja ArcGIS Viewer for Flex 3.7 versiją.
 aboutLearnMoreBtn=Plačiau
 aboutCloseBtn=Uždaryti
 
@@ -117,6 +117,7 @@ uploadUnknownError=Nežinoma klaida įkeliant failą.
 couldNotProcessUploadResponse=Negalima apdoroti įkėlimo pabaigos pranešimo.
 fileExceedsAllowedUploadSize=Didesnis nei leidžiamas įkeliamo failo dydis. ({0} MB)
 fileUploadError=Failo įkėlimo klaida
+gpTaskFailed=Geoprocessing task failed: {0}
 
 
 configFileCrossDomain=Galima skirtingų domenų problema: {0}{1}
diff --git a/locale/lv_LV/ViewerStrings.properties b/locale/lv_LV/ViewerStrings.properties
index eb14e9b..1610d0c 100644
--- a/locale/lv_LV/ViewerStrings.properties
+++ b/locale/lv_LV/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Par ArcGIS Viewer for Flex...
-aboutText=Šī aplikācija izmanto ArcGIS Viewer 3.6 for Flex.
+aboutText=Šī aplikācija izmanto ArcGIS Viewer 3.7 for Flex.
 aboutLearnMoreBtn=Uzziniet vairāk
 aboutCloseBtn=Aizvērt
 
@@ -117,6 +117,7 @@ uploadUnknownError=Nezināma kļūda augšupielādējot failu.
 couldNotProcessUploadResponse=Nevarēja augšupielādēt pilnīgu atbildi.
 fileExceedsAllowedUploadSize=Fails pārsniedz maksimāli atļauto augšupielādes lielumu. ({0} MB)
 fileUploadError=Faila augšupielādes kļūda
+gpTaskFailed=Geoprocessing task failed: {0}
 
 
 configFileCrossDomain=Iespējams šķērsdomēna jautājums: {0}{1}
diff --git a/locale/nb_NO/ViewerStrings.properties b/locale/nb_NO/ViewerStrings.properties
index 196fefd..d91e470 100644
--- a/locale/nb_NO/ViewerStrings.properties
+++ b/locale/nb_NO/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Dette programmet bruker ArcGIS Viewer for Flex versjon 3.6.
+aboutText=Dette programmet bruker ArcGIS Viewer for Flex versjon 3.7.
 aboutLearnMoreBtn=Lær mer
 aboutCloseBtn=Lukk
 
@@ -117,6 +117,7 @@ uploadUnknownError=Det oppstod en ukjent feil under opplasting av filen.
 couldNotProcessUploadResponse=Kunne ikke behandle opplasting fullført-responsen.
 fileExceedsAllowedUploadSize=Filen overstiger maks. tillatt opplastingsstørrelse. ({0} MB)
 fileUploadError=Feil ved filopplasting
+gpTaskFailed=Geoprosesseringsoppgaven mislyktes: {0}
 
 
 configFileCrossDomain=Mulig kryssdomeneproblem: {0}{1}
diff --git a/locale/nl_NL/ViewerStrings.properties b/locale/nl_NL/ViewerStrings.properties
index 1d4d1ca..79f6a75 100644
--- a/locale/nl_NL/ViewerStrings.properties
+++ b/locale/nl_NL/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Informatie over ArcGIS Viewer for Flex...
-aboutText=Deze applicatie maakt gebruikt van ArcGIS Viewer for Flex 3.6.
+aboutText=Deze applicatie maakt gebruikt van ArcGIS Viewer for Flex 3.7.
 aboutLearnMoreBtn=Meer informatie
 aboutCloseBtn=Sluiten
 
@@ -117,6 +117,7 @@ uploadUnknownError=Onbekende fout opgetreden tijdens het uploaden van het bestan
 couldNotProcessUploadResponse=Kan antwoord voor voltooien van upload niet verwerken.
 fileExceedsAllowedUploadSize=Bestand overschrijdt maximaal toegestane uploadgrootte. ({0} MB)
 fileUploadError=Fout tijdens uploaden van bestand
+gpTaskFailed=Geoprocessingtaak mislukt: {0}
 
 
 configFileCrossDomain=Mogelijk probleem tussen domeinen: {0}{1}
diff --git a/locale/pl_PL/ViewerStrings.properties b/locale/pl_PL/ViewerStrings.properties
index e70d957..1d7266b 100644
--- a/locale/pl_PL/ViewerStrings.properties
+++ b/locale/pl_PL/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=O aplikacji ArcGIS Viewer for Flex...
-aboutText=Ta aplikacja używa ArcGIS Viewer for Flex w wersji 3.6.
+aboutText=Ta aplikacja używa ArcGIS Viewer for Flex w wersji 3.7.
 aboutLearnMoreBtn=Dowiedz się więcej
 aboutCloseBtn=Zamknij
 
@@ -117,6 +117,7 @@ uploadUnknownError=Podczas wczytywania pliku wystąpił nieznany błąd.
 couldNotProcessUploadResponse=Przetwarzanie komunikatu o zakończeniu wczytywania nie powiodło się.
 fileExceedsAllowedUploadSize=Rozmiar pliku przekracza maksymalną dopuszczalną wartość. ({0} MB)
 fileUploadError=Błąd podczas wczytywania pliku
+gpTaskFailed=Niepowodzenie zadania geoprzetwarzania: {0}
 
 
 configFileCrossDomain=Możliwy problem z ruchem międzydomenowym: {0}{1}
diff --git a/locale/pt_BR/ViewerStrings.properties b/locale/pt_BR/ViewerStrings.properties
index 874c803..799dd03 100644
--- a/locale/pt_BR/ViewerStrings.properties
+++ b/locale/pt_BR/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Sobre o ArcGIS Viewer for Flex...
-aboutText=Este aplicativo está utilizando ArcGIS Viewer for Flex versão 3.6.
+aboutText=Este aplicativo está utilizando ArcGIS Viewer for Flex versão 3.7.
 aboutLearnMoreBtn=Obter mais informações
 aboutCloseBtn=Fechar
 
@@ -117,9 +117,10 @@ uploadUnknownError=Erro desconhecido ao transferir arquivo.
 couldNotProcessUploadResponse=Não foi possível processar a resposta completa da transferência.
 fileExceedsAllowedUploadSize=O arquivo excedeu o tamanho máximo de transferência permitido. ({0} MB)
 fileUploadError=Erro ao carregar arquivo
+gpTaskFailed=A tarefa de geoprocessamento falhou: {0}
 
 
-configFileCrossDomain=Possível problema de inter-domínio: {0}{1}
+configFileCrossDomain=Possível problema de domínio cruzado: {0}{1}
 
 
 openToolTip=Clique para abrir um mapa de visão geral
diff --git a/locale/pt_PT/ViewerStrings.properties b/locale/pt_PT/ViewerStrings.properties
index b32655e..2348d21 100644
--- a/locale/pt_PT/ViewerStrings.properties
+++ b/locale/pt_PT/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Sobre o ArcGIS Viewer for Flex...
-aboutText=Esta aplicação utiliza o ArcGIS Viewer 3.6 for Flex.
+aboutText=Esta aplicação utiliza o ArcGIS Viewer for Flex versão 3.7.
 aboutLearnMoreBtn=Obter mais informações
 aboutCloseBtn=Fechar
 
@@ -117,6 +117,7 @@ uploadUnknownError=Ocorreu um erro desconhecido durante o carregamento do fichei
 couldNotProcessUploadResponse=Não foi possível processar a resposta de carregamento concluído.
 fileExceedsAllowedUploadSize=O ficheiro excede o tamanho de carregamento máximo permitido. ({0} MB)
 fileUploadError=Erro no carregamento do ficheiro
+gpTaskFailed=Falha na tarefa de geoprocessamento: {0}
 
 
 configFileCrossDomain=Possível problema de crossdomain: {0}{1}
diff --git a/locale/ro_RO/ViewerStrings.properties b/locale/ro_RO/ViewerStrings.properties
index 5ca0cfd..8627ab4 100644
--- a/locale/ro_RO/ViewerStrings.properties
+++ b/locale/ro_RO/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Despre ArcGIS Viewer for Flex...
-aboutText=Această aplicaţie utilizează ArcGIS Viewer 3.6 for Flex.
+aboutText=Această aplicaţie utilizează ArcGIS Viewer 3.7 for Flex.
 aboutLearnMoreBtn=Aflaţi mai multe
 aboutCloseBtn=Închidere
 
@@ -117,6 +117,7 @@ uploadUnknownError=A survenit o eroare necunoscută în timpul încărcării fi
 couldNotProcessUploadResponse=Nu a putut fi procesat răspunsul de finalizare a încărcării.
 fileExceedsAllowedUploadSize=Fişierul depăşeşte dimensiunea maximă permisă pentru încărcare. ({0} MB)
 fileUploadError=Eroare la încărcarea fişierului
+gpTaskFailed=Operaţia de geoprocesare a eşuat: {0}
 
 
 configFileCrossDomain=Posibilă problemă interdomenii: {0}{1}
diff --git a/locale/ru_RU/ViewerStrings.properties b/locale/ru_RU/ViewerStrings.properties
index dd2821c..f45df3c 100644
--- a/locale/ru_RU/ViewerStrings.properties
+++ b/locale/ru_RU/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=О программе ArcGIS Viewer for Flex...
-aboutText=Данное приложение использует ArcGIS Viewer 3.6 for Flex.
+aboutText=Данное приложение использует ArcGIS Viewer for Flex версии  3.7.
 aboutLearnMoreBtn=См. Справку
 aboutCloseBtn=Закрыть
 
@@ -117,6 +117,7 @@ uploadUnknownError=Произошла неизвестная ошибка при
 couldNotProcessUploadResponse=Не удалось провести загрузку полного ответа.
 fileExceedsAllowedUploadSize=Файл превышает максимально допустимый размер загрузки. ({0} МБ)
 fileUploadError=Ошибка загрузки файла
+gpTaskFailed=Задача геообработки не выполнена: {0}
 
 
 configFileCrossDomain=Возможная ошибка междоменного запроса: {0}{1}
diff --git a/locale/sv_SE/ViewerStrings.properties b/locale/sv_SE/ViewerStrings.properties
index d084c9e..944e71c 100644
--- a/locale/sv_SE/ViewerStrings.properties
+++ b/locale/sv_SE/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Det här programmet använder ArcGIS Viewer 3.6 for Flex.
+aboutText=Det här programmet använder ArcGIS Viewer 3.7 for Flex.
 aboutLearnMoreBtn=Läs mer
 aboutCloseBtn=Stäng
 
@@ -117,6 +117,7 @@ uploadUnknownError=Okänt fel uppstod när filen överfördes.
 couldNotProcessUploadResponse=Det gick inte att bearbeta svaret för slutförd överföring.
 fileExceedsAllowedUploadSize=Filen är större än den maximala tillåtna överföringsstorleken. ({0} MB)
 fileUploadError=Fel vid filöverföring
+gpTaskFailed=Geobearbetningsåtgärd misslyckades: {0}
 
 
 configFileCrossDomain=Möjligt korsdomänproblem: {0}{1}
diff --git a/locale/zh_CN/ViewerStrings.properties b/locale/zh_CN/ViewerStrings.properties
index e75b4e8..6e2bc18 100644
--- a/locale/zh_CN/ViewerStrings.properties
+++ b/locale/zh_CN/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=关于 ArcGIS Viewer for Flex...
-aboutText=此应用程序使用 ArcGIS Viewer 3.6 for Flex 构建而成。
+aboutText=此应用程序使用 ArcGIS Viewer for Flex 3.7 版构建而成。
 aboutLearnMoreBtn=了解更多信息
 aboutCloseBtn=关闭
 
@@ -104,7 +104,7 @@ rssFeedParsingError=解析 RSS feed 时出现问题。{0}
 httpResponseNotXMLError=HTTP 响应不是 XML。
 unknownRSSFeedTypeError=无法确定 RSS feed 类型。
 initializationError=初始化 {0} 时出现问题
-unableToDetermineGPExecutionType=无法确定 Geoprocessing 执行类型：
+unableToDetermineGPExecutionType=无法确定地理处理执行类型：
 projectionError=对几何 {0} 进行投影时出错
 cannotRunTaskExecutionTypeUnknownError=无法运行任务：未知的执行类型。
 layerDataRetrievalError=无法检索图层数据。
@@ -117,6 +117,7 @@ uploadUnknownError=上传文件时出现未知错误。
 couldNotProcessUploadResponse=无法处理上传完成响应。
 fileExceedsAllowedUploadSize=文件超出允许的最大上传大小。({0} MB)
 fileUploadError=文件上传错误
+gpTaskFailed=地理处理任务失败: {0}
 
 
 configFileCrossDomain=可能发生跨域问题: {0}{1}
@@ -240,7 +241,7 @@ deleteBookmarkTooltip=删除书签
 
 descLabel=提取数据并保存为 zip 文件
 step1Label=选择区域
-dataCurrentExtentLabel=Data will be extracted from your current extent.
+dataCurrentExtentLabel=将从当前范围提取数据。
 step2Label=选择要提取的图层
 step3Label=选择文件格式
 step4Label=选择栅格格式

From 6c389b0591290495d9b6ad7899634dc2b3b0383d Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Thu, 23 Oct 2014 15:14:22 -0700
Subject: [PATCH 10/14] Issue #224: Check for showInLegendHiddenLayers only
 when relevant.

---
 src/widgets/Print/ExportWebMapForm.mxml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/widgets/Print/ExportWebMapForm.mxml b/src/widgets/Print/ExportWebMapForm.mxml
index 5fbaa13..7dd905a 100644
--- a/src/widgets/Print/ExportWebMapForm.mxml
+++ b/src/widgets/Print/ExportWebMapForm.mxml
@@ -174,10 +174,13 @@
                                 }
                             }
 
-                            var showInLegendHiddenLayers:Array = layer["showInLegendHiddenLayers"];
-                            if (showInLegendHiddenLayers)
+                            if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
                             {
-                                excludedSublayers = excludedSublayers.concat(showInLegendHiddenLayers);
+                                var showInLegendHiddenLayers:Array = layer["showInLegendHiddenLayers"];
+                                if (showInLegendHiddenLayers)
+                                {
+                                    excludedSublayers = excludedSublayers.concat(showInLegendHiddenLayers);
+                                }
                             }
 
                             if (!isExcludedLayer)

From c5e5508577efabd6137c75857339380bfd3a10b9 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Thu, 30 Oct 2014 22:38:14 -0700
Subject: [PATCH 11/14] Issue #89: Improve TOC default swatches.

---
 src/assets/images/i_annotation.png            | Bin 0 -> 3823 bytes
 src/assets/images/i_dimension.png             | Bin 0 -> 3903 bytes
 src/assets/images/i_raster.png                | Bin 0 -> 4088 bytes
 src/assets/images/i_rastercatalog.png         | Bin 0 -> 3968 bytes
 .../toc/tocClasses/TocMapLayerItem.as         | 139 +++++++++++++++++-
 5 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100755 src/assets/images/i_annotation.png
 create mode 100755 src/assets/images/i_dimension.png
 create mode 100755 src/assets/images/i_raster.png
 create mode 100755 src/assets/images/i_rastercatalog.png

diff --git a/src/assets/images/i_annotation.png b/src/assets/images/i_annotation.png
new file mode 100755
index 0000000000000000000000000000000000000000..c92494e09277f28d2a904db5336957f4685ad2d6
GIT binary patch
literal 3823
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/i_dimension.png b/src/assets/images/i_dimension.png
new file mode 100755
index 0000000000000000000000000000000000000000..93f23508c9064e7b6c7ec95edf45cee8b5de2b11
GIT binary patch
literal 3903
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
N002ovPDHLkV1fiwR7(H=

literal 0
HcmV?d00001

diff --git a/src/assets/images/i_raster.png b/src/assets/images/i_raster.png
new file mode 100755
index 0000000000000000000000000000000000000000..58aeddb171f0e8f48a52824564dcad2687315c8e
GIT binary patch
literal 4088
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/i_rastercatalog.png b/src/assets/images/i_rastercatalog.png
new file mode 100755
index 0000000000000000000000000000000000000000..2eadc238980502d19945b4c62089f55eedbd70fc
GIT binary patch
literal 3968
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
a?*RZL?KHm7dL=0U0000<MNUMnLSTYi^m^j}

literal 0
HcmV?d00001

diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
index fcfae81..445c977 100644
--- a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
@@ -28,10 +28,12 @@ import com.esri.ags.layers.Layer;
 import com.esri.ags.layers.WMSLayer;
 import com.esri.ags.layers.supportClasses.KMLFeatureInfo;
 import com.esri.ags.layers.supportClasses.KMLFolder;
+import com.esri.ags.layers.supportClasses.LayerDetails;
 import com.esri.ags.layers.supportClasses.LayerInfo;
 import com.esri.ags.layers.supportClasses.LayerLegendInfo;
 import com.esri.ags.layers.supportClasses.LegendItemInfo;
 import com.esri.ags.layers.supportClasses.WMSLayerInfo;
+import com.esri.ags.symbols.PictureMarkerSymbol;
 import com.esri.viewer.ViewerContainer;
 import com.esri.viewer.components.toc.utils.MapUtil;
 import com.esri.viewer.utils.MapServiceUtil;
@@ -278,6 +280,17 @@ public class TocMapLayerItem extends TocItem
     private function getLegendResult(layerLegendInfos:Array, token:Object = null):void
     {
         _layerLegendInfos = [];
+
+        if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
+        {
+            var layerInfos:Array = layer["layerInfos"];
+            if (layerInfos)
+            {
+                var layerInfosWithNoLegend:Array = stripLayerInfosWithNoLegend(layerInfos, layerLegendInfos);
+                setUpExtraIcons(layerInfosWithNoLegend, this, layer);
+            }
+        }
+
         getLayerLegendInfos(layerLegendInfos); // get all layerLegendInfos as these can be nested
 
         createChildren();
@@ -287,7 +300,7 @@ public class TocMapLayerItem extends TocItem
     {
         for each (var layerLegendInfo:LayerLegendInfo in arr)
         {
-            if (layerLegendInfo) // check if layerLegendInfo exists
+            if (layerLegendInfo)
             {
                 _layerLegendInfos.push(layerLegendInfo);
                 if (layerLegendInfo.layerLegendInfos)
@@ -298,6 +311,130 @@ public class TocMapLayerItem extends TocItem
         }
     }
 
+    private function setUpExtraIcons(layerInfos:Array, parentTocItem:TocItem, layer:Layer):void
+    {
+        for each (var layerInfo:LayerInfo in layerInfos)
+        {
+            if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
+            {
+                layer["getDetails"](layerInfo.layerId,
+                                    new AsyncResponder(resultHandler,
+                                                       faultHandler,
+                                                       {
+                                                           parentTocItem: parentTocItem,
+                                                           layerId: layerInfo.layerId
+                                                       }));
+            }
+        }
+
+        function resultHandler(layerDetails:LayerDetails, token:Object = null):void
+        {
+            var tocItem:TocItem = getTocItemById(parentTocItem, layerDetails.id);
+            if (!tocItem)
+            {
+                return;
+            }
+
+            var resultType:String = layerDetails.type.toLowerCase();
+            var iconUrl:String;
+
+            if (resultType == "annotation sublayer") {
+                iconUrl = "assets/images/i_annotation.png";
+            } else if (resultType == "raster catalog layer") {
+                iconUrl = "assets/images/i_rastercatalog.png";
+            } else if (resultType == "dimension layer") {
+                iconUrl = "assets/images/i_dimension.png";
+            } else if (resultType == "raster layer") {
+                iconUrl = "assets/images/i_raster.png";
+            }
+
+            if (iconUrl)
+            {
+                tocItem.addChild(new TocLegendItem(tocItem, createLegendItemInfo(iconUrl)));
+            }
+        }
+
+        function createLegendItemInfo(iconUrl:String):LegendItemInfo
+        {
+            var legendItemInfo:LegendItemInfo = new LegendItemInfo();
+            legendItemInfo.symbol = new PictureMarkerSymbol(iconUrl, 20, 20);
+            return legendItemInfo;
+        }
+
+        function getTocItemById(parentTocMapItem:TocItem, id:Number):TocItem
+        {
+            var tocItemMatch:TocItem;
+            var infoItem:TocLayerInfoItem;
+
+            for each (var item:TocItem in parentTocMapItem.children) {
+                infoItem = item as TocLayerInfoItem;
+
+                if (infoItem) {
+                    if (infoItem.layerInfo.layerId == id) {
+                        tocItemMatch = infoItem;
+                        break;
+                    }
+                }
+            }
+
+            if (tocItemMatch)
+            {
+                return tocItemMatch;
+            }
+
+            for each (item in parentTocMapItem.children) {
+                if (item.children) {
+                    tocItemMatch = getTocItemById(item, id);
+                    if (tocItemMatch)
+                    {
+                        return tocItemMatch;
+                    }
+                }
+            }
+
+            return tocItemMatch;
+        }
+
+        function faultHandler(fault:Fault, token:Object = null):void
+        {
+            //do nothing
+        }
+    }
+
+    private function stripLayerInfosWithNoLegend(layerInfos:Array, layerLegendInfos:Array):Array
+    {
+        var layerInfosWithNoLegend:Array = layerInfos.concat();
+
+        for each (var layerLegendInfo:LayerLegendInfo in layerLegendInfos)
+        {
+            if (layerLegendInfo)
+            {
+                removeLayerInfoById(layerLegendInfo.layerId);
+                if (layerLegendInfo.layerLegendInfos)
+                {
+                    stripLayerInfosWithNoLegend(layerInfosWithNoLegend, layerLegendInfo.layerLegendInfos);
+                }
+            }
+        }
+
+        function removeLayerInfoById(layerId:String):void
+        {
+            var layerInfo:LayerInfo;
+            var totalLayerInfos:int = layerInfosWithNoLegend.length;
+
+            for (var i:int = 0; i < totalLayerInfos; i++) {
+                layerInfo = layerInfosWithNoLegend[i];
+
+                if (layerInfo.layerId.toString() == layerId) {
+                    layerInfosWithNoLegend.splice(i, 1);
+                    break;
+                }
+            }
+        }
+
+        return layerInfosWithNoLegend;
+    }
+
     private function getLegendFault(fault:Fault, token:Object = null):void
     {
         createChildren();

From 92762cd82b580430b48cf4e38e4acd1ac8d52dce Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Thu, 6 Nov 2014 11:50:05 -0800
Subject: [PATCH 12/14] Clean up.

---
 .../toc/tocClasses/TocMapLayerItem.as         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
index 445c977..b4cc697 100644
--- a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
@@ -317,13 +317,20 @@ public class TocMapLayerItem extends TocItem
         {
             if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
             {
-                layer["getDetails"](layerInfo.layerId,
-                                    new AsyncResponder(resultHandler,
-                                                       faultHandler,
-                                                       {
-                                                           parentTocItem: parentTocItem,
-                                                           layerId: layerInfo.layerId
-                                                       }));
+                var responder:AsyncResponder = new AsyncResponder(resultHandler, faultHandler);
+
+                var dynamicLayer:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
+                if(dynamicLayer)
+                {
+                    dynamicLayer.getDetails(layerInfo.layerId, responder);
+                    continue;
+                }
+
+                var tiledLayer:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
+                if(tiledLayer)
+                {
+                    tiledLayer.getDetails(layerInfo.layerId, responder);
+                }
             }
         }
 

From 513a32880944f830a66bf0d58e0aee1023eecf04 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Thu, 6 Nov 2014 13:42:16 -0800
Subject: [PATCH 13/14] Apply formatting.

---
 .../esri/viewer/components/toc/tocClasses/TocMapLayerItem.as  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
index b4cc697..cb845be 100644
--- a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
@@ -320,14 +320,14 @@ public class TocMapLayerItem extends TocItem
                 var responder:AsyncResponder = new AsyncResponder(resultHandler, faultHandler);
 
                 var dynamicLayer:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
-                if(dynamicLayer)
+                if (dynamicLayer)
                 {
                     dynamicLayer.getDetails(layerInfo.layerId, responder);
                     continue;
                 }
 
                 var tiledLayer:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
-                if(tiledLayer)
+                if (tiledLayer)
                 {
                     tiledLayer.getDetails(layerInfo.layerId, responder);
                 }

From 40c1f867b1fcf233afad2bb22418825f956ea112 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Thu, 6 Nov 2014 13:42:45 -0800
Subject: [PATCH 14/14] Clean up.

---
 .../toc/tocClasses/TocMapLayerItem.as         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
index cb845be..ca7fb20 100644
--- a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
@@ -281,16 +281,28 @@ public class TocMapLayerItem extends TocItem
     {
         _layerLegendInfos = [];
 
-        if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
+        var layerInfos:Array;
+
+        var dynamicLayer:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
+        if (dynamicLayer)
+        {
+            layerInfos = dynamicLayer.layerInfos;
+        }
+        else
         {
-            var layerInfos:Array = layer["layerInfos"];
-            if (layerInfos)
+            var tiledLayer:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
+            if (tiledLayer)
             {
-                var layerInfosWithNoLegend:Array = stripLayerInfosWithNoLegend(layerInfos, layerLegendInfos);
-                setUpExtraIcons(layerInfosWithNoLegend, this, layer);
+                layerInfos = tiledLayer.layerInfos;
             }
         }
 
+        if (layerInfos)
+        {
+            var layerInfosWithNoLegend:Array = stripLayerInfosWithNoLegend(layerInfos, layerLegendInfos);
+            setUpExtraIcons(layerInfosWithNoLegend, this, layer);
+        }
+
         getLayerLegendInfos(layerLegendInfos); // get all layerLegendInfos as these can be nested
 
         createChildren();