oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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"

Browse source 
... committeed too much stuff. ack

This reverts commit c19c3503d4.
This commit is contained in:
Scott Walters 2013-09-12 13:02:01 -05:00
parent c19c3503d4
commit 9d047a788d
5 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI.pm
View file

@ -66,8 +66,6 @@ sub call {
my $self = shift; my $self = shift;
my $env = shift; my $env = shift;
local $SIG{USR1} = sub { Carp::confess; };
##Enable size limiting ##Enable size limiting
$env->{'psgix.harakiri'} = 1; $env->{'psgix.harakiri'} = 1;

2
lib/WebGUI/Image.pm
View file

@ -2,7 +2,7 @@ package WebGUI::Image;
use strict; use strict;
use WebGUI::Image::Palette; use WebGUI::Image::Palette;
# use Image::Magick; use Image::Magick;
=head1 NAME =head1 NAME

24
share/site.psgi
View file

@ -48,18 +48,18 @@ builder {
# enable_if { $_[0]->{'webgui.debug'} } 'StackTrace'; # enable_if { $_[0]->{'webgui.debug'} } 'StackTrace';
enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::StackTrace'; enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::StackTrace';
# enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [ enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
# 'Timer', 'Timer',
# 'Memory', 'Memory',
# 'Session', 'Session',
# 'Parameters', 'Parameters',
# 'PerlConfig', 'PerlConfig',
# [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ], [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ],
# 'Response', 'Response',
# 'Logger', 'Logger',
# ]; ];
# enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment'; enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment';
# enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance'; enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
# This one uses the Session object, so it comes after WebGUI::Middleware::Session # This one uses the Session object, so it comes after WebGUI::Middleware::Session
mount $config->get('uploadsURL') => builder { mount $config->get('uploadsURL') => builder {

2
www/extras/admin/admin.js
View file

@ -1877,8 +1877,6 @@ WebGUI.Admin.Tree.prototype.runHelperForSelected
var self = this; var self = this;
var assetIds = this.getSelected(); var assetIds = this.getSelected();
alert("ok");
// Open the dialog with two progress bars // Open the dialog with two progress bars
var dialog = new YAHOO.widget.Panel( 'helperForkModalDialog', { var dialog = new YAHOO.widget.Panel( 'helperForkModalDialog', {
"width" : '350px', "width" : '350px',

9
www/extras/admin/toolbar.js
View file

@ -32,15 +32,6 @@ WebGUI.Toolbar.createAll = function( ) {
var holders = YAHOO.util.Selector.query( '.wg-admin-toolbar' ); var holders = YAHOO.util.Selector.query( '.wg-admin-toolbar' );
for ( var i = 0; i < holders.length; i++ ) { for ( var i = 0; i < holders.length; i++ ) {
var holder = holders[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 assetId = holder.id.match( /wg-admin-toolbar-(.+)/ )[1];
var toolbar = new WebGUI.Toolbar( assetId, { "parent" : holder } ); var toolbar = new WebGUI.Toolbar( assetId, { "parent" : holder } );
toolbar.getAssetData( assetId, bind( toolbar, toolbar.render ) ); toolbar.getAssetData( assetId, bind( toolbar, toolbar.render ) );