Skip to content

Commit

Permalink
Item12345:Item12474:
Browse files Browse the repository at this point in the history
   * added jquery-2.0.0
   * upgraded jquery.migrate
   * muting migration warnings by default
   * fixed ui::dialog initializer loading from relative urls
   * using uglifyjs to minimize js instead of outdated yui-compressor (which isn't able to complress jquery-2.0 and above anymore)



git-svn-id: http://svn.foswiki.org/trunk@16726 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed May 14, 2013
1 parent f352fff commit 9decebe
Show file tree
Hide file tree
Showing 10 changed files with 8,803 additions and 27 deletions.
5 changes: 3 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ $Foswiki::cfg{JQueryPlugin}{NoConflict} = 0;
# List of plugins loaded by default on any page.
$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**
# **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-2.0.0**
# 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).
# 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-1.8.3';

# **SELECT ,base, flickr, foswiki, lightness, redmond, smoothness**
Expand Down
20 changes: 13 additions & 7 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ pub/System/JQueryPlugin/jquery-1.8.3.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-1.9.1.js 0644
pub/System/JQueryPlugin/jquery-1.9.1.js.gz 0644
pub/System/JQueryPlugin/jquery-1.9.1.uncompressed.js 0644
pub/System/JQueryPlugin/jquery-2.0.0.js 0644
pub/System/JQueryPlugin/jquery-2.0.0.js.gz 0644
pub/System/JQueryPlugin/jquery-2.0.0.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 @@ -660,41 +663,44 @@ pub/System/JQueryPlugin/plugins/validate/jquery.validate.uncompressed.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ar.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_bg.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ca.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_cn.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_cs.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_da.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_de.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_el.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_es.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_et.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_eu.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_fa.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_fi.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_fr.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ge.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_he.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_hr.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_hu.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_it.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ja.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ka.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_kk.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_lt.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_lv.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_my.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_nl.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_no.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_pl.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ptbr.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ptpt.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_pt_BR.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_pt_PT.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ro.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ru.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_se.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_si.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_sk.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_sl.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_sr.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_sv.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_th.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_tr.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_tw.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_ua.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_uk.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_vi.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_zh.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/messages_zh_TW.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/methods_de.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/methods_nl.js 0644
pub/System/JQueryPlugin/plugins/validate/localization/methods_pt.js 0644
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MIGRATE.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'Migrate',
version => '1.1.1',
version => '1.2.1',
author => 'jQuery Foundation, Inc. and other contributors',
homepage => 'https://github.com/jquery/jquery-migrate/',
javascript => ['jquery.migrate.js'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Autocomplete',
version => '1.8.21',
version => '1.8.23',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://docs.jquery.com/UI/Autocomplete',
homepage => 'http://api.jqueryui.com/autocomplete/',
javascript => ['jquery.ui.autocomplete.init.js'],
dependencies => [ 'ui', ],
),
Expand Down
3 changes: 2 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ TARGET=\
jquery-1.8.1.js \
jquery-1.8.2.js \
jquery-1.8.3.js \
jquery-1.9.1.js
jquery-1.9.1.js \
jquery-2.0.0.js

-include Makefile.include
3 changes: 2 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/Makefile.include
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
FOSWIKI_ROOT?=~/foswiki/trunk/core
FOSWIKI_LIB=$(FOSWIKI_ROOT)/lib
JQUERYPLUGIN_LIB=$(FOSWIKI_LIB)/Foswiki/Plugins/JQueryPlugin
MINIFYJS=$(YUI_MINIFYJS)
MINIFYJS=$(UGLIFY_MINIFYJS)
MINIFYCSS=$(YUI_MINIFYCSS)
JSLINT=$(JAVA) -jar $(FOSWIKI_ROOT)/tools/jslint4java.jar --undef --onevar --predef=jQuery,window,console,document,foswiki,escape,unescape,alert,confirm,Image
YUI_MINIFYJS=$(JAVA) -jar $(FOSWIKI_ROOT)/tools/yuicompressor.jar --charset utf-8 --type js
YUI_MINIFYCSS=$(JAVA) -jar $(FOSWIKI_ROOT)/tools/yuicompressor.jar --charset utf-8 --type css
PERL_MINIFYJS=FOSWIKICPAN=$(FOSWIKI_ROOT)/lib/CPAN/lib $(FOSWIKI_ROOT)/tools/minifyjs
PERL_MINIFYCSS=FOSWIKICPAN=$(FOSWIKI_ROOT)/lib/CPAN/lib $(FOSWIKI_ROOT)/tools/minifycss
UGLIFY_MINIFYJS=uglifyjs -nc
JAVA=java
GZIP=gzip
CAT=cat
Expand Down
Loading

0 comments on commit 9decebe

Please sign in to comment.