fixed: Rich editor no longer makes other form controls show up as code in Safari 3
This commit is contained in:
parent
fb81e7d67b
commit
d3a7ef6e01
2 changed files with 6 additions and 1 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
7.5.14
|
7.5.14
|
||||||
- fixed: Non-admin users can now add Gallery assets
|
- fixed: Non-admin users can now add Gallery assets
|
||||||
- fixed: Thingy Data now retains File and Images if they aren't explicitly deleted
|
- fixed: Thingy Data now retains File and Images if they aren't explicitly deleted
|
||||||
|
- fixed: Rich Editor no longer makes other form controls show up as code in Safari 3
|
||||||
|
|
||||||
7.5.13
|
7.5.13
|
||||||
- fixed: storage locations for some assets in packages not imported correctly
|
- fixed: storage locations for some assets in packages not imported correctly
|
||||||
|
|
|
||||||
|
|
@ -557,11 +557,15 @@ sub getRichEditor {
|
||||||
|
|
||||||
$self->session->style->setScript($self->session->url->extras('tinymce/jscripts/tiny_mce/tiny_mce.js'),{type=>"text/javascript"});
|
$self->session->style->setScript($self->session->url->extras('tinymce/jscripts/tiny_mce/tiny_mce.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("tinymce-webgui/callbacks.js"),{type=>"text/javascript"});
|
||||||
|
$self->session->style->setScript( $self->session->url->extras( "yui/build/yahoo-dom-event/yahoo-dom-event.js" ), { type => "text/javascript" } );
|
||||||
my $out = "<script type=\"text/javascript\">\n";
|
my $out = "<script type=\"text/javascript\">\n";
|
||||||
while (my ($plugin, $path) = each %loadPlugins) {
|
while (my ($plugin, $path) = each %loadPlugins) {
|
||||||
$out .= "tinymce.PluginManager.load('$plugin', '$path');\n";
|
$out .= "tinymce.PluginManager.load('$plugin', '$path');\n";
|
||||||
}
|
}
|
||||||
$out .= "tinyMCE.init(" . JSON->new->utf8->pretty->encode(\%config) . ");\n</script>";
|
$out .= "YAHOO.util.Event.addListener( window, 'load', function () { \n"
|
||||||
|
. "\ttinyMCE.init(" . JSON->new->utf8->pretty->encode(\%config) . " )\n"
|
||||||
|
. "} );\n"
|
||||||
|
. "</script>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue