Skip to content

Commit

Permalink
Item13676: add jquery-2.1.4 and 1.11.3
Browse files Browse the repository at this point in the history
- cures a Safari bug in $.each
- fixed error defaulting to latest jquery version installed
  • Loading branch information
MichaelDaum committed Sep 4, 2015
1 parent dedb053 commit 7f94b1a
Show file tree
Hide file tree
Showing 8 changed files with 19,581 additions and 10 deletions.
2 changes: 2 additions & 0 deletions JQueryPlugin/.gitignore
Expand Up @@ -13,6 +13,7 @@
/pub/System/JQueryPlugin/jquery-1.11.0.js
/pub/System/JQueryPlugin/jquery-1.11.1.js
/pub/System/JQueryPlugin/jquery-1.11.2.js
/pub/System/JQueryPlugin/jquery-1.11.3.js
/pub/System/JQueryPlugin/jquery-1.7.1.js
/pub/System/JQueryPlugin/jquery-1.7.2.js
/pub/System/JQueryPlugin/jquery-1.8.0.js
Expand All @@ -26,6 +27,7 @@
/pub/System/JQueryPlugin/jquery-2.1.0.js
/pub/System/JQueryPlugin/jquery-2.1.1.js
/pub/System/JQueryPlugin/jquery-2.1.3.js
/pub/System/JQueryPlugin/jquery-2.1.4.js
/pub/System/JQueryPlugin/noconflict.js
/pub/System/JQueryPlugin/plugins/autocomplete/jquery.autocomplete.css
/pub/System/JQueryPlugin/plugins/autocomplete/jquery.autocomplete.init.js
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/data/System/JQueryPlugin.txt
Expand Up @@ -123,7 +123,7 @@ reduce bandwidth and speed up interactive performance.
%$DEPENDENCIES%

---++ Change History
| 04 Sep 2015: | (6.20) - improvements to jquery.wikiword, jquery.loader; adding html5-data capabilities to plugin initialization |
| 04 Sep 2015: | (6.20) - improvements to jquery.wikiword, jquery.loader; adding html5-data capabilities to plugin initialization; added jquery-1.11.3 and jquery-2.1.4 |
| 16 Jun 2015: | (6.13) - Item13460: JQICON fails to render !FontAwesome icons. |
| 30 Apr 2015: | (6.11) - Item13389: datepicker initializaiton problem; datepicker z-index problem; pushy tooltips not hidden when typing into an input field; error in jquery.foswiki api getPubUrlPath |
| 23 Feb 2015: | (6.10) - Item13272: upgraded superfish and hoverintent, deprecated subpersubs |
Expand Down
8 changes: 4 additions & 4 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
Expand Up @@ -28,18 +28,18 @@ $Foswiki::cfg{JQueryPlugin}{NoConflict} = 0;
# a newer jQuery library. Starting with jquery-1.9.1 all deprecated methods have been removed from it and put into the "migrate" plugin.
$Foswiki::cfg{JQueryPlugin}{DefaultPlugins} = '';

# **SELECT jquery-1.7.1, jquery-1.7.2, jquery-1.8.0, jquery-1.8.1, jquery-1.8.2, jquery-1.8.3, jquery-1.9.1, jquery-1.10.0, jquery-1.11.0, jquery-1.11.1, jquery-1.11.2, jquery-2.0.0, jquery-2.0.1, jquery-2.0.2, jquery-2.1.0, jquery-2.1.1, jquery-2.1.3**
# **SELECT jquery-1.7.1, jquery-1.7.2, jquery-1.8.0, jquery-1.8.1, jquery-1.8.2, jquery-1.8.3, jquery-1.9.1, jquery-1.10.0, jquery-1.11.0, jquery-1.11.1, jquery-1.11.2, jquery-1.11.3, jquery-2.0.0, jquery-2.0.1, jquery-2.0.2, jquery-2.1.0, jquery-2.1.1, jquery-2.1.3, jquery-2.1.4**
# Note that starting with jQuery-1.9.1 deprecated features have been removed. If you are experiencing
# problems with plugins still using deprecated features then add the <code>migrate</code> plugin to the list
# of plugins loaded by default (see above). Further note that starting with jQuery-2.0 support for Internet Explorer 6/7/8
# has been dropped. Use jQuery-1.9 in case you still need to cover these browsers.
$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-2.1.3';
$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-2.1.4';

