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

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 }) {