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

Remove types for setScript calls, add setCss, which is shorthand for setLink with the CSS specific params preset.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-24 08:02:17 -07:00
parent 17d9deb085
commit 1f42a0a24e
50 changed files with 159 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -177,7 +177,7 @@ Sets the JS for this form plugin
sub headTags {
my $self = shift;
my $session = $self->session;
$session->style->setScript($session->url->extras("yui-webgui/build/form/assetReportQuery.js"),{ type=>"text/javascript" });
$session->style->setScript($session->url->extras("yui-webgui/build/form/assetReportQuery.js"));
}
#-------------------------------------------------------------------

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

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

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

@ -138,8 +138,8 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
my ($style, $url) = $self->session->quick(qw(style url));
$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->setCss($url->extras("yui/build/resize/assets/skins/sam/resize.css"));
$style->setCss($url->extras("yui/build/assets/skins/sam/skin.css"));
$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"));
@ -147,8 +147,8 @@ sub headTags {
$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->setCss($url->extras("yui/build/logger/assets/logger.css"));
#$style->setCss($url->extras("yui/build/logger/assets/skins/sam/logger.css"));
#$style->setScript($url->extras("yui/build/logger/logger.js"));
$self->SUPER::headTags();
}

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

@ -92,18 +92,18 @@ sub headTags {
my $self = shift;
my $url = $self->session->url;
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->setLink($url->extras('/colorpicker/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/colorpicker/colorpicker.js'),{ type=>'text/javascript' });
$style->setCss($url->extras('/yui/build/container/assets/skins/sam/container.css'));
$style->setCss($url->extras('/yui/build/colorpicker/assets/skins/sam/colorpicker.css'));
$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->setCss($url->extras('/colorpicker/colorpicker.css'));
$style->setScript($url->extras('/colorpicker/colorpicker.js'));
}
#-------------------------------------------------------------------

17
lib/WebGUI/Form/DataTable.pm
View file

@ -371,8 +371,7 @@ sub prepare {
# Source in the scripts
my $style = $self->session->style;
my $url = $self->session->url;
$style->setLink( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{ rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$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') );
@ -381,17 +380,9 @@ sub prepare {
# Prepare the editors
if ( $self->get('showEdit') ) {
$style->setLink(
$url->extras( 'yui/build/button/assets/skins/sam/button.css', { rel => "stylesheet", type => "text/css" } )
);
$style->setLink(
$url->extras(
'yui/build/calendar/assets/skins/sam/calendar.css',
{ rel => "stylesheet", type => "text/css" }
)
);
$style->setLink( $url->extras('yui/build/container/assets/skins/sam/container.css'),
{ rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras( 'yui/build/button/assets/skins/sam/button.css'));
$style->setCss( $url->extras( 'yui/build/calendar/assets/skins/sam/calendar.css'));
$style->setCss( $url->extras('yui/build/container/assets/skins/sam/container.css'));
$style->setScript( $url->extras('yui/build/container/container-min.js') );
$style->setScript( $url->extras('yui/build/button/button-min.js') );
$style->setScript( $url->extras('yui/build/calendar/calendar-min.js') );

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

@ -200,15 +200,15 @@ sub headTags {
my $session = $self->session;
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->setCss($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'));
$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'));
}
#-------------------------------------------------------------------

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

@ -211,7 +211,7 @@ sub headTags {
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->setCss($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'));
$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'));

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

@ -245,8 +245,8 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
$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'));
}
#-------------------------------------------------------------------

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

@ -134,7 +134,7 @@ Set the head tags for this form plugin
sub headTags {
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'));
}
#-------------------------------------------------------------------

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

@ -211,7 +211,7 @@ Asset picker for the rich editor.
sub www_pageTree {
my $session = shift;
$session->http->setCacheControl("none");
$session->style->setLink($session->url->extras('/tinymce-webgui/plugins/wgpagetree/css/pagetree.css'),{ type=>'text/css', rel=>"stylesheet" });
$session->style->setCss($session->url->extras('/tinymce-webgui/plugins/wgpagetree/css/pagetree.css'));
$session->style->setRawHeadTags(<<"JS");
<style type="text/css">body { margin: 0 }</style>
<script type="text/javascript">//<![CDATA[
@ -268,7 +268,7 @@ Each link display a thumbnail of the image via www_viewThumbnail.
sub www_imageTree {
my $session = shift;
$session->http->setCacheControl("none");
$session->style->setLink($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'),{ type=>'text/css', rel=>"stylesheet" });
$session->style->setCss($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'));
$session->style->setRawHeadTags(<<"JS");
<style type="text/css">body { margin: 0 }</style>
<script type="text/javascript">//<![CDATA[
@ -347,7 +347,7 @@ URL in the session object is used to determine which Image is used.
sub www_viewThumbnail {
my $session = shift;
$session->http->setCacheControl("none");
$session->style->setLink($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'),{ type=>'text/css', rel=>"stylesheet" });
$session->style->setCss($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'));
my $image = WebGUI::Asset->newByUrl($session);
my $i18n = WebGUI::International->new($session);
my $output = '<div class="preview">';

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

@ -118,7 +118,7 @@ A class method that returns a boolean indicating whether this control is compati
sub headTags {
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'));
}
#-------------------------------------------------------------------

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

@ -134,7 +134,7 @@ Set head tags for this form plugin
sub headTags {
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'));
}
#-------------------------------------------------------------------

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

@ -138,18 +138,9 @@ Send JS required for this plugin.
sub headTags {
my $self = shift;
my ( $url, $style ) = $self->session->quick(qw( url style ));
$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/form/jsontable.js'),
{ type => 'text/javascript' },
);
$style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript( $url->extras('yui/build/json/json-min.js'));
$style->setScript( $url->extras('yui-webgui/build/form/jsontable.js'));
}
#-------------------------------------------------------------------

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

@ -77,10 +77,10 @@ sub headTags {
my $style = $session->style;
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->setCss($url->extras("yui/build/autocomplete/assets/skins/sam/autocomplete.css"));
$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>');
}

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

@ -129,7 +129,7 @@ sub headTags {
my $self = shift;
my ($style, $url) = $self->session->quick(qw(style url));
if ($self->get("resizable")) {
$style->setLink($url->extras("yui/build/resize/assets/skins/sam/resize.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setCss($url->extras("yui/build/resize/assets/skins/sam/resize.css"));
$style->setScript($url->extras("yui/build/utilities/utilities.js"));
$style->setScript($url->extras("yui/build/resize/resize-min.js"));
}

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

@ -165,7 +165,7 @@ Set the head tags for this form plugin
sub headTags {
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'));
}
#-------------------------------------------------------------------

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

@ -135,7 +135,7 @@ Add JS.
sub headTags {
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->SUPER::headTags();
return;
}

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

@ -98,12 +98,13 @@ Set the head tags for this form plugin
sub headTags {
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'});
my ($style, $url) = $self->session->quick(qw/style url/);
$style->setScript($url->extras('form/fieldCheck.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/json/json-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js'));
}
#-------------------------------------------------------------------