Item2412: Merge from release branch: Fix image insert dialog (r5628),…

… bump release version & rebuild, apply eol-style (r5629, r5630) git-svn-id: http://svn.foswiki.org/trunk@5654 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 25, 2009 · b912958 · b912958
1 parent f40c825
commit b912958
Show file tree

Hide file tree

Showing 49 changed files with 4,435 additions and 48 deletions.
diff --git a/TinyMCEPlugin/data/System/TinyMCEPlugin.txt b/TinyMCEPlugin/data/System/TinyMCEPlugin.txt
@@ -156,6 +156,7 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  25 Nov 2009 | Foswikitask:Item2412: Inserting images - fixed a problem where it wasn't easy (impossible unless > 1 attachments) to select the first image in the attachment list; improved layout of dialog window where preview obscures insert/cancel buttons. |
 |  09 Nov 2009 | Foswikitask:Item2341: Added blockquote button and rearranged toolbars slightly; cleaned up System topic |
 |  29 Oct 2009 | Foswikitask:Item2245: Updated documentation, removed redundant setting: =paste_auto_cleanup_on_paste : true= for MSIE browsers (!TinyMCE now defaults to =true= for all browsers) |
 |  21 Oct 2009 | Foswikitask:Item1558: !TinyMCE project now supports Opera, so remove it from _BAD_BROWSERS |

diff --git a/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm b/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
@@ -18,7 +18,7 @@ use strict;
 use Assert;
 
 our $VERSION           = '$Rev$';
-our $RELEASE           = '29 Oct 2009';
+our $RELEASE           = '25 Nov 2009';
 our $SHORTDESCRIPTION  = 'Integration of the Tiny MCE WYSIWYG Editor';
 our $NO_PREFS_IN_TOPIC = 1;
 

diff --git a/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST b/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST
@@ -3,6 +3,7 @@ data/System/TinyMCEPlugin.txt 0644
 !noci
 data/System/TinyMCEFrequentlyAskedQuestions.txt 0644
 data/System/TinyMCEQuickHelp.txt 0644
+data/System/TinyMCEPlugin.txt 0644
 lib/Foswiki/Plugins/TinyMCEPlugin.pm 0644
 pub/System/TinyMCEPlugin/anchor.gif 0644
 pub/System/TinyMCEPlugin/foswiki.js 0644
@@ -173,8 +174,8 @@ pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscrip
 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 0644
-pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage_src.css 0644
+pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/foswikiimage.css 0644
+pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/foswikiimage_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

diff --git a/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.js b/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.js
diff --git a/...EPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js b/...EPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
diff --git a/...ugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js b/...ugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
diff --git a/...lugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js b/...lugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
diff --git a/...in/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js b/...in/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
diff --git a/...ugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js b/...ugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js