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

Fix syntax errors from the merge.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-23 16:39:02 -07:00
parent 245e1f8192
commit 3e9427ca1e
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Form/Textarea.pm
View file

@ -198,17 +198,7 @@ sub toHtml {
</script>
END_HTML
}
<<<<<<< HEAD
elsif ($self->get('maxlength')) {
$style->setScript( $url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ));
}
if ($self->get('maxlength')) {
# Add the maxlength script
$style->setScript( $url->extras( 'yui-webgui/build/form/textarea.js' ));
}
=======
$self->headTags;
>>>>>>> Convert Textarea over to headTags
return $out;
}

1
lib/WebGUI/Session.pm
View file

@ -153,6 +153,7 @@ sub cache {
$self->{_cache} = $cache;
}
return $self->{_cache};
}
#-------------------------------------------------------------------