diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index bf7c6347e..43dfa6f8d 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -4,6 +4,7 @@ WebGUI::Operation::FormHelpers::www_formHelper and WebGUI::Operation::Workflow::www_activityHelper for details. - Added pagination to purchase history in commerce. + - Replaced color picker form control with a more robust version. - Added keyword tagging api. - Added keyword tagging to Wiki. - Upgraded TinyMCE to 2.1.1.1. diff --git a/lib/WebGUI/Form/Color.pm b/lib/WebGUI/Form/Color.pm index 5a39a8627..e6b88c58c 100644 --- a/lib/WebGUI/Form/Color.pm +++ b/lib/WebGUI/Form/Color.pm @@ -89,8 +89,25 @@ Renders a color picker control. sub toHtml { my $self = shift; - $self->session->style->setScript($self->session->url->extras('colorPicker.js'),{ type=>'text/javascript' }); - return ''; + my $url = $self->session->url; + my $style = $self->session->style; + $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/animation/animation-min.js'),{ type=>'text/javascript' }); + $style->setLink($url->extras('/colorpicker/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" }); + $style->setScript($url->extras('/colorpicker/color.js'),{ type=>'text/javascript' }); + $style->setScript($url->extras('/colorpicker/key.js'),{ type=>'text/javascript' }); + $style->setScript($url->extras('/yui/build/slider/slider-min.js'),{ type=>'text/javascript' }); + $style->setScript($url->extras('/colorpicker/colorpicker.js'),{ type=>'text/javascript' }); + my $id = $self->get("id"); + my $value = $self->get("value"); + return q| + |; + } 1; diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm index 5d6303bc1..79b64cc19 100644 --- a/lib/WebGUI/Form/Textarea.pm +++ b/lib/WebGUI/Form/Textarea.pm @@ -121,9 +121,9 @@ sub toHtml { $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->setLink($url->extras("yui-ext/resources/css/ext-all.css"), {type=>"text/css", rel=>"stylesheet"}); - $style->setScript($url->extras("yui-ext/adapter/yui/ext-yui-adapter.js"), {type=>"text/javascript"}); - $style->setScript($url->extras("yui-ext/ext-all.js"), {type=>"text/javascript"}); + $style->setLink($url->extras("extjs/resources/css/ext-all.css"), {type=>"text/css", rel=>"stylesheet"}); + $style->setScript($url->extras("extjs/adapter/yui/ext-yui-adapter.js"), {type=>"text/javascript"}); + $style->setScript($url->extras("extjs/ext-all.js"), {type=>"text/javascript"}); $out .= qq| - - + + + + + + + + + + + + + +
+ + + + + +