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

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

@ -129,9 +129,9 @@ sub www_view {
showAdminBar => 1
} );
my ($style, $url) = $session->quick(qw(style url));
$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->setCss($url->extras('/yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setCss($url->extras('yui/build/paginator/assets/skins/sam/paginator.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/paginator/paginator-min.js'));

10
lib/WebGUI/Content/AssetManager.pm
View file

@ -356,10 +356,10 @@ sub www_manage {
);
# Add script and stylesheets
$session->style->setLink( $session->url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type=>'text/css'});
$session->style->setLink( $session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
$session->style->setLink( $session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>'stylesheet', type=>'text/css'});
$session->style->setLink( $session->url->extras('yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
$session->style->setCss( $session->url->extras('yui/build/paginator/assets/skins/sam/paginator.css'));
$session->style->setCss( $session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$session->style->setCss( $session->url->extras('yui/build/menu/assets/skins/sam/menu.css'));
$session->style->setCss( $session->url->extras('yui-webgui/build/assetManager/assetManager.css' ));
$session->style->setScript( $session->url->extras( 'yui/build/utilities/utilities.js' ) );
$session->style->setScript( $session->url->extras( 'yui/build/paginator/paginator-min.js ' ) );
@ -541,7 +541,7 @@ sub www_search {
my $currentAsset = getCurrentAsset($session);
my $output = '<div id="assetSearch">' . getHeader( $session );
$session->style->setLink( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
$session->style->setCss( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.css' ));
$session->style->setScript( $session->url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ) );
$session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) );
$session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) );