Skip to content

Commit

Permalink
Item8779:
Browse files Browse the repository at this point in the history 
   * upgraded to jquery-ui 1.7.2, the latest stable version compatible with jquery-1.3.2
   * don't concatenate i18n files of different encoding
   * only load the jquery-ui locale for the current site language
   * fixed example of jquery-ui's datepicker 



git-svn-id: http://svn.foswiki.org/trunk@6944 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Mar 26, 2010
1 parent 2c84b50 commit 194ca28
Show file tree
Hide file tree
Showing 35 changed files with 392 additions and 1,000 deletions.
11 changes: 8 additions & 3 deletions JQueryPlugin/data/System/JQueryUI.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1259339598" format="1.1" reprev="1.4" version="1.4"}%
%META:TOPICINFO{author="micha" comment="reprev" date="1269627081" format="1.1" reprev="1.5" version="1.5"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+ %TOPIC%
%JQPLUGINS{"ui"
Expand All @@ -22,15 +22,18 @@ The following themes are provided:
* smoothness

---++ Examples

%JQREQUIRE{"ui"}%
%JQREQUIRE{"metadata"}%

---+++ Date picker
See also: http://jqueryui.com/demos/datepicker/

%ADDTOZONE{"body" section="init" requires="JQUERYPLUGIN::UI"}%
<verbatim style="display:none">
%STARTSECTION{"init"}%
<literal>
<script type="text/javascript">
$(function() {
jQuery(function($) {
$(".jqDatepicker").not(".jqInited").each(function() {
var $this = $(this);
var options = $.extend(
Expand All @@ -43,6 +46,8 @@ $(function() {
});
</script>
</literal>
%ENDSECTION{"init"}%
</verbatim>

*Date 1:* <input type="text" size="30" name="date1" value="%GMTIME%" class="jqDatepicker" />

Expand Down
44 changes: 41 additions & 3 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
View file
Expand Up @@ -106,51 +106,89 @@ pub/System/JQueryInnerFade/rt_arch.jpg 0644
pub/System/JQueryInnerFade/tuev.jpg 0644
pub/System/JQueryInnerFade/whizzkids.gif 0644
pub/System/JQueryMasonry/jQuery-Masonry.jpg 0644
pub/System/JQueryPlugin/i18n/jquery-ui-i18n.js 0644
pub/System/JQueryPlugin/i18n/jquery-ui-i18n.js.gz 0644
pub/System/JQueryPlugin/i18n/jquery-ui-i18n.uncompressed.js 0644
pub/System/JQueryPlugin/i18n/Makefile 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ar.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ar.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-bg.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-bg.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ca.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ca.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-cs.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-cs.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-da.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-da.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-de.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-de.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-el.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-el.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-eo.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-eo.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-es.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-es.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-fa.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-fa.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-fi.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-fi.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-fr.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-fr.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-he.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-he.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-hr.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-hr.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-hu.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-hu.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-hy.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-hy.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-id.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-id.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-is.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-is.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-it.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-it.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ja.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ja.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ko.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ko.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-lt.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-lt.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-lv.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-lv.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ms.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ms.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-nl.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-nl.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-no.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-no.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-pl.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-pl.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-pt-BR.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-pt-BR.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ro.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ro.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ru.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-ru.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sk.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sk.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sl.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sl.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sq.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sq.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sr.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sr.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sr-SR.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sr-SR.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sv.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-sv.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-th.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-th.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-tr.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-tr.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-uk.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-uk.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-zh-CN.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-zh-CN.js.gz 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-zh-TW.js 0644
pub/System/JQueryPlugin/i18n/ui.datepicker-zh-TW.js.gz 0644
pub/System/JQueryPlugin/jquery-1.2.6.js 0644
pub/System/JQueryPlugin/jquery-1.2.6.js.gz 0644
pub/System/JQueryPlugin/jquery-1.2.6.uncompressed.js 0644
Expand Down
13 changes: 11 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI.pm
View file
Expand Up @@ -44,7 +44,7 @@ sub new {
my $this = bless($class->SUPER::new(
$session,
name => 'UI',
version => '1.7.1',
version => '1.7.2',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://docs.jquery.com/UI',
Expand All @@ -58,7 +58,7 @@ sub new {
---++ ClassMethod init( $this )
Initialize this plugin by adding the required static files to the html header
Initialize this plugin by adding the required static files to the page
=cut

Expand All @@ -69,6 +69,15 @@ sub init {

my $themeName = $Foswiki::cfg{JQueryPlugin}{JQueryTheme} || 'base';
Foswiki::Plugins::JQueryPlugin::Plugins::createTheme($themeName);

# open matching localization file if it exists
my $langTag = $this->{session}->i18n->language();
my $messagePath = $Foswiki::cfg{SystemWebName}.'/JQueryPlugin/i18n/ui.datepicker-'.$langTag.'.js';
my $messageFile = $Foswiki::cfg{PubDir}.'/'.$messagePath;
if (-f $messageFile) {
my $text .= "<script type='text/javascript' src='$Foswiki::cfg{PubUrlPath}/$messagePath'></script>\n";
Foswiki::Func::addToZone('body', "JQUERYPLUGIN::UI::LANG", $text, 'JQUERYPLUGIN::UI');
}
}
1;

8 changes: 3 additions & 5 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/VALIDATE.pm
View file
Expand Up @@ -57,7 +57,7 @@ sub new {
---++ ClassMethod init( $this )
Initialize this plugin by adding the required static files to the html header
Initialize this plugin by adding the required static files to the page
=cut

Expand All @@ -66,15 +66,13 @@ sub init {

return unless $this->SUPER::init();

my $header;

# open matching localization file if it exists
my $langTag = $this->{session}->i18n->language();
my $messagePath = $Foswiki::cfg{SystemWebName}.'/JQueryPlugin/plugins/validate/localization/messages_'.$langTag.'.js';
my $messageFile = $Foswiki::cfg{PubDir}.'/'.$messagePath;
if (-f $messageFile) {
$header .= "<script type='text/javascript' src='$Foswiki::cfg{PubUrlPath}/$messagePath'></script>\n";
Foswiki::Func::addToZone('body', "JQUERYPLUGIN::VALIDATE::LANG", $header, 'JQUERYPLUGIN::VALIDATE');
my $text .= "<script type='text/javascript' src='$Foswiki::cfg{PubUrlPath}/$messagePath'></script>\n";
Foswiki::Func::addToZone('body', "JQUERYPLUGIN::VALIDATE::LANG", $text, 'JQUERYPLUGIN::VALIDATE');
}

}
Expand Down
10 changes: 2 additions & 8 deletions JQueryPlugin/pub/System/JQueryPlugin/i18n/Makefile
View file
@@ -1,7 +1,4 @@
TARGET=jquery-ui-i18n.js
-include ../Makefile.include

UI_DATEPICKER_SOURCE=\
TARGET=\
ui.datepicker-ar.js\
ui.datepicker-bg.js\
ui.datepicker-ca.js\
Expand Down Expand Up @@ -44,7 +41,4 @@ UI_DATEPICKER_SOURCE=\
ui.datepicker-zh-CN.js\
ui.datepicker-zh-TW.js

jquery-ui-i18n.uncompressed.js: $(UI_DATEPICKER_SOURCE)
@echo "creating $@"
@$(CAT) $(UI_DATEPICKER_SOURCE) > $@

-include ../Makefile.include

0 comments on commit 194ca28

Please sign in to comment.