Skip to content

Commit

Permalink
Item11335: Need JQuery 1.7.1 for Firfox 7 compat
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/branches/Release01x01@13345 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Dec 8, 2011
1 parent 09afe9f commit b6c3a33
Show file tree
Hide file tree
Showing 15 changed files with 18,843 additions and 18 deletions.
2 changes: 2 additions & 0 deletions JQueryPlugin/data/System/JQueryPlugin.txt
Expand Up @@ -137,6 +137,8 @@ reduce bandwidth and speed up interactive performance.
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 22 Nov 2011: | (4.30) added jquery-1.7 and jquery-1.7.1; \
added jquery.loader to ease loading sections asynchronously |
| 3 Dec 2011: | (4.22) Incremented version for Foswiki 1.1.4 release. Minor code and documentaiton cleanup. |
| 22 Nov 2011: | (4.21) added config warnings for the deprecated JQuery plugins; \
and a warining for Chili highlighter corruption; \
Expand Down
6 changes: 3 additions & 3 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
Expand Up @@ -20,7 +20,7 @@ use vars qw(
);

$VERSION = '$Rev$';
$RELEASE = '4.22';
$RELEASE = '4.30';
$SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
$NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -259,13 +259,13 @@ sub handleJQueryRequire {
my ( $session, $params, $theTopic, $theWeb ) = @_;

my $plugins = $params->{_DEFAULT} || '';
my $warn = $params->{warn} || '';
my $warn = Foswiki::Func::isTrue( $params->{warn}, 1 );
my $errorMsg = '';
foreach my $pluginName ( split( /\s*,\s*/, $plugins ) ) {
my $plugin = createPlugin( $pluginName, $session );
$errorMsg .=
"<div class='foswikiAlert'>Error: no such plugin $pluginName</div>"
if !$plugin && $warn ne 'off';
if !$plugin && $warn;
}

return $errorMsg;
Expand Down
7 changes: 5 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
Expand Up @@ -26,8 +26,8 @@ $Foswiki::cfg{JQueryPlugin}{NoConflict} = 0;
# **STRING**
$Foswiki::cfg{JQueryPlugin}{DefaultPlugins} = '';

# **SELECT jquery-1.4.3, jquery-1.4.4, jquery-1.5, jquery-1.5.1, jquery-1.5.2, jquery-1.6.1, jquery-1.6.2, jquery-1.6.3, jquery-1.6.4**
$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-1.6.4';
# **SELECT jquery-1.4.3, jquery-1.4.4, jquery-1.5, jquery-1.5.1, jquery-1.5.2, jquery-1.6.1, jquery-1.6.2, jquery-1.6.3, jquery-1.6.4, jquery-1.7, jquery-1.7.1**
$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-1.7.1';

# **SELECT ,base, flickr, foswiki, lightness, redmond, smoothness**
$Foswiki::cfg{JQueryPlugin}{JQueryTheme} = 'foswiki';
Expand Down Expand Up @@ -228,4 +228,7 @@ $Foswiki::cfg{JQueryPlugin}{Plugins}{Validate}{Enabled} = 1;
# **BOOLEAN**
$Foswiki::cfg{JQueryPlugin}{Plugins}{WikiWord}{Enabled} = 1;

# **BOOLEAN**
$Foswiki::cfg{JQueryPlugin}{Plugins}{Loader}{Enabled} = 1;

1;
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FOSWIKI.pm
Expand Up @@ -66,7 +66,7 @@ sub init {
'PUBURL, PUBURLPATH, SCRIPTSUFFIX, SCRIPTURL, SCRIPTURLPATH, SERVERTIME, SKIN, SYSTEMWEB, TOPIC, USERNAME, USERSWEB, WEB, WIKINAME, WIKIUSERNAME, NAMEFILTER';
$prefs .= ', TWISTYANIMATIONSPEED'
if $Foswiki::cfg{Plugins}{TwistyPlugin}
{Enabled}; # can't use context during init
{Enabled}; # can't use context during init
}

# init NAMEFILTER
Expand Down
52 changes: 52 additions & 0 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/LOADER.pm
@@ -0,0 +1,52 @@
# See bottom of file for license and copyright information
package Foswiki::Plugins::JQueryPlugin::LOADER;
use strict;
use warnings;

use Foswiki::Plugins::JQueryPlugin::Plugin;
our @ISA = qw( Foswiki::Plugins::JQueryPlugin::Plugin );

sub new {
my $class = shift;

my $this = bless(
$class->SUPER::new(
name => 'Loader',
version => '1.00',
author => 'Michael Daum',
homepage => 'http://foswiki.org/Extensions/JQueryPlugin',
tags => 'LOADER',
javascript => ['jquery.loader.js'],
dependencies => ['metadata'],
),
$class
);

return $this;
}

1;

__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2011 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Additional copyrights apply to some or all of the code in this
file as follows:
Copyright (C) 2011 Michael Daum http://michaeldaumconsulting.com
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version. For
more details read LICENSE in the root of this distribution.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
As per the GPL, removal of this notice is prohibited.
14 changes: 14 additions & 0 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
Expand Up @@ -22,6 +22,7 @@ data/System/JQueryGradient.txt 0644
data/System/JQueryHoverIntent.txt 0644
data/System/JQueryInnerFade.txt 0644
data/System/JQueryLiveQuery.txt 0644
data/System/JQueryLoader.txt 0644
data/System/JQueryLocalScroll.txt 0644
data/System/JQueryMaskedInput.txt 0644
data/System/JQueryMasonry.txt 0644
Expand Down Expand Up @@ -92,6 +93,7 @@ lib/Foswiki/Plugins/JQueryPlugin/GRADIENT.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/HOVERINTENT.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/INNERFADE.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/LIVEQUERY.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/LOADER.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/LOCALSCROLL.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/MASKEDINPUT.pm 0644
lib/Foswiki/Plugins/JQueryPlugin/MASONRY.pm 0644
Expand Down Expand Up @@ -143,6 +145,8 @@ pub/System/JQueryInnerFade/whizzkids.gif 0644
pub/System/JQueryMasonry/jQuery-Masonry.jpg 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-af.js 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-af.js.gz 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-ar-DZ.js 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-ar-DZ.js.gz 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-ar.js 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-ar.js.gz 0644
pub/System/JQueryPlugin/i18n/jquery.ui.datepicker-az.js 0644
Expand Down Expand Up @@ -295,6 +299,12 @@ pub/System/JQueryPlugin/jquery-1.6.3.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.6.4.js 0644
pub/System/JQueryPlugin/jquery-1.6.4.js.gz 0644
pub/System/JQueryPlugin/jquery-1.6.4.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.7.js 0644
pub/System/JQueryPlugin/jquery-1.7.js.gz 0644
pub/System/JQueryPlugin/jquery-1.7.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
pub/System/JQueryPlugin/Makefile 0644
pub/System/JQueryPlugin/Makefile.include 0644
pub/System/JQueryPlugin/plugins/autocomplete/jquery.autocomplete.css 0644
Expand Down Expand Up @@ -447,6 +457,10 @@ pub/System/JQueryPlugin/plugins/livequery/jquery.livequery.js 0644
pub/System/JQueryPlugin/plugins/livequery/jquery.livequery.js.gz 0644
pub/System/JQueryPlugin/plugins/livequery/jquery.livequery.uncompressed.js 0644
pub/System/JQueryPlugin/plugins/livequery/Makefile 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.js 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.js.gz 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js 0644
pub/System/JQueryPlugin/plugins/loader/Makefile 0644
pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.js 0644
pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.js.gz 0644
pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.uncompressed.js 0644
Expand Down
4 changes: 3 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/Makefile
Expand Up @@ -9,6 +9,8 @@ TARGET=\
jquery-1.6.1.js \
jquery-1.6.2.js \
jquery-1.6.3.js \
jquery-1.6.4.js
jquery-1.6.4.js \
jquery-1.7.js \
jquery-1.7.1.js \

-include Makefile.include

0 comments on commit b6c3a33

Please sign in to comment.