Item14323: only one foswiki plugin in TMCE now, so renamed it. Plus d…

…umped a load of old PatternSkin code, which should never have been in this plugin

TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -59,10 +59,9 @@ table_default_cellspacing : 1,
 table_default_border : 1,
 theme : "modern",
 skin : "lightgray",
-debug : true,
 plugins : "contextmenu table searchreplace save autosave paste fullscreen lists link anchor charmap hr code legacyoutput image textcolor colorpicker wordcount",
 external_plugins : {
-  foswikibuttons: "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/plugins/foswikibuttons/editor_plugin.uncompressed.js"
+  foswiki: "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/plugins/foswiki/plugin.js"
   },
 foswiki_secret_id : "%WYSIWYG_SECRET_ID%",
 style_formats: [

TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -7,8 +7,8 @@ use warnings;
 
 use Assert;
 
-our $VERSION           = '1.31';
-our $RELEASE           = '1.31';
+our $VERSION           = '2.00';
+our $RELEASE           = '2.00';
 our $SHORTDESCRIPTION  = 'Integration of the Tiny MCE WYSIWYG Editor';
 our $NO_PREFS_IN_TOPIC = 1;
 

TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST

@@ -6,25 +6,22 @@ lib/Foswiki/Configure/Checkers/Plugins/TinyMCEPlugin/Enabled.pm 0644
 lib/Foswiki/Plugins/TinyMCEPlugin.pm 0644
 lib/Foswiki/Plugins/TinyMCEPlugin/Config.spec 0644
 lib/Foswiki/Plugins/TinyMCEPlugin/TinyMCE.pm 0644
-pub/System/TinyMCEPlugin/foswiki.js 0644
-pub/System/TinyMCEPlugin/foswiki.js.gz 0644
-pub/System/TinyMCEPlugin/foswiki.uncompressed.js 0644
 pub/System/TinyMCEPlugin/foswiki_tiny.js 0644
 pub/System/TinyMCEPlugin/foswiki_tiny.js.gz 0644
 pub/System/TinyMCEPlugin/foswiki_tiny.uncompressed.js 0644
 pub/System/TinyMCEPlugin/Makefile 0644
 pub/System/TinyMCEPlugin/plugins/Makefile 0644
 pub/System/TinyMCEPlugin/plugins/FOSWIKI_SPECIFIC_TINYMCE_PLUGINS 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/Makefile 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/editor_plugin.js 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/editor_plugin.js.gz 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/editor_plugin.uncompressed.js 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/img/upload.gif 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/img/insertlink.gif 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/img/exdent.gif 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/img/hide.gif 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/img/indent.gif 0644
-pub/System/TinyMCEPlugin/plugins/foswikibuttons/img/tt.gif 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/Makefile 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/plugin.js 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/plugin.js.gz 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/plugin.uncompressed.js 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/img/upload.gif 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/img/insertlink.gif 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/img/exdent.gif 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/img/hide.gif 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/img/indent.gif 0644
+pub/System/TinyMCEPlugin/plugins/foswiki/img/tt.gif 0644
 pub/System/TinyMCEPlugin/screenshot.png 0644
 pub/System/TinyMCEPlugin/tinymce.gif 0644
 pub/System/TinyMCEPlugin/tinymce/LICENSE.TXT 0644

TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/TinyMCE.pm

@@ -50,7 +50,9 @@ sub new {
             documentation => "$Foswiki::cfg{SystemWebName}.TinyMCEPlugin",
             puburl        => '%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin',
             javascript    => [
-                'foswiki_tiny.js', 'foswiki.js',
+                'foswiki_tiny.js',
+
+                #                '/tinymce/js/tinymce/tinymce.min.js'
                 '/tinymce_dev/js/tinymce/tinymce.dev.js'
             ],
             dependencies => ['foswiki']

TinyMCEPlugin/pub/System/TinyMCEPlugin/Makefile

@@ -1,5 +1,5 @@
 FOSWIKI_ROOT?=~/foswiki/core
-TARGET=foswiki_tiny.js foswiki.js
+TARGET=foswiki_tiny.js
 SUBDIRS=plugins
 
 -include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include

TinyMCEPlugin/pub/System/TinyMCEPlugin/plugins/foswikibuttons/Makefile → TinyMCEPlugin/pub/System/TinyMCEPlugin/plugins/foswiki/Makefile

@@ -1,5 +1,5 @@
 FOSWIKI_ROOT?=~/foswiki/core
-TARGET=editor_plugin.js
+TARGET=plugin.js
 SUBDIRS=css
 
 -include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include