Merge branch 'master' into Item14288

foswiki · Jan 26, 2017 · 141b9af · 141b9af
2 parents ef73e01 + 8e9d32b
commit 141b9af
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 55 deletions.
diff --git a/MailerContrib/lib/Foswiki/Contrib/MailerContrib/MANIFEST b/MailerContrib/lib/Foswiki/Contrib/MailerContrib/MANIFEST
@@ -15,5 +15,5 @@ data/System/MailerContribPlugin.txt 0644
 tools/mailnotify 0555
 templates/mailnotify.tmpl 0444
 templates/newsletter.tmpl 0444
-pub/System/MailerContrib/wikiringlogo20x20.png 0660
-pub/System/MailerContrib/logo.gif 0660
+pub/System/MailerContrib/wikiringlogo20x20.png 0644
+pub/System/MailerContrib/logo.gif 0644
diff --git a/TinyMCEPlugin/data/System/TinyMCEPlugin.txt b/TinyMCEPlugin/data/System/TinyMCEPlugin.txt
@@ -1,12 +1,12 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1485356419" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Plugins"}%
 ---+!! !TinyMCEPlugin
 <!--
 One line description, required for extensions repository catalog.
    * Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
 %JQREQUIRE{"chili"}%
 -->
-%SHORTDESCRIPTION%
+%FORMFIELD{"Description"}%
 
 <img alt="screenshot" src="%ATTACHURLPATH%/screenshot.png"/>
 
