From 1334426d54e85bdafada40f2cea335a2190794cc Mon Sep 17 00:00:00 2001
From: Olov Karlsson <olov@vildmarksdata.se>
Date: Mon, 10 Nov 2014 15:06:20 +0100
Subject: [PATCH] wsp_10267, show progress dialog when expanding/collapsing
 nodes in import resources to hosting space

---
 .../WebsitePanel/SpaceImportResources.ascx    | 20 +++++++++----------
 .../WebsitePanel/SpaceImportResources.ascx.cs | 14 ++++++++++---
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx
index 3f1074af..fcba0a52 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx
@@ -1,14 +1,13 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SpaceImportResources.ascx.cs" Inherits="WebsitePanel.Portal.SpaceImportResources" %>
 <%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
-<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
 
 <script type="text/javascript">
     function TreeViewCheckBoxClicked(Check_Event) 
     {
         var objElement;
-        try 
-        {
-                objElement = window.event.srcElement;
+        try {
+            objElement = window.event.srcElement;
         }
         catch (Error) 
         {
@@ -16,18 +15,19 @@
 
         if (objElement != null) 
         {
-            if (objElement.tagName == "INPUT" && objElement.type == "checkbox") 
-            {
-                __doPostBack("", "");
+            if (objElement.tagName == "IMG" && objElement.href.indexOf('folder.png') == -1 && objElement.href.indexOf('empty.gif') == -1) {
+                ShowProgressDialog('');
+                ShowProgressDialogInternal();
             }
         }
         else 
         {
             if (Check_Event != null) 
             {
-                if (Check_Event.target.toString() == "[object HTMLInputElement]") 
+                if (Check_Event.target.tagName == "IMG" && Check_Event.target.href.indexOf('folder.png') == -1 && objElement.href.indexOf('empty.gif') == -1)
                 {
-                    __doPostBack("", "");
+                    ShowProgressDialog('');
+                    ShowProgressDialogInternal();
                 }
             }
         }
@@ -36,7 +36,7 @@
 
 <div class="FormBody">
 	<asp:treeview runat="server" id="tree" populatenodesfromclient="true" NodeIndent="10"
-		showexpandcollapse="true" expanddepth="0" ontreenodepopulate="tree_TreeNodePopulate" OnTreeNodeCheckChanged="tree_TreeNodeCheckChanged" >
+		showexpandcollapse="true" expanddepth="0" ontreenodepopulate="tree_TreeNodePopulate" OnTreeNodeCheckChanged="tree_TreeNodeCheckChanged" OnTreeNodeExpanded="tree_TreeNodeExpanded">
 		<LevelStyles>
 		    <asp:TreeNodeStyle CssClass="FileManagerTreeNode" />
 		    <asp:TreeNodeStyle CssClass="FileManagerTreeNode" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx.cs
index 96d0a521..a49d3620 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx.cs
@@ -49,9 +49,6 @@ namespace WebsitePanel.Portal
         
         protected void Page_Load(object sender, EventArgs e)
         {
-			// enable async tasks
-			//EnableAsyncTasksSupport();
-
             if (!IsPostBack)
             {
                 tree.Attributes.Add("onClick", "TreeViewCheckBoxClicked(event)");
@@ -71,6 +68,7 @@ namespace WebsitePanel.Portal
             rootNode = new TreeNode();
             rootNode.ImageUrl = PortalUtils.GetThemedImage("folder.png");
             rootNode.Text = GetLocalizedString("Text.Resources");
+            rootNode.SelectAction = TreeNodeSelectAction.None;
             rootNode.Value = "Root";
             rootNode.Expanded = true;
             tree.Nodes.Add(rootNode);
@@ -84,6 +82,7 @@ namespace WebsitePanel.Portal
                 node.Value = "-" + type.ItemTypeId.ToString();
                 node.Text = GetSharedLocalizedString("ServiceItemType." + type.DisplayName);
                 node.PopulateOnDemand = true;
+                node.SelectAction = TreeNodeSelectAction.None;
                 node.ImageUrl = PortalUtils.GetThemedImage("folder.png");
                 rootNode.ChildNodes.Add(node);
             }
@@ -93,6 +92,7 @@ namespace WebsitePanel.Portal
             node.Value = "+100";
             node.Text = GetSharedLocalizedString("ServiceItemType.HostHeader");
             node.PopulateOnDemand = true;
+            node.SelectAction = TreeNodeSelectAction.None;
             node.ImageUrl = PortalUtils.GetThemedImage("folder.png");
             rootNode.ChildNodes.Add(node);
 
@@ -113,6 +113,7 @@ namespace WebsitePanel.Portal
                     node.Text = item;
                     node.Value = itemTypeId.ToString() + "|" + item;
                     node.ShowCheckBox = true;
+                    node.SelectAction = TreeNodeSelectAction.None;
                     e.Node.ChildNodes.Add(node);
                 }
             }
@@ -130,6 +131,7 @@ namespace WebsitePanel.Portal
                         headerNode.Text = GetSharedLocalizedString("ServiceItemType.HostHeader");
                         headerNode.Value = "+" + itemTypeId.ToString();
                         headerNode.ShowCheckBox = true;
+                        headerNode.SelectAction = TreeNodeSelectAction.None;
                         e.Node.ChildNodes.Add(headerNode);
 
                         foreach (string item in items)
@@ -152,6 +154,7 @@ namespace WebsitePanel.Portal
                                 userNode.Text = objectData[0];
                                 userNode.Value = "+" + itemTypeId.ToString() + "|" + objectData[1];
                                 userNode.ShowCheckBox = true;
+                                userNode.SelectAction = TreeNodeSelectAction.None;
                                 headerNode.ChildNodes.Add(userNode);
                             }
 
@@ -159,6 +162,7 @@ namespace WebsitePanel.Portal
                             siteNode.Text = objectData[3];
                             siteNode.Value = "+" + itemTypeId.ToString() + "|" + item;
                             siteNode.ShowCheckBox = true;
+                            userNode.SelectAction = TreeNodeSelectAction.None;
                             userNode.ChildNodes.Add(siteNode);
                         }
 
@@ -238,5 +242,9 @@ namespace WebsitePanel.Portal
                 }
             }
         }
+
+        protected void tree_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
+        {
+        }
     }
 }
\ No newline at end of file