fix warning and add changelog

This commit is contained in:
Doug Bell 2010-12-07 18:30:39 -06:00
parent 886de768af
commit 9eded35263
2 changed files with 3 additions and 2 deletions

View file

@ -1,5 +1,6 @@
7.10.7
- added #11968: use the language override in the registration form (Jukka Raimovaara / Mentalhouse Oy)
- Changed Carousel to use TinyMCE with WebGUI plugins
7.10.6
- fixed #11974: Toolbar icons unclickable in Webkit using HTML5

View file

@ -142,14 +142,14 @@ sub getEditForm {
my $loadMcePlugins = $richedit->getLoadPlugins;
my $items = $self->get('items') ? JSON->new->decode($self->get('items'))->{items} : [];
$items = JSON->new->encode( $items );
my $i18n = JSON->new->encode( { "delete" => $i18n->get("delete") } );
my $i18nJson = JSON->new->encode( { "delete" => $i18n->get("delete") } );
$tabform->getTab('properties')->raw(<<"ENDHTML");
<div id="carouselEditor"></div>
<script type="text/javascript">
$loadMcePlugins
YAHOO.util.Event.onDOMReady( function() {
window.carouselEditor = new WebGUI.Carousel.Editor( "carouselEditor", $config, $items, $i18n );
window.carouselEditor = new WebGUI.Carousel.Editor( "carouselEditor", $config, $items, $i18nJson );
} );
</script>
ENDHTML