@@ -299,17 +299,19 @@ For the full list, consult [[WysiwygPlugin#Known_issues][WysiwygPlugin documenta
 
 Check regularly at Foswiki:Extensions.TinyMCEPlugin for updates.
 
----++ Plugin Info
+---++ Copyright
+&copy; 2007-2010 Crawford Currie http://c-dot.co.uk,
+&copy; 2010-2017 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] 
 
-Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!
+This package also includes the complete sources for version 3.5.7 of the !TinyMCE editor which is covered by [[http://tinymce.moxiecode.com/license.php][its own license]]. 
 
-|  Copyright: | &copy; 2007-2010 Crawford Currie http://c-dot.co.uk %BR%\
-                &copy; 2010-2014 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
-|             | This package also includes the complete sources for version 3.5.7 of the !TinyMCE editor which is covered by [[http://tinymce.moxiecode.com/license.php][its own license]]. |
-|  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  1.30 | Foswikitask:Item12181: Upgrade to TinyMCE 3.5.11 |
-|  21 Dec 2012 (TBD)   | Foswikitask:Item12278: Changing a wikiword should not require visiting the TinyMCE link dialog. *Changes TINYMCEPLUGIN_INIT settings* |
-|  29 Oct 2012 (TBD)   | Foswikitask:Item12201: Add missing syntax highlighting classes, and make menus more user friendly. |
+---++ Change History
+
+%TABLE{columnwidths="7em" tablewidth="100%"}%
+|  25 Jan 2017: | Foswikitask:Item14305: eliminate sporadic alert() by tinymce initializer |
+|  1.30 | Foswikitask:Item12181: Upgrade to !TinyMCE 3.5.11 |
+|  21 Dec 2012 (TBD) | Foswikitask:Item12278: Changing a wikiword should not require visiting the !TinyMCE link dialog. *Changes TINYMCEPLUGIN_INIT settings* |
+|  29 Oct 2012 (TBD) | Foswikitask:Item12201: Add missing syntax highlighting classes, and make menus more user friendly. |
 |  1.2.9 | Foswikitask:Item12181: Upgrade to !TinyMCE 3.5.7 |
 |  1.2.8 | Foswikitask:Item8032: enable Foswiki:Extensions.WysiwygFormfieldsPlugin |
 |  1.2.7 | Foswikitask:Item11802: Upgrade to !TinyMCE 3.4.9%BR%\
@@ -380,7 +382,7 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
 |  10 Apr 2009 | Foswikitask:Item1394: fixed colour handling Foswikitask:Item8108: added safari,inlinepopups,fullscreen plugins, fixed some minor bugs on IE |
 |  03 Apr 2009 | Foswikitask:Item1383: Optimised the preferences Foswikitask:Item8094: fixed the pickaxe |
 |  15 Mar 2009 | Foswikitask:Item930: Crawford Currie upgraded to Tiny MCE 3.2.2 and recoded all the standard plugins that had to be recoded |
-|  21 Jan 2009 | Foswikitask:Item833: added SYSTEMWEB to foswiki_vars, simplifying the activation of the foswikilink dialog of Extensions.TinyMCEUsabilityUpgradePlugin (if installed) - Eugen Mayer |
+|  21 Jan 2009 | Foswikitask:Item833: added SYSTEMWEB to foswiki_vars, simplifying the activation of the foswikilink dialog of Foswiki:Extensions.TinyMCEUsabilityUpgradePlugin (if installed) - Eugen Mayer |
 |  06 Dec 2008 | Foswikitask:Item5859: removed XHR headers that were banjaxing NTLM - Eugen Mayer |
 |  03 Dec 2008 | Crawford Currie re-released for the Foswiki project |
 |  03 Aug 2008 | TWiki 4.2.1 release version |
@@ -393,7 +395,7 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
 |  20 Dec 2007 | TWikibug:Item5047: disable save and preview during page load TWikibug:Item5111: make the entry in the format menu sensitive to where the cursor is TWikibug:Item5022: made TT font size same as verbatim. Had to add a new style to do it, as TMCE didn't want to play with TT or CODE tags. |
 |  19 Nov 2007 | TWikibug:Item4742: auto-disable if Wysiwyg is not enabled TWikibug:Item4820: validate mandatory fields on save TWikibug:Item4747: add &lt;sticky&gt; TWikibug:Item4811: noautolink *looks* like an HTML construct but in fact is not; the tag is infact an "on-off" switch and does not imply any HTML structure, so cannot be converted to a DIV or a span, so has to be removed. TWikibug:Item4817: added typewriter text button TWikibug:Item4850: added font colour controls TWikibug:Item4645: added attachment management features TWikibug:Item4945: added switch to raw and back |
 |  16 Sep 2007 | TWikibug:Item4630: polished up the way the secret string is done, to ensure synch between perl and JS. TWikibug:Item4622: added UTF-8 handling steps that fixup malformed UTF8 strings before presenting them to the editor (saves Moz) and stops the editor passing them back to TWiki (saves IE). TWikibug:Item4603: added the draft help, so we can at least build the beta without the nasty warning |
-|  13 Sep 2007 | TWikibug:Item4613 fixed navigate-away prompt when unchanged TWikibug:Item4583 TWikibug:Item4604 TWikibug:Item4614 TWikibug:Item4616 A clutch of issues caused by use of the wrong encoding function when passing UTF8 parameters to REST using XMLHttpRequest. |
+|  13 Sep 2007 | TWikibug:Item4613 fixed navigate-away prompt when unchanged TWikibug:Item4583 TWikibug:Item4604 TWikibug:Item4614 TWikibug:Item4616 A clutch of issues caused by use of the wrong encoding function when passing UTF8 parameters to REST using !XMLHttpRequest. |
 |  12 Sep 2007 | TWikibug:Item4604 Converted to REST call for content conversion, to provide safe callback if JS is disabled in the browser TWikibug:Item4583 relaxed regex to try and make it work for UTF-8 topic names |
 |  11 Sep 2007 | TWikibug:Item4535 refinements to link handling to improve topic name recognition |
 |  07 Sep 2007 | TWikibug:Item4503 excess empty lines TWikibug:Item4486 no toc headers with unofficial syntax TWikibug:Item4560: empty lines lost TWikibug:Item4566: corrupted table on save |
@@ -422,23 +424,3 @@ Many thanks to the following sponsors for supporting this work:
 %META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
 %META:FIELD{name="Home" title="Home" value="Foswiki:Extensions.%25$ROOTMODULE%25"}%
 %META:FIELD{name="Support" title="Support" value="Foswiki:Support.%25$ROOTMODULE%25"}%
-%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1437500521" size="390" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1437500521" size="18556" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1437500521" size="1654" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1437500521" size="427691" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1437500521" size="1029" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1437500521" size="1492" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1437500521" size="4233" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1437500521" size="2625" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1437500521" size="1007" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1437500521" size="1181" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1437500521" size="827" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1437500521" size="30118" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1437500521" size="950" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1437500521" size="1847" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1437500521" size="869" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1437500521" size="1494" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="tinymce.gif" attr="h" comment="screenshot" date="1437500521" size="35155" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1437500521" size="1343" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1437500521" size="8435" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1437500521" size="147" user="ProjectContributor" version="1"}%
diff --git a/TinyMCEPlugin/data/System/TinyMCEQuickHelp.txt b/TinyMCEPlugin/data/System/TinyMCEQuickHelp.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1485356379" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TinyMCEPlugin"}%
 ---+!! !TinyMCE Editor Help Summary 
 <!--%STARTSECTION{"CSS"}%<style type="text/css" media="all">
@@ -55,7 +55,7 @@
   <img src="%ATTACHURLPATH%/unlink.png" alt="unlink" />
 </td>
 <td class="textcolumn">
-  Links can either point to a URL or to the name of a Foswiki topic. For example =http://foswiki.org=, =TopicNames=, =Webname.TopicNames=, or =Webname.Subweb.WebName=.
+  Links can either point to a URL or to the name of a Foswiki topic. For example =https://foswiki.org=, =TopicNames=, =Webname.TopicNames=, or =Webname.Subweb.WebName=.
 </td>
 </tr>
 <tr>
@@ -114,14 +114,14 @@
 </div>
 %STOPINCLUDE%
 
-%META:FILEATTACHMENT{name="autosave.png" attr="h" comment="" date="1437500521" size="655" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="indent.png" attr="h" comment="" date="1437500521" size="327" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="chili_formatting.png" attr="h" comment="" date="1437500521" size="12756" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="Format_Drop_Down.png" attr="h" comment="" date="1437500521" size="6515" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="unlink.png" attr="h" comment="" date="1437500521" size="426" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="outdent.png" attr="h" comment="" date="1437500521" size="324" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="table_contextmenu.png" attr="h" comment="" date="1437500521" size="9076" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="link.png" attr="h" comment="" date="1437500521" size="385" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="anchor.png" attr="h" comment="" date="1437500521" size="397" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="clear_formatting.png" attr="h" comment="" date="1437500521" size="459" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="fullscreen.png" attr="h" comment="" date="1437500521" size="384" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="autosave.png" attr="h" comment="" date="1485356379" size="655" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="indent.png" attr="h" comment="" date="1485356379" size="327" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="chili_formatting.png" attr="h" comment="" date="1485356379" size="12756" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="Format_Drop_Down.png" attr="h" comment="" date="1485356379" size="6515" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="unlink.png" attr="h" comment="" date="1485356379" size="426" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="outdent.png" attr="h" comment="" date="1485356379" size="324" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="table_contextmenu.png" attr="h" comment="" date="1485356379" size="9076" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="link.png" attr="h" comment="" date="1485356379" size="385" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="anchor.png" attr="h" comment="" date="1485356379" size="397" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="clear_formatting.png" attr="h" comment="" date="1485356379" size="459" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="fullscreen.png" attr="h" comment="" date="1485356379" size="384" user="ProjectContributor" version="1"}%
diff --git a/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/build.pl b/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/build.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 
 use strict;
 

diff --git a/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.uncompressed.js b/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.uncompressed.js
@@ -426,9 +426,6 @@ var FoswikiTiny = {
 			tinyMCE.PluginManager.load(p, url);
 		}
 	    });
-        } else {
-            alert(
-'Unable to install TinyMCE: could not read "TINYMCEPLUGIN_INIT" from init parameters');
         }
     },
 

