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 c19c3503d4.
This commit is contained in:
parent
c19c3503d4
commit
9d047a788d
5 changed files with 13 additions and 26 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package WebGUI::Image;
|
|||
|
||||
use strict;
|
||||
use WebGUI::Image::Palette;
|
||||
# use Image::Magick;
|
||||
use Image::Magick;
|
||||
|
||||
=head1 NAME
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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 ) );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue