From 9d047a788d5b81bafbe786519eb0c5a2f4238521 Mon Sep 17 00:00:00 2001
From: Scott Walters <scott@slowass.net>
Date: Thu, 12 Sep 2013 13:02:01 -0500
Subject: [PATCH] Revert "when flipping between Tree and View tabs with edit
 on, clear out the containers for the toolbars before re-adding the toolbars
 -- this time in YUI" ... committeed too much stuff. ack

This reverts commit c19c3503d443ffd6ea5b1feb2cd8cfda5e2a1637.
---
 lib/WebGUI.pm               |  2 --
 lib/WebGUI/Image.pm         |  2 +-
 share/site.psgi             | 24 ++++++++++++------------
 www/extras/admin/admin.js   |  2 --
 www/extras/admin/toolbar.js |  9 ---------
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 5594bed5a..6fcd192dd 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -66,8 +66,6 @@ sub call {
     my $self = shift;
     my $env = shift;
 
-local $SIG{USR1} = sub { Carp::confess; };
-
     ##Enable size limiting
     $env->{'psgix.harakiri'} = 1;
 
diff --git a/lib/WebGUI/Image.pm b/lib/WebGUI/Image.pm
index c7d49dab2..773d6d246 100644
--- a/lib/WebGUI/Image.pm
+++ b/lib/WebGUI/Image.pm
@@ -2,7 +2,7 @@ package WebGUI::Image;
 
 use strict;
 use WebGUI::Image::Palette;
-# use Image::Magick;
+use Image::Magick;
 
 =head1 NAME
 
diff --git a/share/site.psgi b/share/site.psgi
index 8ddc42a26..f1c507a1f 100644
--- a/share/site.psgi
+++ b/share/site.psgi
@@ -48,18 +48,18 @@ builder {
     # enable_if { $_[0]->{'webgui.debug'} } 'StackTrace';
     enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::StackTrace';
 
-#    enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
-#        'Timer',
-#        'Memory',
-#        'Session',
-#        'Parameters',
-#        'PerlConfig',
-#        [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ],
-#        'Response',
-#        'Logger',
-#    ];
-#    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment';
-#    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
+    enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
+        'Timer',
+        'Memory',
+        'Session',
+        'Parameters',
+        'PerlConfig',
+        [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ],
+        'Response',
+        'Logger',
+    ];
+    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment';
+    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
 
     # This one uses the Session object, so it comes after WebGUI::Middleware::Session
     mount $config->get('uploadsURL') => builder {
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index aa3b04f1c..f09c17bc9 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -1877,8 +1877,6 @@ WebGUI.Admin.Tree.prototype.runHelperForSelected
     var self = this;
     var assetIds = this.getSelected();
 
-    alert("ok");
-
     // Open the dialog with two progress bars
     var dialog  = new YAHOO.widget.Panel( 'helperForkModalDialog', {
         "width"             : '350px',
diff --git a/www/extras/admin/toolbar.js b/www/extras/admin/toolbar.js
index fc3ee9ffe..72421a7e6 100644
--- a/www/extras/admin/toolbar.js
+++ b/www/extras/admin/toolbar.js
@@ -32,15 +32,6 @@ WebGUI.Toolbar.createAll = function( ) {
     var holders = YAHOO.util.Selector.query( '.wg-admin-toolbar' );
     for ( var i = 0; i < holders.length; i++ ) {
         var holder = holders[i];
-
-        // when flipping between Tree and View tabs with edit on, clear out the containers for the toolbars before re-adding the toolbars
-        var holder_yui = new YAHOO.util.Element( holder );
-        var child;
-        while( child = YAHOO.util.Dom.getFirstChild( holder ) ) {
-            holder_yui.removeChild( child );
-            // console.log("removing: " + child + " from " + holder_yui);
-        }
-
         var assetId = holder.id.match( /wg-admin-toolbar-(.+)/ )[1];
         var toolbar = new WebGUI.Toolbar( assetId, { "parent" : holder } );
         toolbar.getAssetData( assetId, bind( toolbar, toolbar.render ) );