Item14454: Merge with branch 'master'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce_dev"]
+	path = TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce_dev
+	url = https://github.com/tinymce/tinymce.git

AutoViewTemplatePlugin/lib/Foswiki/Plugins/AutoViewTemplatePlugin/build.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Example build class. Copy this file to the equivalent place in your
 # plugin or contrib and edit.
@@ -17,6 +17,9 @@
 # -v Be verbose
 #
 
+use strict;
+use warnings;
+
 # Standard preamble
 BEGIN {
     unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} );
@@ -46,7 +49,7 @@ sub target_build {
 package main;
 
 # Create the build object
-$build = new BuildBuild();
+my $build = new BuildBuild();
 
 # Build the target on the command line, or the default target
 $build->build( $build->{target} );

BehaviourContrib/lib/Foswiki/Contrib/BehaviourContrib/build.pl

@@ -1,8 +1,9 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Build for BehaviourContrib
 #
 use strict;
+use warnings;
 
 BEGIN {
     foreach my $pc ( split( /:/, $ENV{FOSWIKI_LIBS} ) ) {

BuildContrib/build.pl

@@ -1,4 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
+use strict;
+use warnings;
+
 unless ( scalar(@ARGV) ) {
     print <<DOC;
 Build an extension

BuildContrib/data/System/BuildContrib.txt

@@ -1,7 +1,7 @@
-%META:TOPICINFO{author="ProjectContributor" date="1443532867" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1512466074" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Contribs"}%
 ---+!! Foswiki Developer Environment
-<a href="http://wikiring.com" class="foswikiRight"><img src="%ATTACHURLPATH% \logo.gif" title="WikiRing: Professional Wiki Innovation and Support" /></a>
+<img src="%ATTACHURLPATH%/logo.gif" alt="WikiRing" class="foswikiRight" />
 %FORMFIELD{"Description"}%
 
 
@@ -651,13 +651,14 @@ You are strongly recommended to use this Contrib to help split your code develop
 %$INSTALL_INSTRUCTIONS%
 
 ---++ Info
-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__!
+
+Another great Foswiki extension from the <img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="WikiRing" /> *WikiRing* - working together to improve your wiki experience!
 
 See the repository for full change history.
 
 
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1443532867" size="1343" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="logo.gif" attr="" comment="logo" date="1443532867" size="14169" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1512466074" size="1343" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="logo.gif" attr="" comment="logo" date="1512466074" size="14169" user="ProjectContributor" version="1"}%
 %META:FORM{name="PackageForm"}%
 %META:FIELD{name="Author" title="Author" value="[[http://c-dot.co.uk][Crawford Currie]]"}%
 %META:FIELD{name="Copyright" title="Copyright" value="Foswiki Contributors 2004-2015, All Rights Reserved"}%

BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm

@@ -1,8 +1,8 @@
 package Foswiki::Contrib::BuildContrib;
 use strict;
 
-our $VERSION = '1.90';
-our $RELEASE = '25 Sep 2015';
+our $VERSION = '1.91';
+our $RELEASE = '12 Dec 2017';
 
 our $SHORTDESCRIPTION =
 'Automates build and packaging process, including installer generation, for extension modules.';

BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/compress.pm

@@ -347,14 +347,12 @@ sub _uglifyjs {
     my $lcall = $ENV{'LC_ALL'};
     my $cmd;
 
-    $cmd = "uglifyjs $from";
+    $cmd = "uglifyjs -m -c -- $from";
 
     unless ( $this->{-n} ) {
-        $cmd .= " -o $to";
+        $cmd .= " > $to";
     }
 
-    $cmd .= ' -b beautify=false,ascii-only=true ';
-
     warn "$cmd\n";
     my $out = `$cmd`;
     $ENV{'LC_ALL'} = $lcall;

BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/dependencies.pm

@@ -16,6 +16,7 @@
 package Foswiki::Contrib::Build;
 
 use strict;
+use warnings;
 use B::PerlReq;
 
 =begin TML

BuildContrib/lib/Foswiki/Contrib/BuildContrib/build.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Example build class. Copy this file to the equivalent place in your
 # plugin or contrib and edit.
@@ -16,6 +16,10 @@
 # -n Don't actually do anything, just print commands
 # -v Be verbose
 # Standard preamble
+
+use strict;
+use warnings;
+
 BEGIN {
     unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} );
 }
@@ -44,7 +48,7 @@ sub target_build {
 package main;
 
 # Create the build object
-$build = new BuildBuild();
+my $build = new BuildBuild();
 
 # Build the target on the command line, or the default target
 $build->build( $build->{target} );

CommentPlugin/data/System/CommentPlugin.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1485009132" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1512791273" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Plugins"}%
 ---+!! Comment Plugin
 
@@ -276,9 +276,11 @@ This plugin has been significantly changed from the =10 April 2011= version ship
    * The plugin no longer processes %COMMENT macros during save.  If you have developed any forms using the [[%SANDBOXWEB%.CommentPluginExamples#NoForm][=noform= and =templatetopic= examples]] they must be revised.
 
 ---++ Info
-Another great 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!
+
+Another great Foswiki extension from the <img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="WikiRing" /> *WikiRing* - working together to improve your wiki experience!
 
 |  Change History: | |
+|  2.93 (08 Dec 2017) | Foswikitask:Item14554: remove link to unused wikiring.com domain. | 
 |  2.92 (21 Jan 2017) | Foswikitask:Item14009: Comment plugin does not properly identify location to insert comment when specified as an anchor. |
 |  2.91 (08 Apr 2016) | Foswikitask:Item14022: Update Foswiki.org links to https. Released with Foswiki 2.1.1. |
 |  2.9 (03 Feb 2016) | Foswikitask:Item13854: Set ALLOWTOPICVIEW = "*" on Comment Template.  *Requires compatibility patch on Foswiki 1.x or Foswiki 1.1.10.* |
@@ -333,8 +335,8 @@ Another great extension from the <a style="text-decoration:none" href="http://wi
 %META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
 %META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/CommentPlugin"}%
 %META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/CommentPlugin"}%
-%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1485009132" size="70" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1485009132" size="1931" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1485009132" size="60" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1485009132" size="5134" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1485009132" size="1343" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1512791273" size="70" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1512791273" size="1931" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1512791273" size="60" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1512791273" size="5134" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1512791273" size="1343" user="ProjectContributor" version="1"}%

CommentPlugin/lib/Foswiki/Plugins/CommentPlugin.pm

@@ -13,8 +13,8 @@ use Foswiki::Func    ();
 use Foswiki::Plugins ();
 
 # Please use major.minor
-our $VERSION = '2.92';
-our $RELEASE = '21 Jan 2017';
+our $VERSION = '2.93';
+our $RELEASE = '08 Dec 2017';
 our $SHORTDESCRIPTION =
   'Quickly post comments to a page without an edit/save cycle';
 our $NO_PREFS_IN_TOPIC = 1;

CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/build.pl

@@ -1,6 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 use strict;
+use warnings;
 
 BEGIN {
     foreach my $pc ( split( /:/, $ENV{FOSWIKI_LIBS} ) ) {

CompareRevisionsAddOn/lib/Foswiki/Contrib/CompareRevisionsAddOn/build.pl

@@ -1,7 +1,10 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Build for CompareRevisionsAddOn
 #
+use strict;
+use warnings;
+
 BEGIN {
     foreach my $pc ( split( /:/, $ENV{FOSWIKI_LIBS} ) ) {
         unshift @INC, $pc;
@@ -11,7 +14,7 @@ BEGIN
 use Foswiki::Contrib::Build;
 
 # Create the build object
-$build = new Foswiki::Contrib::Build('CompareRevisionsAddOn');
+my $build = new Foswiki::Contrib::Build('CompareRevisionsAddOn');
 
 # Build the target on the command line, or the default target
 $build->build( $build->{target} );

ConfigurePlugin/data/System/ConfigurePlugin.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1493947845" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1512791273" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Plugins"}%
 ---+!! Configure Plugin
 %FORMFIELD{"Description"}%
@@ -14,7 +14,7 @@ However this UI provides a simple way to access the configuration without
 requiring login access to the server.
 
 If your system has an existing !LocalSite.cfg, then you *must* be
-logged in to %WIKITOOLNAME% as an administrator, or as a user identified by the 
+logged in to %WIKITOOLNAME% as an administrator, or as a user identified by the
 ={FeatureAccess}{Configure}= parameter before attempting to use
 this interface. If no !LocalSite.cfg exists, then you will automatically
 logged in as an admin.  Do not log out of Foswiki until you have done one or
@@ -42,8 +42,10 @@ The plugin uses the =JsonRpcContrib=, which must be installed.
 
 ---++ Change History
 
+|  08 Dec 2017: | (1.09) Foswikitask:Item14536: Configure leaves "wait" cursor spinning while waiting for user action.<br/>\
+                         Foswikitask:Item14472: replaced use of =attr()= with =prop()= where needed; fixed use of =null= value trying to trim values |
 |  04 Apr 2017: | (1.08) Foswikitask:Item13883: Updated base template to suggest solutions when configure shows base login page.<br/>\
-                         Foswikitask:Item13339: Warning or errors icons in configure get stuck unless page is reloaded.<br/>\ 
+                         Foswikitask:Item13339: Warning or errors icons in configure get stuck unless page is reloaded.<br/>\
                          Foswikitask:Item14366: Reorder initialization to allow local CGI::Carp |
 |  23 Jan 2017: | (1.07) Foswikitask:Item14287: Configure needs to encode reported configuration values. |
 |  28 Nov 2016: | (1.06) Foswikitask:Item13206: Upgrade to latest jquery-ui |

ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm

@@ -31,8 +31,8 @@ package Foswiki::Plugins::ConfigurePlugin;
 use strict;
 use warnings;
 
-our $VERSION           = '1.08';
-our $RELEASE           = '04 Apr 2017';
+our $VERSION           = '1.09';
+our $RELEASE           = '08 Dec 2017';
 our $SHORTDESCRIPTION  = '=configure= interface using json-rpc';
 our $NO_PREFS_IN_TOPIC = 1;
 

ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.js

@@ -485,6 +485,9 @@ function _id_ify(id) {
 
         wizard_finished(params);
 
+        // Remove the wait cursor.
+        $('body').css('cursor','auto');
+
         $dlg = $('<div id="report_dialog"></div>');
         $dlg.append($div);
         $dlg.css('cursor','default');
@@ -650,7 +653,7 @@ function _id_ify(id) {
             $butt = $('<input type="checkbox" id="' + id + '">').appendTo($buttons);
             $butt.click(function() {
                 if ( $(this).attr("checked") ) {
-                    $ui.removeAttr("disabled");
+                    $ui.prop("disabled", false);
                     $node.removeClass("disabled");
                 } else {
                     $ui.attr("disabled", "disabled");
@@ -667,7 +670,7 @@ function _id_ify(id) {
                 $ui.attr("disabled", "disabled");
                 $node.addClass("disabled");
             } else {
-                $butt.attr("checked", "checked");
+                $butt.prop("checked", true);
             }
             $butt.appendTo($buttons);
             $("<label for='"+id+"'> enable</label>")
@@ -896,7 +899,7 @@ if (0) {
                         add_dependency(
                             entry.ENABLE_IF, $node, function($n, tf) {
                                 if (tf) {
-	                            $n.find("input,textarea").removeAttr('disabled');
+	                            $n.find("input,textarea").prop('disabled', false);
                                 } else {
 	                            $n.find("input,textarea")
                                         .attr('disabled', 'disabled');

ConfigurePlugin/pub/System/ConfigurePlugin/types.uncompressed.js

@@ -45,7 +45,7 @@ var Types = {};
               this.useVal(val);
           }
           if (this.spec.SPELLCHECK) {
-              this.$ui.attr('spellcheck', 'true');
+              this.$ui.prop('spellcheck', true);
           }
           if (typeof(change_handler) !== "undefined") {
               this.$ui.change(change_handler);
@@ -133,7 +133,7 @@ var Types = {};
           }
 
           if (this.spec.current_value !== 0) {
-              this.$ui.attr('checked', true);
+              this.$ui.prop('checked', true);
           }
           if (this.spec.extraClass) {
               this.$ui.addClass(this.spec.extraClass);
@@ -165,15 +165,15 @@ var Types = {};
           } else if ( val == '1') {
               val = true;
           }
-          this.$ui.attr('checked', val );
+          this.$ui.prop('checked', val );
       }
   });
 
   Types.PASSWORD = Types.STRING.extend({
       createUI: function(change_handler) {
           this._super(change_handler);
           this.$ui.attr('type', 'password');
-          this.$ui.attr('autocomplete', 'off');
+          this.$ui.prop('autocomplete', false);
           return this.$ui;
       }
   });
@@ -252,8 +252,10 @@ var Types = {};
       isDefault: function() {
           // To do this comparison requires parsing and rewriting the perl to
           // javascript. Not impossible, but tricky.
-          var a = this.currentValue().trim(),
-              b = this.spec['default'].trim(), av, bv;
+          var a = this.currentValue(),
+              b = this.spec['default'], av, bv;
+          a = (a == null) ? null : a.trim();
+          b = (b == null) ? null : b.trim();
           try {
               // See if they parse as JS - they probably will! If they don't,
               // parse, fall back to a string comparison :-(
@@ -308,7 +310,7 @@ var Types = {};
   Types.PATHINFO = Types.STRING.extend({
       createUI: function(change_handler) {
           this._super(change_handler);
-          this.$ui.attr('readonly', 'readonly');
+          this.$ui.prop('readonly', true);
           return this.$ui;
       }
   });
@@ -340,8 +342,8 @@ var Types = {};
   Types.NULL = Types.BaseType.extend({
       createUI: function(change_handler) {
           this._super(change_handler);
-          this.$ui.attr('readonly', 'readonly');
-          this.$ui.attr('disabled', 'disabled');
+          this.$ui.prop('readonly', true);
+          this.$ui.prop('disabled', true);
           this.$ui.attr('size', '1');
           return this.$ui;
       }
@@ -392,7 +394,7 @@ var Types = {};
               this.$ui.change(change_handler);
           }
           if (this.spec.MULTIPLE) {
-              this.$ui.attr('multiple', 'multiple');
+              this.$ui.prop('multiple', true);
           }
 
           if (typeof(this.spec.select_from) !== "undefined") {
@@ -401,7 +403,7 @@ var Types = {};
                   opt = this.spec.select_from[i];
                   $option = $('<option>' + opt + '</option>');
                   if (sel[opt]) {
-                      $option.attr('selected', 'selected');
+                      $option.prop('selected', true);
                   }
                   this.$ui.append($option);
               }
@@ -420,17 +422,19 @@ var Types = {};
               this.$ui.find('option').each(function() {
                   var opt = sf[i++];
                   if (sel[opt]) {
-                      $(this).attr('selected', 'selected');
+                      $(this).prop('selected', true);
                   } else {
-                      $(this).removeAttr('selected');
+                      $(this).prop('selected', false);
                   }
               });
           }
       },
 
       isDefault: function() {
-          var a = this.currentValue().trim(),
-              b = this.spec['default'].trim();
+          var a = this.currentValue(),
+              b = this.spec['default'];
+          a = (a == null) ? null : a.trim();
+          b = (b == null) ? null : b.trim();
           b = b.replace(/^\s*(["'])(.*?)\1\s*/, "$2");
           return a === b;
       }