# **SELECT , jquery-1.7.1, jquery-1.7.2, jquery-1.8.0, jquery-1.8.1, jquery-1.8.2, jquery-1.8.3, jquery-1.9.1, jquery-1.10.0, jquery-1.10.1, jquery-1.11.0, jquery-1.11.1, jquery-1.11.2**
# **SELECT , jquery-1.7.1, jquery-1.7.2, jquery-1.8.0, jquery-1.8.1, jquery-1.8.2, jquery-1.8.3, jquery-1.9.1, jquery-1.10.0, jquery-1.10.1, jquery-1.11.0, jquery-1.11.1, jquery-1.11.2, jquery-1.11.3**
# Use a different jQuery library for Internet Explorer 6/7/8. Since jQuery-2.0 these old browsers aren't suppored anymore.
# Use one of the jQuery-1.x libraries to still serve a compatible jQuery to these browsers. Or leave it empty to use the same
# library version for all browsers.
$Foswiki::cfg{JQueryPlugin}{JQueryVersionForOldIEs} = 'jquery-1.11.2';
$Foswiki::cfg{JQueryPlugin}{JQueryVersionForOldIEs} = 'jquery-1.11.3';

# **SELECT ,base, flickr, foswiki, lightness, redmond, smoothness **
$Foswiki::cfg{JQueryPlugin}{JQueryTheme} = 'foswiki';
Expand Down
6 changes: 6 additions & 0 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
Expand Up @@ -252,6 +252,9 @@ pub/System/JQueryPlugin/jquery-1.11.1.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.11.2.js 0644
pub/System/JQueryPlugin/jquery-1.11.2.js.gz 0644
pub/System/JQueryPlugin/jquery-1.11.2.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.11.3.js 0644
pub/System/JQueryPlugin/jquery-1.11.3.js.gz 0644
pub/System/JQueryPlugin/jquery-1.11.3.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.7.1.js 0644
pub/System/JQueryPlugin/jquery-1.7.1.js.gz 0644
pub/System/JQueryPlugin/jquery-1.7.1.uncompressed.js 0644
Expand Down Expand Up @@ -291,6 +294,9 @@ pub/System/JQueryPlugin/jquery-2.1.1.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-2.1.3.js 0644
pub/System/JQueryPlugin/jquery-2.1.3.js.gz 0644
pub/System/JQueryPlugin/jquery-2.1.3.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-2.1.4.js 0644
pub/System/JQueryPlugin/jquery-2.1.4.js.gz 0644
pub/System/JQueryPlugin/jquery-2.1.4.uncompressed.js 0644
pub/System/JQueryPlugin/Makefile 0644
pub/System/JQueryPlugin/Makefile.include 0644
pub/System/JQueryPlugin/noconflict.js 0644
Expand Down
8 changes: 4 additions & 4 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm
Expand Up @@ -50,7 +50,7 @@ sub init {

# load jquery
my $jQuery = $Foswiki::cfg{JQueryPlugin}{JQueryVersion}
|| "jquery-2.1.0";
|| "jquery-2.1.4";

# test for the jquery library to be present
unless ( -e $Foswiki::cfg{PubDir} . '/'
Expand All @@ -62,13 +62,13 @@ sub init {
Foswiki::Func::writeWarning(
"CAUTION: jQuery $jQuery not found. please fix the {JQueryPlugin}{JQueryVersion} settings."
);
$jQuery = "jquery-2.1.3";
$jQuery = "jquery-2.1.4";
}

$jQuery .= ".uncompressed" if $debug;

my $jQueryIE = $Foswiki::cfg{JQueryPlugin}{JQueryVersionForOldIEs};
$jQueryIE = "jquery-1.11.2" unless defined $jQueryIE;
$jQueryIE = "jquery-1.11.3" unless defined $jQueryIE;

my $code;
if ($jQueryIE) {
Expand All @@ -83,7 +83,7 @@ sub init {
Foswiki::Func::writeWarning(
"CAUTION: jQuery $jQueryIE not found. please fix the {JQueryPlugin}{JQueryVersionForOldIEs} settings."
);
$jQuery = "jquery-1.11.2";
$jQueryIE = "jquery-1.11.3";
}

$jQueryIE .= ".uncompressed" if $debug;
Expand Down
4 changes: 3 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/Makefile
Expand Up @@ -13,11 +13,13 @@ TARGET=\
jquery-1.11.0.js \
jquery-1.11.1.js \
jquery-1.11.2.js \
jquery-1.11.3.js \
jquery-2.0.0.js \
jquery-2.0.1.js \
jquery-2.0.2.js \
jquery-2.1.0.js \
jquery-2.1.1.js \
jquery-2.1.3.js
jquery-2.1.3.js \
jquery-2.1.4.js

-include Makefile.include

0 comments on commit 7f94b1a

Please sign in to comment.