From 3fbc10942991aa43673a2b9c4a15823f02c3b0ab Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 24 Jun 2010 13:07:03 -0700
Subject: [PATCH] Update Session->Style setScript to default to
 text/javascript.  Update the entire codebase to take advantage of it.

---
 lib/WebGUI/Admin.pm                        | 16 +++----
 lib/WebGUI/Asset.pm                        |  8 ++--
 lib/WebGUI/Asset/File/Image.pm             | 34 ++++++-------
 lib/WebGUI/Asset/MatrixListing.pm          | 15 ++----
 lib/WebGUI/Asset/RichEdit.pm               |  8 ++--
 lib/WebGUI/Asset/Shortcut.pm               |  2 +-
 lib/WebGUI/Asset/Sku/ThingyRecord.pm       | 20 ++------
 lib/WebGUI/Asset/Template.pm               | 12 ++---
 lib/WebGUI/Asset/Wobject/Carousel.pm       |  9 ++--
 lib/WebGUI/Asset/Wobject/Dashboard.pm      |  5 +-
 lib/WebGUI/Asset/Wobject/DataForm.pm       |  2 +-
 lib/WebGUI/Asset/Wobject/Layout.pm         |  8 ++--
 lib/WebGUI/Asset/Wobject/Map.pm            | 20 ++++----
 lib/WebGUI/Asset/Wobject/Matrix.pm         | 55 ++++++++--------------
 lib/WebGUI/Asset/Wobject/Navigation.pm     |  8 ++--
 lib/WebGUI/Asset/Wobject/ProjectManager.pm | 51 ++++----------------
 lib/WebGUI/Asset/Wobject/SQLReport.pm      |  2 +-
 lib/WebGUI/Asset/Wobject/Thingy.pm         | 15 ++----
 lib/WebGUI/AssetClipboard.pm               |  2 +-
 lib/WebGUI/AssetTrash.pm                   |  2 +-
 lib/WebGUI/Content/AssetHistory.pm         | 14 +++---
 lib/WebGUI/Content/Setup.pm                | 20 ++++----
 lib/WebGUI/Form/Attachments.pm             |  6 +--
 lib/WebGUI/Form/CheckList.pm               |  4 +-
 lib/WebGUI/Form/Codearea.pm                | 16 +++----
 lib/WebGUI/Form/Color.pm                   | 18 +++----
 lib/WebGUI/Form/Date.pm                    | 16 +++----
 lib/WebGUI/Form/DateTime.pm                | 16 +++----
 lib/WebGUI/Form/Email.pm                   |  2 +-
 lib/WebGUI/Form/File.pm                    |  4 +-
 lib/WebGUI/Form/Float.pm                   |  2 +-
 lib/WebGUI/Form/HTMLArea.pm                |  2 +-
 lib/WebGUI/Form/Hexadecimal.pm             |  2 +-
 lib/WebGUI/Form/Integer.pm                 |  2 +-
 lib/WebGUI/Form/Keywords.pm                |  6 +--
 lib/WebGUI/Form/Phone.pm                   |  2 +-
 lib/WebGUI/Form/Slider.pm                  |  6 +--
 lib/WebGUI/Form/Textarea.pm                | 14 ++----
 lib/WebGUI/Form/TimeField.pm               |  2 +-
 lib/WebGUI/Form/Url.pm                     |  2 +-
 lib/WebGUI/Form/Username.pm                | 12 ++---
 lib/WebGUI/Form/Zipcode.pm                 |  2 +-
 lib/WebGUI/HTMLForm.pm                     | 10 ++--
 lib/WebGUI/Macro/AdminBar.pm               |  4 +-
 lib/WebGUI/Macro/Widget.pm                 | 15 ++----
 lib/WebGUI/Session/Style.pm                |  6 ++-
 lib/WebGUI/Shop/ShipDriver/UPS.pm          | 25 ++--------
 lib/WebGUI/Shop/TaxDriver/EU.pm            | 14 +++---
 lib/WebGUI/Shop/TaxDriver/Generic.pm       | 10 ++--
 lib/WebGUI/Shop/Transaction.pm             | 10 ++--
 lib/WebGUI/Shop/Vendor.pm                  | 20 ++++----
 lib/WebGUI/TabForm.pm                      |  8 ++--
 t/Session/Style.t                          | 20 +++++---
 53 files changed, 254 insertions(+), 352 deletions(-)

diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm
index d4da2391f..7e0fca3cd 100644
--- a/lib/WebGUI/Admin.pm
+++ b/lib/WebGUI/Admin.pm
@@ -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' ) );
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 6334f4a06..35c791a5f 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -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" />'
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 7e9318d16..90e14a36c 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -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");
 
diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index 2cb7893a8..d2239fad1 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -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'});
 
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 490e192e7..7ce3faecf 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -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>|;
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 0f23d6e67..d823095eb 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -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>|;
diff --git a/lib/WebGUI/Asset/Sku/ThingyRecord.pm b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
index d510325cd..77dc38149 100644
--- a/lib/WebGUI/Asset/Sku/ThingyRecord.pm
+++ b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
@@ -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')} );
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index a58f5b8aa..7b934be1f 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -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');
diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm
index 61bc36be3..7f3573a97 100644
--- a/lib/WebGUI/Asset/Wobject/Carousel.pm
+++ b/lib/WebGUI/Asset/Wobject/Carousel.pm
@@ -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">'
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index 95c105dfc..5c1fbd730 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -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"] });
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 6049abea5..be2e1c543 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -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) {
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index d55e9af05..8d37ec0a8 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -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('
diff --git a/lib/WebGUI/Asset/Wobject/Map.pm b/lib/WebGUI/Asset/Wobject/Map.pm
index bc3bba2bc..010d7c179 100644
--- a/lib/WebGUI/Asset/Wobject/Map.pm
+++ b/lib/WebGUI/Asset/Wobject/Map.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index f151752c9..a512ecdef 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -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;
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 7926ef82d..36ef29ad3 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -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" />'
diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
index 5b3209ac9..1e5eaa3fc 100644
--- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm
+++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
@@ -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=?|;   
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index d16967245..f089c5d45 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -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
 	
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 8cf7fc270..eefd3295e 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -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 }) {
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 51b370912..d861868a3 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -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[
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index e954a4445..30ab4e5c9 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -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[
diff --git a/lib/WebGUI/Content/AssetHistory.pm b/lib/WebGUI/Content/AssetHistory.pm
index 4780509eb..6c756d80d 100644
--- a/lib/WebGUI/Content/AssetHistory.pm
+++ b/lib/WebGUI/Content/AssetHistory.pm
@@ -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);
diff --git a/lib/WebGUI/Content/Setup.pm b/lib/WebGUI/Content/Setup.pm
index 85a3f7407..da463dd95 100644
--- a/lib/WebGUI/Content/Setup.pm
+++ b/lib/WebGUI/Content/Setup.pm
@@ -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 .= '
diff --git a/lib/WebGUI/Form/Attachments.pm b/lib/WebGUI/Form/Attachments.pm
index 3a4ca18ed..69f7c8fd1 100644
--- a/lib/WebGUI/Form/Attachments.pm
+++ b/lib/WebGUI/Form/Attachments.pm
@@ -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) ;
diff --git a/lib/WebGUI/Form/CheckList.pm b/lib/WebGUI/Form/CheckList.pm
index 2d9163661..e2daaa57e 100644
--- a/lib/WebGUI/Form/CheckList.pm
+++ b/lib/WebGUI/Form/CheckList.pm
@@ -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'),
diff --git a/lib/WebGUI/Form/Codearea.pm b/lib/WebGUI/Form/Codearea.pm
index 3f276d561..9102b99fd 100644
--- a/lib/WebGUI/Form/Codearea.pm
+++ b/lib/WebGUI/Form/Codearea.pm
@@ -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>
diff --git a/lib/WebGUI/Form/Color.pm b/lib/WebGUI/Form/Color.pm
index 43b3e4c25..eeb20ac2c 100644
--- a/lib/WebGUI/Form/Color.pm
+++ b/lib/WebGUI/Form/Color.pm
@@ -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");
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index 501a4135d..99b8e47b2 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -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"),
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index ff5e16b29..cbd5be071 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -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"),
diff --git a/lib/WebGUI/Form/Email.pm b/lib/WebGUI/Form/Email.pm
index a16ab6925..c9e3fac7d 100644
--- a/lib/WebGUI/Form/Email.pm
+++ b/lib/WebGUI/Form/Email.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/File.pm b/lib/WebGUI/Form/File.pm
index b6333d123..1564aa6fb 100644
--- a/lib/WebGUI/Form/File.pm
+++ b/lib/WebGUI/Form/File.pm
@@ -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"))
diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm
index 2e1866420..5ef82df8b 100644
--- a/lib/WebGUI/Form/Float.pm
+++ b/lib/WebGUI/Form/Float.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm
index 83f03bd5c..9113ed85a 100644
--- a/lib/WebGUI/Form/HTMLArea.pm
+++ b/lib/WebGUI/Form/HTMLArea.pm
@@ -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'));
diff --git a/lib/WebGUI/Form/Hexadecimal.pm b/lib/WebGUI/Form/Hexadecimal.pm
index ce4062c52..d43a09a3a 100644
--- a/lib/WebGUI/Form/Hexadecimal.pm
+++ b/lib/WebGUI/Form/Hexadecimal.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/Integer.pm b/lib/WebGUI/Form/Integer.pm
index 4a248d3f4..422e82267 100644
--- a/lib/WebGUI/Form/Integer.pm
+++ b/lib/WebGUI/Form/Integer.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/Keywords.pm b/lib/WebGUI/Form/Keywords.pm
index b2e24b39a..274fdf3a7 100644
--- a/lib/WebGUI/Form/Keywords.pm
+++ b/lib/WebGUI/Form/Keywords.pm
@@ -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'));
diff --git a/lib/WebGUI/Form/Phone.pm b/lib/WebGUI/Form/Phone.pm
index ad9429102..06d17ec4b 100644
--- a/lib/WebGUI/Form/Phone.pm
+++ b/lib/WebGUI/Form/Phone.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/Slider.pm b/lib/WebGUI/Form/Slider.pm
index 40ccdc599..72ab34432 100644
--- a/lib/WebGUI/Form/Slider.pm
+++ b/lib/WebGUI/Form/Slider.pm
@@ -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 
diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm
index cd18000eb..e34a4811e 100644
--- a/lib/WebGUI/Form/Textarea.pm
+++ b/lib/WebGUI/Form/Textarea.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/TimeField.pm b/lib/WebGUI/Form/TimeField.pm
index e31c41f05..09c8a1cb3 100644
--- a/lib/WebGUI/Form/TimeField.pm
+++ b/lib/WebGUI/Form/TimeField.pm
@@ -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,
diff --git a/lib/WebGUI/Form/Url.pm b/lib/WebGUI/Form/Url.pm
index 528928260..043d00b46 100644
--- a/lib/WebGUI/Form/Url.pm
+++ b/lib/WebGUI/Form/Url.pm
@@ -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;
 }
diff --git a/lib/WebGUI/Form/Username.pm b/lib/WebGUI/Form/Username.pm
index c1d6509f4..66a02575f 100644
--- a/lib/WebGUI/Form/Username.pm
+++ b/lib/WebGUI/Form/Username.pm
@@ -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").' />';
diff --git a/lib/WebGUI/Form/Zipcode.pm b/lib/WebGUI/Form/Zipcode.pm
index 9d71ad137..6f73c6b1b 100644
--- a/lib/WebGUI/Form/Zipcode.pm
+++ b/lib/WebGUI/Form/Zipcode.pm
@@ -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;
 }
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index b304bd2ce..faf61d0b7 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -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};
 }
 
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 6b2a207b2..7e8f057a6 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -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">};
diff --git a/lib/WebGUI/Macro/Widget.pm b/lib/WebGUI/Macro/Widget.pm
index 6c4bba62c..bc252e2a8 100644
--- a/lib/WebGUI/Macro/Widget.pm
+++ b/lib/WebGUI/Macro/Widget.pm
@@ -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); };
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index 374c57285..50d0777bc 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -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.'"';
diff --git a/lib/WebGUI/Shop/ShipDriver/UPS.pm b/lib/WebGUI/Shop/ShipDriver/UPS.pm
index 26b92bb29..b6138ac92 100644
--- a/lib/WebGUI/Shop/ShipDriver/UPS.pm
+++ b/lib/WebGUI/Shop/ShipDriver/UPS.pm
@@ -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 );
diff --git a/lib/WebGUI/Shop/TaxDriver/EU.pm b/lib/WebGUI/Shop/TaxDriver/EU.pm
index 10d11327d..36f33a10f 100644
--- a/lib/WebGUI/Shop/TaxDriver/EU.pm
+++ b/lib/WebGUI/Shop/TaxDriver/EU.pm
@@ -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');
diff --git a/lib/WebGUI/Shop/TaxDriver/Generic.pm b/lib/WebGUI/Shop/TaxDriver/Generic.pm
index a3ca16d11..31df0c973 100644
--- a/lib/WebGUI/Shop/TaxDriver/Generic.pm
+++ b/lib/WebGUI/Shop/TaxDriver/Generic.pm
@@ -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');
diff --git a/lib/WebGUI/Shop/Transaction.pm b/lib/WebGUI/Shop/Transaction.pm
index 7b3535232..3eeb7e318 100644
--- a/lib/WebGUI/Shop/Transaction.pm
+++ b/lib/WebGUI/Shop/Transaction.pm
@@ -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>');
diff --git a/lib/WebGUI/Shop/Vendor.pm b/lib/WebGUI/Shop/Vendor.pm
index f290f11a8..bf9a6d3e6 100644
--- a/lib/WebGUI/Shop/Vendor.pm
+++ b/lib/WebGUI/Shop/Vendor.pm
@@ -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);
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index 909886298..73b84915d 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -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">';
diff --git a/t/Session/Style.t b/t/Session/Style.t
index 9919ae0c6..62afdd969 100644
--- a/t/Session/Style.t
+++ b/t/Session/Style.t
@@ -19,8 +19,9 @@ use WebGUI::Asset;
 use WebGUI::VersionTag;
 use WebGUI;
 
