Item15224: minimize number of loaded js files

foswiki · Oct 16, 2023 · d16e669 · d16e669
1 parent 2e25bfe
commit d16e669
Show file tree

Hide file tree

Showing 51 changed files with 4,626 additions and 142 deletions.
diff --git a/JQueryPlugin/data/System/JQueryMaskedInput.txt b/JQueryPlugin/data/System/JQueryMaskedInput.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1456220586" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1697450499" format="1.1" version="1"}%
 %META:TOPICPARENT{name="JQueryPlugin"}%
 ---+ %TOPIC%
 %JQPLUGINS{"maskedinput"
@@ -40,7 +40,7 @@ $("#product").mask("99/99/9999",{
 });
 </verbatim>
 
-Adda "completed" callback:
+Add a "completed" callback:
 <verbatim class="js">
 $("#product").mask("99/99/9999",{
   completed: function() {

diff --git a/JQueryPlugin/data/System/JQueryPlugin.txt b/JQueryPlugin/data/System/JQueryPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1693824303" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1697450499" format="1.1" version="1"}%
 ---+!! %TOPIC%
 %FORMFIELD{"Description"}%
 
@@ -125,6 +125,7 @@ required for Foswiki 1.1 or later.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  16 Oct 2023: | (10.70) - Item15224: minimize number of loaded js files |
 |  04 Sep 2023: | (10.60) - Item15214: updated to jquery-3.7.1 |
 |  26 Apr 2023: | (10.51) - Item15190: fixed potential XSS vulnerability in jQuery-2 |
 |  19 Jan 2023: | (10.50) - Item15181: update to jquery-3.6.3, remove previous jquery-3.x packages |

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
@@ -25,8 +25,8 @@ BEGIN {
     }
 }
 
-our $VERSION           = '10.60';
-our $RELEASE           = '04 Sep 2023';
+our $VERSION           = '10.70';
+our $RELEASE           = '16 Sep 2023';
 our $SHORTDESCRIPTION  = 'jQuery <nop>JavaScript library for Foswiki';
 our $NO_PREFS_IN_TOPIC = 1;
 our $iconService;

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/BLOCKUI.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/BLOCKUI.pm
@@ -32,7 +32,7 @@ sub new {
             author     => 'M. Alsup',
             homepage   => 'http://malsup.com/jquery/block/',
             css        => ['jquery.blockUI.css'],
-            javascript => [ 'jquery.blockUI.js', 'jquery.blockUI.init.js' ],
+            javascript => ['pkg.js'],
         ),
         $class
     );
@@ -45,7 +45,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/BUTTON.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/BUTTON.pm
@@ -32,7 +32,7 @@ sub new {
             homepage     => 'http://foswiki.org/Extensions/JQueryPlugin',
             tags         => 'BUTTON',
             css          => ['jquery.button.css'],
-            javascript   => ['jquery.button.init.js'],
+            javascript   => ['jquery.button.js'],
             dependencies => [ 'metadata', 'JQUERYPLUGIN::FORM' ],
         ),
         $class
@@ -162,7 +162,7 @@ sub handleButton {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2021 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/CHILI.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/CHILI.pm
@@ -31,7 +31,7 @@ sub new {
             version      => '2.2_1',
             author       => 'Andrea Ercolino',
             homepage     => 'https://github.com/aercolino/Chili',
-            javascript   => [ 'jquery.chili.js', 'jquery.chili.init.js' ],
+            javascript   => ['pkg.js'],
             dependencies => ['metadata'],
         ),
         $class
@@ -45,7 +45,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/CYCLE.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/CYCLE.pm
@@ -31,7 +31,7 @@ sub new {
             version      => '3.0.3',
             author       => 'M. Alsup',
             homepage     => 'http://www.malsup.com/jquery/cycle',
-            javascript   => [ 'jquery.cycle.js', 'jquery.cycle.init.js' ],
+            javascript   => ['pkg.js'],
             dependencies => ['metadata'],
         ),
         $class
@@ -44,7 +44,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FARBTASTIC.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FARBTASTIC.pm
@@ -32,10 +32,9 @@ sub new {
             author  => 'Steven Wittens',
             homepage =>
               'https://acko.net/blog/farbtastic-jquery-color-picker-plug-in/',
-            css => ['jquery.farbtastic.css'],
-            javascript =>
-              [ 'jquery.farbtastic.js', 'jquery.farbtastic.init.js' ],
-            dependencies => [ 'ui', 'metadata' ],
+            css          => ['jquery.farbtastic.css'],
+            javascript   => ['pkg.js'],
+            dependencies => ['ui'],
         ),
         $class
     );
@@ -48,7 +47,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/INNERFADE.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/INNERFADE.pm
@@ -27,11 +27,11 @@ sub new {
 
     my $this = bless(
         $class->SUPER::new(
-            name       => 'InnerFade',
-            version    => '20080214',
-            author     => 'Torsten Baldes',
-            homepage   => 'http://medienfreunde.com/lab/innerfade',
-            javascript => [ 'jquery.innerfade.js', 'jquery.innerfade.init.js' ],
+            name         => 'InnerFade',
+            version      => '20080214',
+            author       => 'Torsten Baldes',
+            homepage     => 'http://medienfreunde.com/lab/innerfade',
+            javascript   => ['pkg.js'],
             dependencies => ['metadata'],
         ),
         $class
@@ -45,7 +45,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/RATING.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/RATING.pm
@@ -32,7 +32,7 @@ sub new {
             author       => 'Diego A. (Fyneworks.com)',
             homepage     => 'http://www.fyneworks.com/jquery/star-rating/',
             css          => ['jquery.rating.css'],
-            javascript   => [ 'jquery.rating.js', 'jquery.rating.init.js' ],
+            javascript   => ['pkg.js'],
             dependencies => ['metadata'],
         ),
         $class
@@ -45,7 +45,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SCROLLTO.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SCROLLTO.pm
@@ -31,7 +31,7 @@ sub new {
             version      => '2.1.2',
             author       => 'Ariel Flesler',
             homepage     => 'https://github.com/flesler/jquery.scrollTo',
-            javascript   => [ 'jquery.scrollTo.js', 'jquery.scrollTo.init.js' ],
+            javascript   => ['pkg.js'],
             dependencies => ['easing'],
         ),
         $class
@@ -45,7 +45,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SLIMBOX.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SLIMBOX.pm
@@ -32,7 +32,7 @@ sub new {
             author       => 'Christophe Beyls',
             homepage     => 'https://github.com/cbeyls/slimbox',
             css          => ['slimbox2.css'],
-            javascript   => [ 'slimbox2.js', 'slimbox2.init.js' ],
+            javascript   => ['pkg.js'],
             dependencies => ['metadata'],
         ),
         $class
@@ -69,7 +69,7 @@ sub init {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/TEXTBOXLIST.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/TEXTBOXLIST.pm
@@ -27,13 +27,12 @@ sub new {
 
     my $this = bless(
         $class->SUPER::new(
-            name     => 'TextboxList',
-            version  => '2.22',
-            author   => 'Michael Daum',
-            homepage => 'http://foswiki.org/Extensions/JQueryPlugin',
-            css      => ['jquery.textboxlist.css'],
-            javascript =>
-              [ 'jquery.textboxlist.js', 'jquery.textboxlist.init.js' ],
+            name         => 'TextboxList',
+            version      => '2.23',
+            author       => 'Michael Daum',
+            homepage     => 'http://foswiki.org/Extensions/JQueryPlugin',
+            css          => ['jquery.textboxlist.css'],
+            javascript   => ['jquery.textboxlist.js'],
             dependencies => [ 'ui', 'metadata' ],
         ),
         $class
@@ -47,7 +46,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/TOOLTIP.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/TOOLTIP.pm
@@ -33,7 +33,7 @@ sub new {
             homepage =>
               'http://bassistance.de/jquery-plugins/jquery-plugin-tooltip/',
             css          => ['jquery.tooltip.css'],
-            javascript   => [ 'jquery.tooltip.js', 'jquery.tooltip.init.js' ],
+            javascript   => ['pkg.js'],
             dependencies => ['metadata'],
         ),
         $class
@@ -47,7 +47,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2010-2020 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2010-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/blockui/Makefile b/JQueryPlugin/pub/System/JQueryPlugin/plugins/blockui/Makefile
@@ -1,15 +1,20 @@
-TARGET=\
-  jquery.blockUI.css \
-  jquery.blockUI.js \
-  jquery.blockUI.init.js \
-  $(JQUERYPLUGIN_LIB)/BLOCKUI.pm
+TARGET=jquery.blockUI.css pkg.js
 
 -include ../../Makefile.include
 
+PKG_SOURCE=jquery.blockUI.uncompressed.js jquery.blockUI.init.uncompressed.js
+
 #git: 
 #	git clone https://github.com/malsup/blockui.git $@
 #
 #ifneq (,$(wildcard git))
 #jquery.blockUI.uncompressed.js: git/jquery.blockUI.js
 #	cat $^ > $@
 #endif
+
+clean:
+	rm -f $(TARGET) *gz
+
+pkg.uncompressed.js: $(PKG_SOURCE)
+	@echo generating $@
+	@$(CAT) $^ > $@