Skip to content

Commit

Permalink
Item12685: use jquery means to initiate the editor properly
Browse files Browse the repository at this point in the history
Item12583: revert to simple floats in $VERSION

Also: using the default theme for tinymce 3.x now. the o2k7 theme conflicts with the rest of the site too much.



git-svn-id: http://svn.foswiki.org/trunk@17151 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Dec 11, 2013
1 parent 65258b7 commit 0c542ff
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
4 changes: 2 additions & 2 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ Below is the default configuration. If it is to be modified, it should be copied
"theme_advanced_resize_horizontal" : false,
"theme_advanced_resizing" : true,
"theme_advanced_path" : false,
"theme_advanced_statusbar_location" : "bottom",
"theme_advanced_statusbar_location" : "none",
"skin" : "%IF{
"defined 'TINYMCEPLUGIN_MCESKIN'"
then="%TINYMCEPLUGIN_MCESKIN%"
else="%STARTSECTION{"MCESKIN"}%o2k7%ENDSECTION{"MCESKIN"}%"
else="%STARTSECTION{"MCESKIN"}%default%ENDSECTION{"MCESKIN"}%"
}%",
%IF{
"defined 'TINYMCEPLUGIN_MCESKIN_VARIANT' AND $'TINYMCEPLUGIN_MCESKIN_VARIANT'"
Expand Down
1 change: 1 addition & 0 deletions TinyMCEPlugin/data/System/TinyMCEQuickHelp.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
%META:TOPICINFO{author="BaseUserMapping_999" comment="autosave" date="1356278781" format="1.1" version="1"}%
%META:TOPICPARENT{name="TinyMCEPlugin"}%
---+!! !TinyMCE Editor Help Summary
<!--%STARTSECTION{"CSS"}%<style type="text/css" media="all">
Expand Down
17 changes: 4 additions & 13 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use warnings;

use Assert;

use version; our $VERSION = version->declare("v1.2.9");
our $RELEASE = '1.2.9';
our $VERSION = '1.29';
our $RELEASE = '1.29';
our $SHORTDESCRIPTION = 'Integration of the Tiny MCE WYSIWYG Editor';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -176,19 +176,10 @@ sub installTinyMCE {
require Foswiki::Plugins::JQueryPlugin;
Foswiki::Plugins::JQueryPlugin::createPlugin("tinymce");

# Inline JS to set config? Heresy! Well, we were encoding into <meta tags
# but this caused problems with non-8bit encodings (See Item9973). Given
# that we blindly eval'd the unescaped TINYMCEPLUGIN_INIT anyway, PaulHarvey
# doesn't think it was any more secure anyway. Alternative is to use
# https://github.com/douglascrockford/JSON-js lib
#TODO: move this into a wysiwyg.tinymce.tmpl file, and call it from wysiwyg rather than tinymce

my $scripts = <<"SCRIPT";
<script type="text/javascript">
init = {
$init
};
FoswikiTiny.install(init);
jQuery(function(\$) { FoswikiTiny.install(); });
FoswikiTiny.init = {$init};
</script>
SCRIPT

Expand Down

0 comments on commit 0c542ff

Please sign in to comment.