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

Update Session->Style setScript to default to text/javascript. Update the entire codebase to take advantage of it.

Browse source
This commit is contained in:
Colin Kuskie 2010-06-24 13:07:03 -07:00
parent 808f38b2a6
commit 3fbc109429
53 changed files with 254 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/WebGUI/Admin.pm
View file

@ -295,18 +295,18 @@ sub www_view {
$style->setLink( $url->extras('yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
$style->setLink( $url->extras('macro/AdminBar/slidePanel.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setLink( $url->extras('admin/admin.css'), { type=>'text/css', rel=>'stylesheet'} );
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/utilities/utilities.js'), {type=>'text/javascript'});
$style->setScript($url->extras('accordion/accordion.js'), {type=>'text/javascript'});
$style->setScript($url->extras('admin/admin.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/element/element-min.js'), {type=>"text/javascript"});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('accordion/accordion.js'));
$style->setScript($url->extras('admin/admin.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript( $url->extras( 'yui/build/paginator/paginator-min.js ' ) );
$style->setScript( $url->extras( 'yui/build/datasource/datasource-min.js ' ) );
$style->setScript( $url->extras( 'yui/build/datatable/datatable-min.js ' ) );
$style->setScript( $url->extras( 'yui/build/container/container-min.js' ) );
$style->setScript($url->extras('yui/build/tabview/tabview-min.js'), {type=>"text/javascript"});
$style->setScript($url->extras('yui/build/menu/menu-min.js'), {type=>"text/javascript"});
$style->setScript($url->extras('yui/build/button/button-min.js'), {type=>"text/javascript"});
$style->setScript($url->extras('yui/build/tabview/tabview-min.js'));
$style->setScript($url->extras('yui/build/menu/menu-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setScript( $url->extras( 'yui/build/json/json-min.js' ) );
$style->setScript( $url->extras( 'yui-webgui/build/i18n/i18n.js' ) );

8
lib/WebGUI/Asset.pm
View file

@ -1581,10 +1581,10 @@ sub getToolbar {
$self->session->style->setLink($self->session->url->extras('assetToolbar/assetToolbar.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setLink($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('assetToolbar/assetToolbar.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'));
$self->session->style->setScript($self->session->url->extras('assetToolbar/assetToolbar.js'));
my $output
= '<div class="yui-skin-sam wg-toolbar">'
. '<img src="' . $self->getIcon(1) . '" title="' . $self->getName . '" alt="' . $self->getName . '" class="wg-toolbar-icon" />'

34
lib/WebGUI/Asset/File/Image.pm
View file

@ -235,8 +235,8 @@ sub view {
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/container/assets/container.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/container/container-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/container/container-min.js'));
}
$var{controls} = $self->getToolbar;
@ -354,11 +354,11 @@ sub www_annotate {
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/imagecropper/assets/skins/sam/imagecropper.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/element/element-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/resize/resize-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/imagecropper/imagecropper-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('yui/build/resize/resize-min.js'));
$style->setScript($url->extras('yui/build/imagecropper/imagecropper-min.js'));
my @pieces = split(/\n/, $self->annotations);
@ -633,11 +633,11 @@ sub www_resize {
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/resize/assets/skins/sam/resize.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/element/element-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/resize/resize-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/animation/animation-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('yui/build/resize/resize-min.js'));
$style->setScript($url->extras('yui/build/animation/animation-min.js'));
my $resize_js = qq(
<script>
@ -774,11 +774,11 @@ sub www_crop {
$style->setLink($url->extras('yui/build/resize/assets/skins/sam/resize.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/imagecropper/assets/skins/sam/imagecropper.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/element/element-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/resize/resize-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/imagecropper/imagecropper-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('yui/build/resize/resize-min.js'));
$style->setScript($url->extras('yui/build/imagecropper/imagecropper-min.js'));
my $i18n = WebGUI::International->new($session,"Asset_Image");

15
lib/WebGUI/Asset/MatrixListing.pm
View file

@ -620,16 +620,11 @@ sub view {
$var->{productUrl_click} .= ';revision='.$revisionDate;
}
$self->session->style->setScript($self->session->url->extras('yui/build/utilities/utilities.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/datasource/datasource-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/datatable/datatable-min.js'),
{type =>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'),
{type =>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/utilities/utilities.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/datasource/datasource-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/datatable/datatable-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'));
$self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});

8
lib/WebGUI/Asset/RichEdit.pm
View file

@ -610,10 +610,10 @@ sub getRichEditor {
$config{height} = $self->editorHeight if ($self->editorHeight > 0);
$config{plugins} = join(",",@plugins);
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo/yahoo-min.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('tinymce/jscripts/tiny_mce/tiny_mce_src.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras("tinymce-webgui/callbacks.js"),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo/yahoo-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'));
$self->session->style->setScript($self->session->url->extras('tinymce/jscripts/tiny_mce/tiny_mce_src.js'));
$self->session->style->setScript($self->session->url->extras("tinymce-webgui/callbacks.js"));
my $out = '';
if ($ask) {
$out = q|<a style="display: block;" href="javascript:toggleEditor('|.$nameId.q|')">|.$i18n->get('Toggle editor').q|</a>|;

2
lib/WebGUI/Asset/Shortcut.pm
View file

@ -122,7 +122,7 @@ sub _drawQueryBuilder {
);
# html
$session->style->setScript($session->url->extras('wobject/Shortcut/querybuilder.js'), {type=>"text/javascript"});
$session->style->setScript($session->url->extras('wobject/Shortcut/querybuilder.js'));
$session->style->setLink($session->url->extras('wobject/Shortcut/querybuilder.css'), {type=>"text/css", rel=>"stylesheet"});
my $output;
$output .= qq|<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="5" align="right">$shortcutCriteriaField</td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright">$conjunctionField</td></tr>|;

20
lib/WebGUI/Asset/Sku/ThingyRecord.pm
View file

@ -207,22 +207,10 @@ Add the javascript needed for the edit form
override getEditForm => sub {
my ($self) = @_;
$self->session->style->setScript(
$self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'),
{ type => "text/javascript" },
);
$self->session->style->setScript(
$self->session->url->extras('yui/build/connection/connection-min.js'),
{ type => "text/javascript" },
);
$self->session->style->setScript(
$self->session->url->extras('yui/build/json/json-min.js'),
{ type => "text/javascript" },
);
$self->session->style->setScript(
$self->session->url->extras('yui-webgui/build/thingyRecord/thingyRecord.js'),
{ type => "text/javascript" },
);
$self->session->style->setScript( $self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript( $self->session->url->extras('yui/build/connection/connection-min.js'));
$self->session->style->setScript( $self->session->url->extras('yui/build/json/json-min.js'));
$self->session->style->setScript( $self->session->url->extras('yui-webgui/build/thingyRecord/thingyRecord.js'));
$self->session->style->setRawHeadTags(<<EOSCRIPT);
<script type="text/javascript">
YAHOO.util.Event.onDOMReady( function () { var thingForm = YAHOO.util.Dom.get('thingId_formId'); WebGUI.ThingyRecord.getThingFields(thingForm.options[thingForm.selectedIndex].value,'thingFields_formId')} );

12
lib/WebGUI/Asset/Template.pm
View file

@ -385,12 +385,12 @@ override getEditForm => sub {
);
my ($style, $url) = $self->session->quick(qw(style url));
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/dom/dom-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/event/event-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/connection/connection-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/dom/dom-min.js'));
$style->setScript($url->extras('yui/build/event/event-min.js'));
$style->setScript($url->extras('yui/build/connection/connection-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js'));
pop(@headers);
my $scriptUrl = $url->extras('templateAttachments.js');

9
lib/WebGUI/Asset/Wobject/Carousel.pm
View file

@ -56,12 +56,9 @@ override getEditForm => sub {
my $tabform = super();
my $i18n = WebGUI::International->new($self->session, "Asset_Carousel");
$self->session->style->setScript($self->session->url->extras('yui/build/editor/editor-min.js'), {type =>
'text/javascript'});
$self->session->style->setLink($self->session->url->extras('yui/build/editor/assets/skins/sam/editor.css'), {type
=>'text/css', rel=>'stylesheet'});
$self->session->style->setScript($self->session->url->extras('wobject/Carousel/carousel.js'), {type =>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/editor/editor-min.js'));
$self->session->style->setLink($self->session->url->extras('yui/build/editor/assets/skins/sam/editor.css'), {type =>'text/css', rel=>'stylesheet'});
$self->session->style->setScript($self->session->url->extras('wobject/Carousel/carousel.js'));
my $tableRowStart =
'<tr id="items_row">'

5
lib/WebGUI/Asset/Wobject/Dashboard.pm
View file

@ -283,10 +283,7 @@ sub view {
my $self = shift;
my %vars = %{$self->get()};
$self->session->style->setScript(
$self->session->url->extras('yui/build/utilities/utilities.js'),
{ type=>'text/javascript' }
);
$self->session->style->setScript( $self->session->url->extras('yui/build/utilities/utilities.js'));
my $templateId = $self->templateId;
my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout","WebGUI::Asset::Wobject::Dashboard"] });

2
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -1234,7 +1234,7 @@ Prepare the template for the form mode of the template.
sub prepareViewForm {
my $self = shift;
$self->session->style->setLink($self->session->url->extras('tabs/tabs.css'), {"type"=>"text/css"});
$self->session->style->setScript($self->session->url->extras('tabs/tabs.js'), {"type"=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('tabs/tabs.js'));
my $templateId = $self->templateId;
my $template = WebGUI::Asset::Template->newById($self->session, $templateId);
if (!$template) {

8
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -289,10 +289,10 @@ sub prepareView {
if ($vars{showAdmin}) {
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
# for end users to work with our templates
$session->style->setScript($session->url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js"),{ type=>"text/javascript" });
$session->style->setScript($session->url->extras("yui/build/animation/animation-min.js"),{ type=>"text/javascript" });
$session->style->setScript($session->url->extras("yui/build/dragdrop/dragdrop.js"),{ type=>"text/javascript" });
$session->style->setScript($session->url->extras("yui-webgui/build/layout/draggable.js"),{ type=>"text/javascript" });
$session->style->setScript($session->url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js"));
$session->style->setScript($session->url->extras("yui/build/animation/animation-min.js"));
$session->style->setScript($session->url->extras("yui/build/dragdrop/dragdrop.js"));
$session->style->setScript($session->url->extras("yui-webgui/build/layout/draggable.js"));
$session->style->setLink($session->url->extras("draggable.css"),{ type=>"text/css", rel=>"stylesheet", media=>"all" });
$session->style->setRawHeadTags('

20
lib/WebGUI/Asset/Wobject/Map.pm
View file

@ -298,21 +298,21 @@ sub loadMapApiTags {
$style->setLink($url->extras('yui/build/container/assets/skins/sam/container.css'),{type=>'text/css',rel=>'stylesheet'});
$style->setLink($url->extras('yui/build/button/assets/skins/sam/button.css'),{type=>'text/css',rel=>'stylesheet'});
$style->setScript("http://www.google.com/jsapi?key=" . $self->mapApiKey,{type=>"text/javascript"});
$style->setScript("http://www.google.com/jsapi?key=" . $self->mapApiKey);
$style->setRawHeadTags(<<'ENDHTML');
<script type="text/javascript">
google.load("maps", "2", { "other_params" : "sensor=false" });
</script>
ENDHTML
$style->setScript('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.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/connection/connection-min.js'),{type=>'text/javascript'});
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'),{type=>'text/javascript'});
$style->setScript($url->extras('yui/build/element/element-min.js'),{type=>'text/javascript'});
$style->setScript($url->extras('yui/build/button/button-min.js'),{type=>'text/javascript'});
$style->setScript($url->extras('yui/build/container/container-min.js'),{type=>'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'),{type=>'text/javascript'});
$style->setScript($url->extras('yui-webgui/build/map/map.js'),{type=>'text/javascript'});
$style->setScript('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js');
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/connection/connection-min.js'));
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setScript($url->extras('yui/build/container/container-min.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui-webgui/build/map/map.js'));
return;
}

55
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -588,11 +588,11 @@ sub view {
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});
$style->setScript($url->extras('yui/build/utilities/utilities.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/button/button-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
my ($varStatistics,$varStatisticsEncoded);
my $var = $self->get;
@ -826,24 +826,15 @@ sub www_compare {
@listingIds = $self->session->form->checkList("listingId");
}
$style->setScript($url->extras('yui/build/utilities/utilities.js'),
{type => 'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'),
{type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'),
{type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'),
{type =>'text/javascript'});
$style->setScript($url->extras('yui/build/button/button-min.js'),
{type =>'text/javascript'});
$style->setScript($url->extras('yui/build/container/container-min.js'),
{type =>'text/javascript'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});
$style->setScript($url->extras('hoverhelp.js'),
{type => 'text/javascript'});
$style->setLink($url->extras('hoverhelp.css'),
{type =>'text/css', rel=>'stylesheet'});
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setScript($url->extras('yui/build/container/container-min.js'));
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'});
$style->setScript($url->extras('hoverhelp.js'));
$style->setLink($url->extras('hoverhelp.css'), {type =>'text/css', rel=>'stylesheet'});
my $maxComparisons;
if($self->session->user->isVisitor){
@ -1356,18 +1347,12 @@ sub www_search {
my $style = $session->style;
$var->{compareForm} = $self->getCompareForm;
$style->setScript($url->extras('yui/build/utilities/utilities.js'),
{type => 'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'),
{type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'),
{type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'),
{type =>'text/javascript'});
$style->setScript($url->extras('yui/build/button/button-min.js'),
{type =>'text/javascript'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'});
foreach my $category (keys %{$self->getCategories}) {
my $attributes;

8
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -309,10 +309,10 @@ override getToolbar => sub {
}
$self->session->style->setLink($self->session->url->extras('assetToolbar/assetToolbar.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setLink($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('assetToolbar/assetToolbar.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'));
$self->session->style->setScript($self->session->url->extras('assetToolbar/assetToolbar.js'));
my $i18n = WebGUI::International->new($self->session, "Asset");
return '<div class="yui-skin-sam wg-toolbar">'
. '<img src="' . $self->getIcon(1) . '" title="' . $self->getName . '" alt="' . $self->getName . '" class="wg-toolbar-icon" />'

51
lib/WebGUI/Asset/Wobject/ProjectManager.pm
View file

@ -1737,59 +1737,28 @@ sub www_viewProject {
);
#Set page scripts
$style->setScript($assetExtras."/cMenu.js",{
type=>"text/javascript",
}
);
$style->setScript($assetExtras."/cMenu.js");
$style->setScript($extras."/contextMenu/contextMenu.js",{
type=>"text/javascript"
}
);
$style->setScript($extras."/contextMenu/contextMenu.js");
$self->session->style->setScript(
$self->session->url->extras('yui/build/yahoo/yahoo-min.js'),
{ type=>'text/javascript' }
);
$self->session->style->setScript( $self->session->url->extras('yui/build/yahoo/yahoo-min.js'));
$self->session->style->setScript(
$self->session->url->extras('yui/build/event/event-min.js'),
{ type=>'text/javascript' }
);
$self->session->style->setScript( $self->session->url->extras('yui/build/event/event-min.js'));
$self->session->style->setScript(
$self->session->url->extras('yui/build/dom/dom-min.js'),
{ type=>'text/javascript' }
);
$self->session->style->setScript( $self->session->url->extras('yui/build/dom/dom-min.js'));
$self->session->style->setScript(
$self->session->url->extras('yui/build/connection/connection-min.js'),
{ type=>'text/javascript' }
);
$self->session->style->setScript( $self->session->url->extras('yui/build/connection/connection-min.js'));
$self->session->style->setScript(
$self->session->url->extras('yui/build/container/container-min.js'),
{ type=>'text/javascript' }
);
$style->setScript($assetExtras."/modal.js",{
type=>"text/javascript"
}
);
$self->session->style->setScript( $self->session->url->extras('yui/build/container/container-min.js'));
$style->setScript($assetExtras."/modal.js");
#$self->session->style->setScript(
# $self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),
# { type=>'text/javascript' }
#);
$style->setScript($assetExtras."/projectDisplay.js",{
type=>"text/javascript"
}
);
$style->setScript($assetExtras."/taskEdit.js",{
type=>"text/javascript"
}
);
$style->setScript($assetExtras."/projectDisplay.js");
$style->setScript($assetExtras."/taskEdit.js");
#Get Project Data
my $sql = q|select * from PM_project where projectId=?|;

2
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -371,7 +371,7 @@ override getEditForm => sub {
);
# javascript
$self->session->style->setScript($self->session->url->extras("wobject/SQLReport/editFormDownload.js"), {type => 'text/javascript',});
$self->session->style->setScript($self->session->url->extras("wobject/SQLReport/editFormDownload.js"));
### /DOWNLOAD

15
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -1722,16 +1722,11 @@ sub www_editThing {
$tabForm->addTab('fields', $i18n->get('fields tab label'));
$self->session->style->setScript($self->session->url->extras('yui/build/utilities/utilities.js'), {type =>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'), {type =>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('wobject/Thingy/thingy.js'), {type=>
'text/javascript'});
$self->session->style->setLink($self->session->url->extras('wobject/Thingy/thingy.css'), {type
=>'text/css', rel=>'stylesheet'});
$self->session->style->setScript($self->session->url->extras('yui/build/utilities/utilities.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'));
$self->session->style->setScript($self->session->url->extras('wobject/Thingy/thingy.js'));
$self->session->style->setLink($self->session->url->extras('wobject/Thingy/thingy.css'), {type =>'text/css', rel=>'stylesheet'});
$tab = $tabForm->getTab('fields');
foreach my $fieldType ( keys %{ WebGUI::Form::FieldType->new($session)->getTypes }) {

2
lib/WebGUI/AssetClipboard.pm
View file

@ -489,7 +489,7 @@ sub www_manageClipboard {
'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset");
}
$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'));
my $output = "
<script type=\"text/javascript\">
//<![CDATA[

2
lib/WebGUI/AssetTrash.pm
View file

@ -407,7 +407,7 @@ sub www_manageTrash {
$ac->addSubmenuItem($self->getUrl('func=manageTrash;systemTrash=1'), $i18n->get(964));
}
$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'));
my $output = "
<script type=\"text/javascript\">
//<![CDATA[

14
lib/WebGUI/Content/AssetHistory.pm
View file

@ -132,15 +132,15 @@ sub www_view {
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setLink($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
##YUI Datatable
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
##WebGUI YUI AssetHistory
$style->setScript( $url->extras( 'yui-webgui/build/i18n/i18n.js' ), {type => 'text/javascript'} );
$style->setScript( $url->extras('yui-webgui/build/assetHistory/assetHistory.js'), {type => 'text/javascript'});
$style->setScript( $url->extras( 'yui-webgui/build/i18n/i18n.js' ));
$style->setScript( $url->extras('yui-webgui/build/assetHistory/assetHistory.js'));
##Default CSS
$style->setRawHeadTags('<style type="text/css"> #paging a { color: #0000de; } #search form { display: inline; } </style>');
my $i18n=WebGUI::International->new($session);

20
lib/WebGUI/Content/Setup.pm
View file

@ -221,17 +221,17 @@ sub handler {
my $style = $session->style;
$style->setLink($url->extras('/yui/build/container/assets/skins/sam/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/yui/build/colorpicker/assets/skins/sam/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/event/event-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dragdrop/dragdrop-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/container/container-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/slider/slider-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/colorpicker/colorpicker-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('/yui/build/event/event-min.js'));
$style->setScript($url->extras('/yui/build/dom/dom-min.js'));
$style->setScript($url->extras('/yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/slider/slider-min.js'));
$style->setScript($url->extras('/yui/build/colorpicker/colorpicker-min.js'));
$style->setLink($url->extras('/colorpicker/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/colorpicker/colorpicker.js'),{ type=>'text/javascript' });
$style->setScript($url->extras("/styleDesigner/styleDesigner.js"), {type=>"text/javascript"});
$style->setScript($url->extras('/colorpicker/colorpicker.js'));
$style->setScript($url->extras("/styleDesigner/styleDesigner.js"));
$style->setLink($url->extras("/styleDesigner/styleDesigner.css"), {rel=>"stylesheet", type=>"text/css"});
$legend = $i18n->get("style designer");
$output .= '

6
lib/WebGUI/Form/Attachments.pm
View file

@ -214,10 +214,8 @@ sub www_show {
@assetIds = $session->form->param("attachments");
}
$session->http->setCacheControl("none");
$style->setScript($url->extras("/AttachmentsControl/AttachmentsControl.js"),
{type=>"text/javascript"});
$style->setLink($url->extras("/AttachmentsControl/AttachmentsControl.css"),
{type=>"text/css", rel=>"stylesheet"});
$style->setScript($url->extras("/AttachmentsControl/AttachmentsControl.js"));
$style->setLink($url->extras("/AttachmentsControl/AttachmentsControl.css"), {type=>"text/css", rel=>"stylesheet"});
my $uploadControl = '';
my $i18n = WebGUI::International->new($session);
my $maxFiles = $form->param('maxAttachments') - scalar(@assetIds) ;

4
lib/WebGUI/Form/CheckList.pm
View file

@ -100,9 +100,7 @@ sub getSelectAllButton {
my $formName = $self->get('name');
my $i18n = WebGUI::International->new($self->session, "Form_CheckList");
$self->session->style->setScript(
$self->session->url->extras("yui-webgui/build/form/form.js")
);
$self->session->style->setScript( $self->session->url->extras("yui-webgui/build/form/form.js"));
return WebGUI::Form::Button->new($self->session, {
name => $self->privateName('selectAllButton'),

16
lib/WebGUI/Form/Codearea.pm
View file

@ -162,16 +162,16 @@ sub toHtml {
$style->setLink($url->extras("yui/build/resize/assets/skins/sam/resize.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras("yui/build/assets/skins/sam/skin.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setScript($url->extras("yui/build/utilities/utilities.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui/build/container/container_core-min.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui/build/menu/menu-min.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui/build/button/button-min.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui/build/resize/resize-min.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui/build/editor/editor-min.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui-webgui/build/code-editor/code-editor.js"),{type=>"text/javascript"});
$style->setScript($url->extras("yui/build/utilities/utilities.js"));
$style->setScript($url->extras("yui/build/container/container_core-min.js"));
$style->setScript($url->extras("yui/build/menu/menu-min.js"));
$style->setScript($url->extras("yui/build/button/button-min.js"));
$style->setScript($url->extras("yui/build/resize/resize-min.js"));
$style->setScript($url->extras("yui/build/editor/editor-min.js"));
$style->setScript($url->extras("yui-webgui/build/code-editor/code-editor.js"));
#$style->setLink($url->extras("yui/build/logger/assets/logger.css"), {type=>"text/css", rel=>"stylesheet"});
#$style->setLink($url->extras("yui/build/logger/assets/skins/sam/logger.css"), {type=>"text/css", rel=>"stylesheet"});
#$style->setScript($url->extras("yui/build/logger/logger.js"),{type=>"text/javascript"});
#$style->setScript($url->extras("yui/build/logger/logger.js"));
my $codeCss = $url->extras("yui-webgui/build/code-editor/code.css");
my $out = <<"END_HTML";
<textarea id="$id" name="$name" $extras rows="10" cols="60" style="font-family: monospace; $styleAttr; height: 100%; width: 100%; resize: none;">$value</textarea>

18
lib/WebGUI/Form/Color.pm
View file

@ -106,16 +106,16 @@ sub toHtml {
my $style = $self->session->style;
$style->setLink($url->extras('/yui/build/container/assets/skins/sam/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/yui/build/colorpicker/assets/skins/sam/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/event/event-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dragdrop/dragdrop-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/container/container-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/slider/slider-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/colorpicker/colorpicker-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('/yui/build/event/event-min.js'));
$style->setScript($url->extras('/yui/build/dom/dom-min.js'));
$style->setScript($url->extras('/yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/slider/slider-min.js'));
$style->setScript($url->extras('/yui/build/colorpicker/colorpicker-min.js'));
$style->setLink($url->extras('/colorpicker/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/colorpicker/colorpicker.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/colorpicker/colorpicker.js'));
my $id = $self->get("id");
my $value = $self->getOriginalValue;
my $name = $self->get("name");

16
lib/WebGUI/Form/Date.pm
View file

@ -224,14 +224,14 @@ sub toHtml {
my $style = $session->style;
my $url = $session->url;
$style->setLink($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
$style->setScript($url->extras('yui/build/utilities/utilities.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/json/json-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/dom/dom-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/event/event-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/calendar/calendar-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js' ), { type => 'text/javascript' });
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type => 'text/javascript' });
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('yui/build/dom/dom-min.js'));
$style->setScript($url->extras('yui/build/event/event-min.js'));
$style->setScript($url->extras('yui/build/calendar/calendar-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js' ));
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'));
my $field = WebGUI::Form::Text->new($self->session,
name => $self->get("name"),

16
lib/WebGUI/Form/DateTime.pm
View file

@ -227,14 +227,14 @@ sub toHtml {
my $style = $session->style;
my $url = $session->url;
$style->setLink($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/json/json-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/dom/dom-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/event/event-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/calendar/calendar-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js' ), { type => 'text/javascript' });
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type => 'text/javascript' });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('yui/build/dom/dom-min.js'));
$style->setScript($url->extras('yui/build/event/event-min.js'));
$style->setScript($url->extras('yui/build/calendar/calendar-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js' ));
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'));
return WebGUI::Form::Text->new($self->session,
name => $self->get("name"),

2
lib/WebGUI/Form/Email.pm
View file

@ -109,7 +109,7 @@ Renders an email address field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('emailCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('emailCheck.js'));
$self->{_params}{extras} .= ' onchange="emailCheck(this.value)" ';
return $self->SUPER::toHtml;
}

4
lib/WebGUI/Form/File.pm
View file

@ -278,8 +278,8 @@ sub toHtml {
my @files = @{ $storage->getFiles } if (defined $storage);
my $maxFiles = $self->get('maxAttachments') - scalar(@files);
if ($maxFiles > 0) {
$self->session->style->setScript($self->session->url->extras('FileUploadControl.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('fileIcons.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('FileUploadControl.js'));
$self->session->style->setScript($self->session->url->extras('fileIcons.js'));
$uploadControl = '<script type="text/javascript">'
. sprintf(q!var uploader = new FileUploadControl("%s", fileIcons, "%s","%d", "%s"); uploader.addRow();!
, $self->get("name")."_file", $i18n->get("removeLabel"), $maxFiles, $self->get("size"))

2
lib/WebGUI/Form/Float.pm
View file

@ -146,7 +146,7 @@ Renders a floating point field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(document.getElementById(\''.$self->get("id").'\'),\'0123456789-.\')"');
return $self->SUPER::toHtml;
}

2
lib/WebGUI/Form/HTMLArea.pm
View file

@ -171,7 +171,7 @@ sub toHtml {
my $i18n = WebGUI::International->new($self->session);
my $richEdit = eval { WebGUI::Asset::RichEdit->newById($self->session, $self->get("richEditId")); };
if (! Exception::Class->caught() ) {
$self->session->style->setScript($self->session->url->extras('textFix.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('textFix.js'));
$self->set("extras", $self->get('extras') . q{ onblur="fixChars(this.form['}.$self->get("name").q{'])" mce_editable="true" });
$self->set("resizable", 0);
return $self->SUPER::toHtml.$richEdit->getRichEditor($self->get('id'));

2
lib/WebGUI/Form/Hexadecimal.pm
View file

@ -130,7 +130,7 @@ Renders an integer field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(document.getElementById(\''.$self->get("id").'\'),\'0123456789abcdef\')"');
return $self->SUPER::toHtml;
}

2
lib/WebGUI/Form/Integer.pm
View file

@ -146,7 +146,7 @@ Renders an integer field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(document.getElementById(\''.$self->get("id").'\'),\'0123456789-\')"');
return $self->SUPER::toHtml;
}

6
lib/WebGUI/Form/Keywords.pm
View file

@ -90,9 +90,9 @@ sub toHtml {
my $url = $session->url;
$style->setLink($url->extras("yui/build/autocomplete/assets/skins/sam/autocomplete.css"), {rel=>"stylesheet", type=>"text/css"});
$style->setScript($url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/datasource/datasource-min.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/autocomplete/autocomplete-min.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js"));
$style->setScript($url->extras("yui/build/datasource/datasource-min.js"));
$style->setScript($url->extras("yui/build/autocomplete/autocomplete-min.js"));
$style->setRawHeadTags('<style type="text/css">.yui-skin-sam.webgui-keywords-autocomplete .yui-ac-input { position: static; width: auto }</style>');
my $name = $self->generateIdParameter($self->get('name'));

2
lib/WebGUI/Form/Phone.pm
View file

@ -92,7 +92,7 @@ Renders a phone number field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(document.getElementById(\''.$self->get("id").'\'),\'x.0123456789-()+ \')" ');
return $self->SUPER::toHtml;
}

6
lib/WebGUI/Form/Slider.pm
View file

@ -267,9 +267,9 @@ Renders an input tag of type text.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras("slider/js/range.js"), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras("slider/js/timer.js"), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras("slider/js/slider.js"), {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras("slider/js/range.js"));
$self->session->style->setScript($self->session->url->extras("slider/js/timer.js"));
$self->session->style->setScript($self->session->url->extras("slider/js/slider.js"));
$self->session->style->setLink($self->session->url->extras("slider/css/bluecurve/bluecurve.css"), {rel=>"stylesheet", type=>"text/css"});
# We need to make the variables unique because javascript does not have block scope. Also js cannot

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

@ -156,8 +156,8 @@ sub toHtml {
if ($self->get("resizable")) {
$style->setLink($url->extras("yui/build/resize/assets/skins/sam/resize.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setScript($url->extras("yui/build/utilities/utilities.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/resize/resize-min.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/utilities/utilities.js"));
$style->setScript($url->extras("yui/build/resize/resize-min.js"));
$out = sprintf <<'END_HTML', $self->get('id'), $out, $sizeStyle;
<div id="%1$s_resizewrapper" style="padding-right: 6px; padding-bottom: 6px; %3$s">%2$s</div>
<script type="text/javascript">
@ -173,17 +173,11 @@ sub toHtml {
END_HTML
}
elsif ($self->get('maxlength')) {
$style->setScript(
$url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ),
{ type => 'text/javascript' },
);
$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' ),
{ type => 'text/javascript' },
);
$style->setScript( $url->extras( 'yui-webgui/build/form/textarea.js' ));
}
return $out;
}

2
lib/WebGUI/Form/TimeField.pm
View file

@ -179,7 +179,7 @@ sub toHtml {
my $self = shift;
my $value = $self->getOriginalValue;
my $i18n = WebGUI::International->new($self->session);
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(document.getElementById(\''.$self->get("id").'\'),\'0123456789:\')"');
return $self->SUPER::toHtml
.WebGUI::Form::Button->new($self->session,

2
lib/WebGUI/Form/Url.pm
View file

@ -147,7 +147,7 @@ Renders a URL field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('addHTTP.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('addHTTP.js'));
$self->set("extras", $self->get('extras') . ' onblur="addHTTP(this.form.'.$self->get("name").')"');
return $self->SUPER::toHtml;
}

12
lib/WebGUI/Form/Username.pm
View file

@ -85,12 +85,12 @@ Renders a user name field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('form/fieldCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'), {type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/datasource/datasource-min.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui-webgui/build/i18n/i18n.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('form/fieldCheck.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/datasource/datasource-min.js'));
$self->session->style->setScript($self->session->url->extras('yui-webgui/build/i18n/i18n.js'));
my $value = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters(scalar $self->getOriginalValue)));
$self->set("extras", $self->get('extras') . ' onblur="new WebGUI.FieldCheck(\''. $self->get("id").'\',\'Username\',1);"');
return '<input id="'.$self->get('id').'" type="text" name="'.$self->get("name").'" value="'.$value.'" size="'.$self->get("size").'" maxlength="'.$self->get("maxlength").'" '.$self->get("extras").' />';

2
lib/WebGUI/Form/Zipcode.pm
View file

@ -123,7 +123,7 @@ Renders a zip code field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(document.getElementById(\''.$self->get("id").'\'),\'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz- \')"');
return $self->SUPER::toHtml;
}

10
lib/WebGUI/HTMLForm.pm
View file

@ -270,11 +270,11 @@ sub print {
my $url = $self->session->url;
$style->setLink($url->extras('/yui/build/container/assets/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/hoverhelp.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/event/event-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/container/container-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/hoverhelp.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('/yui/build/dom/dom-min.js'));
$style->setScript($url->extras('/yui/build/event/event-min.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/hoverhelp.js'));
return $self->{_header}.$self->{_data}.$self->{_footer};
}

4
lib/WebGUI/Macro/AdminBar.pm
View file

@ -37,8 +37,8 @@ sub process {
return undef unless $session->var->isAdminOn;
my $i18n = WebGUI::International->new($session,'Macro_AdminBar');
my ($url, $style, $asset, $user, $config) = $session->quick(qw(url style asset user config));
$style->setScript($url->extras('yui/build/utilities/utilities.js'), {type=>'text/javascript'});
$style->setScript($url->extras('accordion/accordion.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('accordion/accordion.js'));
$style->setLink($url->extras('macro/AdminBar/slidePanel.css'), {type=>'text/css', rel=>'stylesheet'});
my $out = q{<dl class="accordion-menu">};

15
lib/WebGUI/Macro/Widget.pm
View file

@ -44,18 +44,9 @@ sub process {
);
# and the JS
$style->setScript($extras."/wgwidget.js",{
type=>"text/javascript"
}
);
$style->setScript($extras."/yui/build/yahoo-dom-event/yahoo-dom-event.js",{
type=>"text/javascript"
}
);
$style->setScript($extras."/yui/build/container/container-min.js",{
type=>"text/javascript"
}
);
$style->setScript($extras."/wgwidget.js");
$style->setScript($extras."/yui/build/yahoo-dom-event/yahoo-dom-event.js");
$style->setScript($extras."/yui/build/container/container-min.js");
# construct the absolute URL and get the asset ID
my $asset = eval { WebGUI::Asset->newByUrl($session, $url); };

6
lib/WebGUI/Session/Style.pm
View file

@ -481,6 +481,7 @@ The URL to your script.
=head3 params
A hash reference containing the additional parameters to include in the script tag, such as "type" and "language".
Defaults to { type => 'text/javascript' } if omitted.
=head3 inBody
@ -492,7 +493,10 @@ body_attachments variable instead of to head_attachments.
sub setScript {
my $self = shift;
my $url = shift;
my $params = shift;
my $params = shift || { type => 'text/javascript', };
if (! exists $params->{type}) {
$params->{type} = 'text/javascript';
}
my $inBody = shift;
return undef if ($self->{_javascript}{$url});
my $tag = '<script src="'.$url.'"';

25
lib/WebGUI/Shop/ShipDriver/UPS.pm
View file

@ -446,26 +446,11 @@ Override the master method to stuff in some javascript.
sub getEditForm {
my $self = shift;
$self->session->style->setScript(
$self->session->url->extras('yui/build/utilities/utilities.js'),
{ type => 'text/javascript', },
);
$self->session->style->setScript(
$self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'),
{ type => 'text/javascript', },
);
$self->session->style->setScript(
$self->session->url->extras('yui/build/json/json-min.js'),
{ type => 'text/javascript', },
);
$self->session->style->setScript(
$self->session->url->extras('yui-webgui/build/i18n/i18n.js'),
{ type => 'text/javascript', },
);
$self->session->style->setScript(
$self->session->url->extras('yui-webgui/build/ShipDriver/UPS.js'),
{ type => 'text/javascript', },
);
$self->session->style->setScript( $self->session->url->extras('yui/build/utilities/utilities.js'));
$self->session->style->setScript( $self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript( $self->session->url->extras('yui/build/json/json-min.js'));
$self->session->style->setScript( $self->session->url->extras('yui-webgui/build/i18n/i18n.js'));
$self->session->style->setScript( $self->session->url->extras('yui-webgui/build/ShipDriver/UPS.js'));
$self->session->style->setRawHeadTags(<<EOL);
<script type="text/javascript">
YAHOO.util.Event.onDOMReady( WebGUI.ShipDriver.UPS.initI18n );

14
lib/WebGUI/Shop/TaxDriver/EU.pm
View file

@ -351,13 +351,13 @@ sub getConfigurationScreen {
$style->setLink($url->extras('/yui/build/container/assets/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/hoverhelp.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/container/container-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/tabview/tabview-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/hoverhelp.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/button/button-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/tabview/tabview-min.js'));
$style->setScript($url->extras('/hoverhelp.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
my $generalLabel = $i18n->get('general configuration');
my $groupsLabel = $i18n->get('vat groups');

10
lib/WebGUI/Shop/TaxDriver/Generic.pm
View file

@ -555,12 +555,12 @@ sub getConfigurationScreen {
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setLink($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
##YUI Datatable
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'), {type => 'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
##Default CSS
$style->setRawHeadTags('<style type="text/css"> #paging a { color: #0000de; } #search, #export form { display: inline; } </style>');
my $i18n=WebGUI::International->new($session, 'Tax');

10
lib/WebGUI/Shop/Transaction.pm
View file

@ -876,11 +876,11 @@ sub www_manage {
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('/yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('/yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'), {type=>'text/javascript'});
$style->setScript($url->extras('/yui/build/json/json-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('/yui/build/paginator/paginator-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('/yui/build/datasource/datasource-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('/yui/build/datatable/datatable-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/json/json-min.js'));
$style->setScript($url->extras('/yui/build/paginator/paginator-min.js'));
$style->setScript($url->extras('/yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('/yui/build/datatable/datatable-min.js'));
# draw the html markup that's needed
$style->setRawHeadTags('<style type="text/css"> #paging a { color: #0000de; } #search form { display: inline; } </style>');

20
lib/WebGUI/Shop/Vendor.pm
View file

@ -491,16 +491,16 @@ sub www_managePayouts {
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setLink($url->extras('yui/build/button/assets/skins/sam/button.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/element/element-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/connection/connection-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/json/json-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/button/button-min.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js'), {type=>'text/javascript'});
$style->setScript($url->extras('VendorPayout/vendorPayout.js'), {type=>'text/javascript'});
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/connection/connection-min.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js'));
$style->setScript($url->extras('VendorPayout/vendorPayout.js'));
# Add css for scheduled payout highlighting
$style->setRawHeadTags(<<CSS);

8
lib/WebGUI/TabForm.pm
View file

@ -235,10 +235,10 @@ sub print {
$style->setLink($url->extras('/yui/build/tabview/assets/skins/sam/tabview.css'),{type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras('/yui/build/container/assets/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/hoverhelp.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/container/container-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/tabview/tabview-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/hoverhelp.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/tabview/tabview-min.js'));
$style->setScript($url->extras('/hoverhelp.js'));
my $i = 1;
my $tabs = '<ul class="yui-nav">';
my $form = '<div class="yui-content">';