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

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

@ -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) ;

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

@ -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'),

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

@ -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>

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

@ -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");

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

@ -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"),

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

@ -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"),

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

@ -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;
}

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

@ -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"))

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

@ -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;
}

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

@ -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'));

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

@ -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;
}

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

@ -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;
}

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

@ -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'));

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

@ -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;
}

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

@ -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

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

@ -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;
}

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

@ -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,

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

@ -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;
}

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

@ -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").' />';

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

@ -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;
}