diff --git a/UnitTestContrib/test/unit/DependencyTests.pm b/UnitTestContrib/test/unit/DependencyTests.pm
@@ -586,6 +586,17 @@ sub test_compare_extension_versions {
         [ 1, '1.2.3', undef,   '>', '7429' ],
         [ 1, '1.2.3', undef,   '<', '13213' ],
 
+       # svn installed, tuple requested - svn is obsolete, so always return true
+       # Except when the "tuple" is a simple integer.
+        [ 1, '2.4.1', '$Rev: 15237 (2012-07-31) $', '<', 2.50 ],
+        [ 1, '2.4.1', '$Rev: 15237 (2012-07-31) $', '>', 2.50 ],
+        [ 1, '2.4.1', '$Rev: 15237 (2012-07-31) $', '<', 16000 ],
+        [ 0, '2.4.1', '$Rev: 15237 (2012-07-31) $', '<', 13000 ],
+
+        # Special case, even though "Release" 2.4.1 is > 2.4.0
+        # the VERSION string is the authority.
+        [ 1, '2.4.1', '$Rev: 15237 (2012-07-31) $', '<', '2.4.0' ],
+
         # Decimal rev installed, compared to svn rev requested
         # Always true - assume migration from rev to triplet
         [ 1, '1.2', '1.2', '>', '7429' ],

diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/MANIFEST b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/MANIFEST
@@ -14,4 +14,4 @@ data/System/WysiwygPluginSettings.txt 0644 Documentation and settings
 data/System/WysiwygPluginTopicLister.txt 0644 Special AJAX topic
 tools/html2tml.pl 0555 Stand-alone convertor script
 tools/tml2html.pl 0555 Stand-alone convertor script
-pub/System/WysiwygPlugin/wikiringlogo20x20.png 0660
+pub/System/WysiwygPlugin/wikiringlogo20x20.png 0644
diff --git a/core/lib/Foswiki/Configure/Dependency.pm b/core/lib/Foswiki/Configure/Dependency.pm
@@ -440,6 +440,8 @@ sub _compare_extension_versions {
     # $b - what we are comparing to (from DEPENDENCIES or configure FastReport)
     my ( $this, $op, $reqVer ) = @_;
 
+    #print STDERR "Requiring $op $reqVer\n";
+
     my $aRELEASE = $this->{installedRelease};
     my $aVERSION = $this->{installedVersion};
 
@@ -488,6 +490,8 @@ sub _compare_extension_versions {
         }
     }
     if ( $reqType eq 'svn' ) {
+
+        #print STDERR "reqType is svn\n";
         unless ( $baseType eq 'svn' ) {
 
             #print STDERR "Try a different comparison\n";
@@ -501,6 +505,8 @@ sub _compare_extension_versions {
     }
 
     if ( $reqType eq 'date' ) {
+
+        #print STDERR "reqType is date\n";
         unless ( $baseType eq 'date' ) {
 
             # Inconsistent VERSION, so try RELEASE
@@ -568,11 +574,22 @@ sub _compare_extension_versions {
         return 0 if ( $atuple[2] < 1    || $btuple[2] < 1 );
     }
 
+    if ( $baseType eq 'svn' && $reqType ne 'svn' ) {
+
+        # Anything to SVN other than SVN or Integers needs to succeed.
+        return 1 unless $reqVer =~ m/^\d+$/;    #keep going for integers
+    }
+
     # We can't figure out the types, so just return false.
     return 0 if ( $baseType eq 'unknown' || $reqType eq 'unknown' );
 
+    #print STDERR "have basetype $baseType reqType $reqType\n";
+
     # Do the comparisons
     ( my $a, $b ) = _digitise_tuples( \@atuple, \@btuple );
+
+    #print STDERR "Doing the comparison  $a $string_op $b\n";
+
     my $comparison = "'$a' $string_op '$b'";
     my $result     = eval($comparison);
 
@@ -784,7 +801,8 @@ sub extractModuleVersion {
                     my $exp = $1;
                     $exp =~ s/\$RELEASE/\$mod_release/g;
                     eval("\$mod_version =~ $exp;");
-                    die "1-Failed to eval $1 from $_ in $file at line $.: $@\n"
+                    print STDERR
+"Dependency.pm 1-Failed to eval $1 from $_ in $file at line $.: $@\n"
                       if ($@);
                     last;
                 }
@@ -800,7 +818,8 @@ sub extractModuleVersion {
                   )
                 {
                     eval( "\$mod_" . lc($1) . " = $2;" );
-                    die "2-Failed to eval $2 from $_ in $file at line $.: $@\n"
+                    print STDERR
+"Dependency.pm 2-Failed to eval $2 from $_ in $file at line $.: $@\n"
                       if ($@);
                     next;
                 }