-use Test::More tests => 58; # increment this value for each test you create
+use Test::More;
 use Test::Deep;
+use Data::Dumper;
  
 my $session = WebGUI::Test->session;
  
@@ -137,19 +138,22 @@ is($url, '-', 'setScript: called with no params or script url');
 $style->setScript('http://www.plainblack.com/stuff.js');
 is($style->setScript('http://www.plainblack.com/stuff.js'), undef, 'setScript: called with duplicate url returns undef');
 my $scriptOutput = $style->generateAdditionalHeadTags;
-($url) = simpleLinkParser('script', $scriptOutput);
-is($url, 'http://www.plainblack.com/stuff.js', 'setScript: called with script url');
+diag $scriptOutput;
+($url, $params) = simpleLinkParser('script', $scriptOutput);
+is($url, 'http://www.plainblack.com/stuff.js', '... called with script url');
+diag Dumper $params;
+is_deeply($params, { type => 'text/javascript', }, '... defaults to text/javascript');
 
-my $setParams = { type => 'text/javascript' };
+my $setParams = { type => 'textual/mongoscript' };
 my $setUrl = 'http://www.webguidev.org/sorting.js';
 $style->setScript($setUrl, $setParams);
 my $scriptOutput = $style->generateAdditionalHeadTags;
 ($url, $params) = simpleLinkParser('script', $scriptOutput);
-is($url, $setUrl, 'setScript: called with new script url');
-is_deeply($params, $setParams, 'setScript: params set properly');
+is($url, $setUrl, '... called with new script url');
+is_deeply($params, $setParams, '... params set properly');
 
 sendImmediate($style, 'setScript', 'http://dev.setscript.com/script.js',
-	'setScript, sent: data automatically sent out via Session->Output');
+	'... sent: data automatically sent out via Session->Output');
 
 TODO: {
 	local $TODO = "more setScript tests";
@@ -406,6 +410,8 @@ is($style->process('test output'),
 	"WebGUI was unable to instantiate your style template with the id: .test output",
 	'process:  no valid printableStyleTemplateFound in asset branch returns error');
 
+done_testing();
+
 ####################################################
 #
 # Utility routines for printing