Skip to content

Commit

Permalink
Item2245: Upgrade TinyMCEPlugin to 3.2.7
Browse files Browse the repository at this point in the history 
merge 5301 and 5302 to release branch


git-svn-id: http://svn.foswiki.org/branches/Release01x00@5313 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
KennethLavrsen authored and KennethLavrsen committed Oct 18, 2009
1 parent 3785252 commit a66ebd4
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 33 deletions.
2 changes: 1 addition & 1 deletion TinyMCEPlugin/data/System/TinyMCEPlugin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ urlconverter_callback : "FoswikiTiny.convertLink",
foswikipuburl_callback : "FoswikiTiny.convertPubURL",
save_callback : "FoswikiTiny.saveCallback",
%IF{"$TINYMCEPLUGIN_DEBUG" then="debug:true,"}%
plugins : "table,searchreplace,autosave,paste,safari,inlinepopups,fullscreen,foswikibuttons,foswikiimage%IF{ "context TinyMCEUsabilityUpgradePluginEnabled" then=",foswikilink" else=""}%",
plugins : "table,searchreplace,autosave,paste,safari,inlinepopups,fullscreen,wordcount,foswikibuttons,foswikiimage%IF{ "context TinyMCEUsabilityUpgradePluginEnabled" then=",foswikilink" else=""}%",
foswiki_secret_id : "%WYSIWYG_SECRET_ID%",
foswiki_vars : { PUBURLPATH : "%PUBURLPATH%", PUBURL : "%PUBURL%", WEB : "%WEB%", TOPIC : "%TOPIC%", ATTACHURL : "%ATTACHURL%", ATTACHURLPATH : "%ATTACHURLPATH%", VIEWSCRIPTURL : "%SCRIPTURL{view}%", SCRIPTSUFFIX: "%SCRIPTSUFFIX%", SCRIPTURL : "%SCRIPTURL%", SYSTEMWEB: "%SYSTEMWEB%" },
theme_advanced_toolbar_align : "left",
Expand Down
2 changes: 1 addition & 1 deletion TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ urlconverter_callback : "FoswikiTiny.convertLink",
foswikipuburl_callback : "FoswikiTiny.convertPubURL",
save_callback : "FoswikiTiny.saveCallback",
%IF{"$TINYMCEPLUGIN_DEBUG" then="debug:true,"}%
plugins : "table,searchreplace,autosave,paste,safari,inlinepopups,fullscreen,foswikibuttons,foswikiimage%IF{ "context TinyMCEUsabilityUpgradePluginEnabled" then=",foswikilink" else=""}%",
plugins : "table,searchreplace,autosave,paste,safari,inlinepopups,fullscreen,wordcount,foswikibuttons,foswikiimage%IF{ "context TinyMCEUsabilityUpgradePluginEnabled" then=",foswikilink" else=""}%",
foswiki_secret_id : "%WYSIWYG_SECRET_ID%",
foswiki_vars : { PUBURLPATH : "%PUBURLPATH%", PUBURL : "%PUBURL%", WEB : "%WEB%", TOPIC : "%TOPIC%", ATTACHURL : "%ATTACHURL%", ATTACHURLPATH : "%ATTACHURLPATH%", VIEWSCRIPTURL : "%SCRIPTURL{view}%", SCRIPTSUFFIX: "%SCRIPTSUFFIX%", SCRIPTURL : "%SCRIPTURL%", SYSTEMWEB: "%SYSTEMWEB%" },
theme_advanced_toolbar_align : "left",
Expand Down
104 changes: 73 additions & 31 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ data/System/TinyMCEPlugin.txt 0644
!noci
data/System/TinyMCEFrequentlyAskedQuestions.txt 0644
data/System/TinyMCEQuickHelp.txt 0644
lib/Foswiki/Plugins/TinyMCEPlugin.pm 0755
lib/Foswiki/Plugins/TinyMCEPlugin.pm 0644
pub/System/TinyMCEPlugin/anchor.gif 0644
pub/System/TinyMCEPlugin/foswiki.js 0644
pub/System/TinyMCEPlugin/foswiki_src.js 0644
pub/System/TinyMCEPlugin/foswiki_tiny.js 0644
pub/System/TinyMCEPlugin/foswiki_tiny_src.js 0644
pub/System/TinyMCEPlugin/anchor.gif 0777
pub/System/TinyMCEPlugin/indent.gif 0777
pub/System/TinyMCEPlugin/link.gif 0777
pub/System/TinyMCEPlugin/outdent.gif 0777
pub/System/TinyMCEPlugin/screenshot.gif 0777
pub/System/TinyMCEPlugin/tinymce.gif 0777
pub/System/TinyMCEPlugin/unlink.gif 0777
pub/System/TinyMCEPlugin/indent.gif 0644
pub/System/TinyMCEPlugin/link.gif 0644
pub/System/TinyMCEPlugin/outdent.gif 0644
pub/System/TinyMCEPlugin/screenshot.gif 0644
pub/System/TinyMCEPlugin/tinymce.gif 0644
pub/System/TinyMCEPlugin/tinymce/build.bat 0644
pub/System/TinyMCEPlugin/tinymce/build.xml 0644
pub/System/TinyMCEPlugin/tinymce/changelog.txt 0644
pub/System/TinyMCEPlugin/tinymce/examples/css/content.css 0644
pub/System/TinyMCEPlugin/tinymce/examples/css/word.css 0644
pub/System/TinyMCEPlugin/tinymce/examples/full.html 0644
pub/System/TinyMCEPlugin/tinymce/examples/full_jquery.html 0644
pub/System/TinyMCEPlugin/tinymce/examples/index.html 0644
pub/System/TinyMCEPlugin/tinymce/examples/lists/image_list.js 0644
pub/System/TinyMCEPlugin/tinymce/examples/lists/link_list.js 0644
Expand Down Expand Up @@ -53,6 +53,7 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/Popup.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/UndoManager.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/WindowManager.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/adapter/jquery/adapter.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/adapter/jquery/jquery.tinymce.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/adapter/prototype/adapter.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/commands/BlockQuote.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/commands/CutCopyPaste.js 0644
Expand All @@ -62,6 +63,7 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/commands/UndoRedo.js
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/DOMUtils.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/Element.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/Event.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/EventUtils.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/Range.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/ScriptLoader.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/dom/Selection.js 0644
Expand Down Expand Up @@ -93,6 +95,7 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/util/JSONRequest.js 0
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/util/URI.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/util/XHR.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/classes/xml/Parser.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/jquery.tinymce.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/langs/en.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/license.txt 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css 0644
Expand All @@ -114,6 +117,8 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 0644
Expand Down Expand Up @@ -152,32 +157,32 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/example/img/example.g
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach.htm 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/colours.htm 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/css/popup.css 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/css/popup_src.css 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/attach.gif 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/colour.gif 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/hide.gif 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/tt.gif 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach_src.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/colour.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/colour_src.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/langs/en.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/colours.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/css/popup.css 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/css/popup_src.css 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/attach.gif 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/colour.gif 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/hide.gif 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/img/tt.gif 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/colour.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/colour_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/langs/en.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/langs/en_dlg.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage.css 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage_src.css 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin_src.js 0755
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/image.htm 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/img/sample.gif 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage.css 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage_src.css 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/image.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/img/sample.gif 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/js/image.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/langs/en.js 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/langs/en.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/langs/en_dlg.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/readme.txt 0777
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/readme.txt 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js 0644
Expand Down Expand Up @@ -291,6 +296,8 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/template/template.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm 0644
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm 0644
Expand Down Expand Up @@ -374,15 +381,18 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/utils/validate.js 0644
#pub/System/TinyMCEPlugin/tinymce/tests/crossdomain.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/css/unit.css 0644
#pub/System/TinyMCEPlugin/tinymce/tests/index.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/jquery_plugin.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/js/api.js 0644
#pub/System/TinyMCEPlugin/tinymce/tests/js/testrunner.js 0644
#pub/System/TinyMCEPlugin/tinymce/tests/main.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/media.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/menu.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/parts.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/paste.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/performance.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/range.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/removeformat.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/selection.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/slickspeed/config.ini 0644
#pub/System/TinyMCEPlugin/tinymce/tests/slickspeed/footer.html 0644
#pub/System/TinyMCEPlugin/tinymce/tests/slickspeed/header.html 0644
Expand All @@ -403,6 +413,38 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/utils/validate.js 0644
#pub/System/TinyMCEPlugin/tinymce/tools/ant/svnjavahl.jar 0644
#pub/System/TinyMCEPlugin/tinymce/tools/ant/svnkit.jar 0644
#pub/System/TinyMCEPlugin/tinymce/tools/ant/yuicompressor.jar 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/class.xsl 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/css/general.css 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/css/grids.css 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/css/jquery.treeview.css 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/css/reset.css 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/css/shCore.css 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/css/shThemeMoxieDoc.css 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/class.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/event.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/help.png 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/inherit-arrow.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/inherited.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/loader.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/magnifier.png 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/method.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/namespace.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/page_white_code.png 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/page_white_copy.png 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/printer.png 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/property.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/root.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/static.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/treeview-famfamfam.gif 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/img/wrapping.png 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/index.xsl 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/js/clipboard.swf 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/js/general.js 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/js/jquery.treeview.min.js 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/js/shBrushJScript.js 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/js/shCore.js 0644
#pub/System/TinyMCEPlugin/tinymce/tools/templates/member.xsl 0644
pub/System/TinyMCEPlugin/unlink.gif 0644
pub/System/TinyMCEPlugin/verbatim.gif 0644
pub/System/TinyMCEPlugin/wikiringlogo20x20.png 0644
pub/System/TinyMCEPlugin/wysiwyg.css 0644
Expand Down

0 comments on commit a66ebd4

Please sign in to comment.