From 54ee8cfdc0a3560f5cbffacdd121272d730d35d7 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Tue, 6 Oct 2015 10:34:12 -0400
Subject: [PATCH] Update old dynatree usage to 1.0 standards, clean up some of
 the extra-chatty debugging and an invalid ajaxComplete attachment that we
 don't need.

---
 templates/admin/requests/select_datasets_to_transfer.mako | 3 +--
 templates/admin/tool_shed_repository/common.mako          | 8 +-------
 templates/webapps/tool_shed/repository/common.mako        | 8 +-------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/templates/admin/requests/select_datasets_to_transfer.mako b/templates/admin/requests/select_datasets_to_transfer.mako
index 10d2135b7ef..e81b9c38b44 100644
--- a/templates/admin/requests/select_datasets_to_transfer.mako
+++ b/templates/admin/requests/select_datasets_to_transfer.mako
@@ -19,8 +19,7 @@ ${h.css( "dynatree_skin/ui.dynatree" )}
         // --- Initialize sample trees
         $("#tree").dynatree({
             title: "${scp_configs['data_location']}",
-            rootVisible: true,
-            minExpandLevel: 0, // 1: root node is not collapsible
+            minExpandLevel: 1, // 1: root node is not collapsible
             persist: false,
             checkbox: true,
             selectMode: 3,
diff --git a/templates/admin/tool_shed_repository/common.mako b/templates/admin/tool_shed_repository/common.mako
index 6cf501e1baa..554f155dc5e 100644
--- a/templates/admin/tool_shed_repository/common.mako
+++ b/templates/admin/tool_shed_repository/common.mako
@@ -3,20 +3,14 @@
 <%def name="browse_files(title_text, directory_path)">
     <script type="text/javascript">
         $(function(){
-            $("#tree").ajaxComplete(function(event, XMLHttpRequest, ajaxOptions) {
-                _log("debug", "ajaxComplete: %o", this); // dom element listening
-            });
             // --- Initialize sample trees
             $("#tree").dynatree({
                 title: "${title_text|h}",
-                rootVisible: true,
-                minExpandLevel: 0, // 1: root node is not collapsible
+                minExpandLevel: 1,
                 persist: false,
                 checkbox: true,
                 selectMode: 3,
                 onPostInit: function(isReloading, isError) {
-                    //alert("reloading: "+isReloading+", error:"+isError);
-                    logMsg("onPostInit(%o, %o) - %o", isReloading, isError, this);
                     // Re-fire onActivate, so the text is updated
                     this.reactivate();
                 }, 
diff --git a/templates/webapps/tool_shed/repository/common.mako b/templates/webapps/tool_shed/repository/common.mako
index cd892fdc74a..c7d3cb7d161 100644
--- a/templates/webapps/tool_shed/repository/common.mako
+++ b/templates/webapps/tool_shed/repository/common.mako
@@ -2,20 +2,14 @@
     <script type="text/javascript">
         $(function(){
 
-            $("#tree").ajaxComplete(function(event, XMLHttpRequest, ajaxOptions) {
-                _log("debug", "ajaxComplete: %o", this); // dom element listening
-            });
             // --- Initialize sample trees
             $("#tree").dynatree({
                 title: "${repository.name}",
-                rootVisible: true,
-                minExpandLevel: 0, // 1: root node is not collapsible
+                minExpandLevel: 1,
                 persist: false,
                 checkbox: true,
                 selectMode: 3,
                 onPostInit: function(isReloading, isError) {
-                    //alert("reloading: "+isReloading+", error:"+isError);
-                    logMsg("onPostInit(%o, %o) - %o", isReloading, isError, this);
                     // Re-fire onActivate, so the text is updated
                     this.reactivate();
                 },