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

Fix a syntax error in the Json table caused by my bad merge.

Browse source
This commit is contained in:
Colin Kuskie 2011-07-25 15:00:11 -07:00
parent 7b1e385dd3
commit fef167bd0f
1 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/WebGUI/Form/JsonTable.pm
View file

@ -138,7 +138,7 @@ sub headTags {
my $self = shift;
my ( $url, $style ) = $self->session->quick(qw( url style ));
$style->setScript(
$url->extras('yui/build/connect/connect-min.js'),
$url->extras('yui/build/connection/connection-min.js'),
{ type => 'text/javascript' },
);
$style->setScript(
@ -229,27 +229,6 @@ sub toHtml {
$output .= '<input type="hidden" name="' . $self->get('name') . '" value="' . $value . '" />';
# Existing rows are entirely built in javascript from the JSON in the hidden field
<<<<<<< HEAD
=======
$style->setScript(
$url->extras('yui/build/connection/connection-min.js'),
{ type => 'text/javascript' },
);
$style->setScript(
$url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'),
{ type => 'text/javascript' },
);
$style->setScript(
$url->extras('yui/build/json/json-min.js'),
{ type => 'text/javascript' },
);
$style->setScript(
$url->extras('yui-webgui/build/i18n/i18n.js'),
{ type => 'text/javascript' },
);
$output .= sprintf '<script src="%s" type="text/javascript"></script>',
$url->extras('yui-webgui/build/form/jsontable.js');
>>>>>>> 7d20406... Fix a bad script link in the JsonTable. Fixes bug #12202.
$output .= '<script type="text/javascript">'
. q{new WebGUI.Form.JsonTable("} . $self->get('name') . q{","} . $self->get( 'id' ) . q{", }
. JSON->new->encode( $self->get('fields') ) . q{ );}