Skip to content

Commit

Permalink
Item13205: added jquery-1.11.2 and jquery-2.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDaum committed Jan 12, 2015
1 parent b0830ba commit ca4fa26
Show file tree
Hide file tree
Showing 11 changed files with 19,577 additions and 15 deletions.
2 changes: 2 additions & 0 deletions JQueryPlugin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pub/System/JQueryPlugin/jquery-1.10.0.js
pub/System/JQueryPlugin/jquery-1.10.1.js
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.7.1.js
pub/System/JQueryPlugin/jquery-1.7.2.js
pub/System/JQueryPlugin/jquery-1.8.0.js
Expand All @@ -24,6 +25,7 @@ pub/System/JQueryPlugin/jquery-2.0.1.js
pub/System/JQueryPlugin/jquery-2.0.2.js
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/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/JQueryChili.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1419139145" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1420822060" format="1.1" version="1"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+ %TOPIC%
%JQPLUGINS{"chili"
Expand Down
5 changes: 3 additions & 2 deletions JQueryPlugin/data/System/JQueryPlugin.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1417294557" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1421061947" format="1.1" version="1"}%
---+!! %TOPIC%
<!--
* Set SHORTDESCRIPTION = jQuery <nop>JavaScript library for Foswiki
Expand Down Expand Up @@ -121,11 +121,12 @@ reduce bandwidth and speed up interactive performance.

---++ Plugin Info
| Maintainer(s): | Michael Daum |
| Copyright: | 2007-2014 Foswiki Contributors http://foswiki.org |
| Copyright: | 2007-2015 Foswiki Contributors http://foswiki.org |
| License: | GPL |
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 12 Jan 2015: | (6.01) - Item13205: added jquery-1.11.2 and jquery-2.1.3 |
| 29 Nov 2014: | (6.01) - Item13123: Add PLACEHOLDER parameter to JQueryAjaxHelper topic selector. |
| 25 Sep 2014: | (6.00) - Item13030: deprecate jquery.tmpl; added jsrender and a template loader |
| 06 Jun 2014: | (5.11) - Item12933: make filtered characters configurable in JQueryWikiWord |
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/data/System/JQueryStars.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="micha" comment="reprev" date="1420807369" format="1.1" reprev="2" version="2"}%
%META:TOPICINFO{author="ProjectContributor" date="1420822060" format="1.1" version="1"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+ %TOPIC%
%JQPLUGINS{"stars"
Expand Down
6 changes: 3 additions & 3 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ BEGIN {
}
}

our $VERSION = '6.00_004';
our $RELEASE = '6.00_004';
our $VERSION = '6.01';
our $RELEASE = '6.01';
our $SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -489,7 +489,7 @@ sub _inlineError {
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2010-2014 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2010-2015 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
8 changes: 4 additions & 4 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
Original file line number Diff line number Diff line change
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-2.0.0, jquery-2.0.1, jquery-2.0.2, jquery-2.1.0, jquery-2.1.1**
# **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**
# 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.1';
$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = '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.10.1, jquery-1.11.0, jquery-1.11.1**
# **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**
# 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.1';
$Foswiki::cfg{JQueryPlugin}{JQueryVersionForOldIEs} = 'jquery-1.11.2';

# **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
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ pub/System/JQueryPlugin/jquery-1.11.0.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.11.1.js 0644
pub/System/JQueryPlugin/jquery-1.11.1.js.gz 0644
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.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 @@ -281,6 +284,9 @@ pub/System/JQueryPlugin/jquery-2.1.0.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-2.1.1.js 0644
pub/System/JQueryPlugin/jquery-2.1.1.js.gz 0644
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/Makefile 0644
pub/System/JQueryPlugin/Makefile.include 0644
pub/System/JQueryPlugin/noconflict.js 0644
Expand Down
6 changes: 3 additions & 3 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ sub init {
Foswiki::Func::writeWarning(
"CAUTION: jQuery $jQuery not found. please fix the {JQueryPlugin}{JQueryVersion} settings."
);
$jQuery = "jquery-2.1.1";
$jQuery = "jquery-2.1.3";
}

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

my $jQueryIE = $Foswiki::cfg{JQueryPlugin}{JQueryVersionForOldIEs};
$jQueryIE = "jquery-1.11.1" unless defined $jQueryIE;
$jQueryIE = "jquery-1.11.2" 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.0";
$jQuery = "jquery-1.11.2";
}

$jQueryIE .= ".uncompressed" if $debug;
Expand Down
4 changes: 3 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ TARGET=\
jquery-1.10.1.js \
jquery-1.11.0.js \
jquery-1.11.1.js \
jquery-1.11.2.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.1.js \
jquery-2.1.3.js

-include Makefile.include
Loading

0 comments on commit ca4fa26

Please sign in to comment.