diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm index 882fa48ad..700574ebf 100644 --- a/lib/WebGUI/Form/Float.pm +++ b/lib/WebGUI/Form/Float.pm @@ -116,7 +116,7 @@ Renders a floating point field. sub toHtml { my $self = shift; - $self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' }); + $self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' }); $self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789-.\')"'); return $self->SUPER::toHtml; } diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm index b860cebe4..045c545cf 100644 --- a/lib/WebGUI/Form/HTMLArea.pm +++ b/lib/WebGUI/Form/HTMLArea.pm @@ -123,7 +123,7 @@ Renders an HTML area field. sub toHtml { my $self = shift; - $self->session->style->setScript($self->session->config->get("extrasURL").'/textFix.js',{ type=>'text/javascript' }); + $self->session->style->setScript($self->session->url->extras('textFix.js'),{ type=>'text/javascript' }); $self->set("extras", $self->get('extras') . ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" '); $self->set("resizeable", 0); return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->session,$self->get("richEditId"))->getRichEditor($self->get('id')); diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm index c96f98888..61ba97460 100644 --- a/lib/WebGUI/Form/Image.pm +++ b/lib/WebGUI/Form/Image.pm @@ -163,7 +163,7 @@ 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->config->get("extrasURL").'/FileUploadControl.js',{type=>"text/javascript"}); + $self->session->style->setScript($self->session->url->extras('/FileUploadControl.js'),{type=>"text/javascript"}); $uploadControl = ''; + return $self->{_header}.$self->{_data}.$self->{_footer}.''; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm index 782feaaed..bc8de916a 100644 --- a/lib/WebGUI/Operation/Commerce.pm +++ b/lib/WebGUI/Operation/Commerce.pm @@ -698,7 +698,7 @@ sub www_editCommerceSettings { $tabform->submit; - $session->style->setScript($session->config->get("extrasURL").'/swapLayers.js',{type=>"text/javascript"}); + $session->style->setScript($session->url->extras('swapLayers.js'),{type=>"text/javascript"}); return _submenu($session,$tabform->print, 'edit commerce settings title', 'commerce manage'); } diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm index c45da6ccb..e5cff7e55 100644 --- a/lib/WebGUI/Operation/FormHelpers.pm +++ b/lib/WebGUI/Operation/FormHelpers.pm @@ -93,7 +93,7 @@ sub www_richEditPageTree { -value=>$i18n->get('done'), -extras=>'onclick="createLink()"' ); - $session->style->setScript($session->config->get("extrasURL")."/tinymce2/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"}); + $session->style->setScript($session->url->extras('tinymce2/jscripts/tiny_mce/tiny_mce_popup.js'),{type=>"text/javascript"}); my $output = '
-