Skip to content

Commit

Permalink
Item13206: Merged Release02x01
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDaum committed Sep 6, 2016
1 parent 615763d commit a8c2405
Show file tree
Hide file tree
Showing 391 changed files with 29,891 additions and 36,523 deletions.
38 changes: 19 additions & 19 deletions JQueryPlugin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,22 @@
/pub/System/JQueryPlugin/plugins/validate/jquery.validate.methods.js
/pub/System/JQueryPlugin/plugins/wikiword/jquery.wikiword.js
/pub/System/JQueryPlugin/plugins/wikiword/wikiword.js
/pub/System/JQueryPlugin/themes/base/jquery-ui.css
/pub/System/JQueryPlugin/themes/flickr/jquery-ui.css
/pub/System/JQueryPlugin/themes/foswiki/jquery-ui.css
/pub/System/JQueryPlugin/themes/lightness/jquery-ui.css
/pub/System/JQueryPlugin/themes/redmond/jquery-ui.css
/pub/System/JQueryPlugin/themes/smoothness/jquery-ui.css
/pub/System/JQueryPlugin/ui/jquery-ui.js
/pub/System/JQueryPlugin/ui/jquery.ui.accordion.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.autocomplete.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.button.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.datepicker.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.dialog.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.draggable.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.progressbar.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.resizable.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.slider.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.spinner.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.tabs.init.js
/pub/System/JQueryPlugin/ui/jquery.ui.tooltip.init.js
/pub/System/JQueryPlugin/plugins/ui/themes/base/jquery-ui.css
/pub/System/JQueryPlugin/plugins/ui/themes/flickr/jquery-ui.css
/pub/System/JQueryPlugin/plugins/ui/themes/foswiki/jquery-ui.css
/pub/System/JQueryPlugin/plugins/ui/themes/lightness/jquery-ui.css
/pub/System/JQueryPlugin/plugins/ui/themes/redmond/jquery-ui.css
/pub/System/JQueryPlugin/plugins/ui/themes/smoothness/jquery-ui.css
/pub/System/JQueryPlugin/plugins/ui/jquery-ui.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.accordion.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.autocomplete.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.button.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.datepicker.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.dialog.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.draggable.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.progressbar.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.resizable.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.slider.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.spinner.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.tabs.init.js
/pub/System/JQueryPlugin/plugins/ui/jquery.ui.tooltip.init.js
5 changes: 2 additions & 3 deletions JQueryPlugin/data/System/JQueryFluidFont.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1456220586" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1473163788" format="1.1" version="1"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+ %TOPIC%
%JQPLUGINS{"fluidfont"
Expand Down Expand Up @@ -45,9 +45,8 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam facilisis neque i
| data | data | data | data | data | data | data | data | data | data | data | data | data | data | data | data | data | data | data | data |
</div>


%IF{"$'fluidfont'='on'"
then="$percntADDTOZONE{\"script\" topic=\"%WEB%.%TOPIC%\" section=\"fluidfont\"}$percnt
then="$percntADDTOZONE{\"script\" requires=\"JQUERYPLUGIN::FLUIDFONT\" topic=\"%WEB%.%TOPIC%\" section=\"fluidfont\"}$percnt
Fluid font is activated. Try to resize the browser window."
else="<a href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?fluidfont=on'>Click here</a>
to activate fluid font for all of this page."
Expand Down
10 changes: 8 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" comment="" date="1460294027" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1473163788" format="1.1" version="1"}%
---+!! %TOPIC%
%FORMFIELD{"Description"}%

Expand Down Expand Up @@ -125,6 +125,12 @@ required for Foswiki 1.1 or later.

---++ Change History
%TABLE{columnwidths="7em" tablewidth="100%"}%
| 06 Sep 2016: | (7.10) - Item14121: reimplement jquery.stars using SVGs now; \
- Item14120: remove outdate compression tools; \
- Item13206: upgrade to jquery-ui; added jQuery-1.12.4 / jQuery-2.2.4; \
- Item14122: upgrade to fontawesome 4.6.3; \
- Item14123: fixed =foswiki.getPubUrlPath()= using an uninitialized parameter; \
- Item14124: make skin of a jquery.loader backend configurable |
| 10 Apr 2016: | (7.04) - Item14042: it's jquery-1.12.3 not jquey-1.12.3 |
| 06 Apr 2016: | (7.03) - Item14042: added jQuery-1.12.3 / jQuery-2.2.3 |
| 04 Apr 2016: | (7.02) - Item14024: fix issue with JSON::XS 3.02 in some environments |
Expand Down Expand Up @@ -358,7 +364,7 @@ required for Foswiki 1.1 or later.

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="ProjectContributor"}%
%META:FIELD{name="Copyright" title="Copyright" value="2007-2016 Foswiki Contributors http://foswiki.org"}%
%META:FIELD{name="Copyright" title="Copyright" value="2007-2016 Foswiki Contributors https://foswiki.org"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="License" title="License" value="GPL"}%
Expand Down
16 changes: 8 additions & 8 deletions JQueryPlugin/data/System/JQueryRender.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1456220586" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1473163832" format="1.1" version="1"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+!! %TOPIC%

Expand Down Expand Up @@ -74,7 +74,7 @@ See how this works out:
</p>
</script>

<script>
%ADDTOZONE{"script" requires="JQUERYPLUGIN::RENDER" id="%TOPIC%::PERSONS" text="<script type='text/javascript'>
var arrayOfPersons = [
{
firstName:'David',
Expand All @@ -99,9 +99,9 @@ var arrayOfPersons = [
];

jQuery(function($) {
$("#container1").html($("#personTemplate1").render(arrayOfPersons));
$('#container1').html($('#personTemplate1').render(arrayOfPersons));
});
</script>
</script>"}%

Whenever you'd like to use a different layout for the same data just use a different template. No big deal.
Imagine doing the same using DOM plumbing...
Expand All @@ -118,11 +118,11 @@ Imagine doing the same using DOM plumbing...
<li>{{:firstName}} {{:lastName}}</li>
</script>

<script>
%ADDTOZONE{"script" requires="JQUERYPLUGIN::RENDER" id="%TOPIC%::INIT" text="<script type='text/javascript'>
jQuery(function($) {
$("#container2").html($("#personTemplate2").render(arrayOfPersons));
$('#container2').html($('#personTemplate2').render(arrayOfPersons));
});
</script>
</script>"}%

---++ Further reading

Expand Down Expand Up @@ -160,4 +160,4 @@ and return the rendered template.
| ={{<nop>!-- ... --}}= | comments to templates, or commenting out sections of a template | ={{!-- this is a comment --}}= |


%META:FILEATTACHMENT{name="logo-jsr.png" attr="h" comment="" date="1456220586" size="1241" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="logo-jsr.png" attr="h" comment="" date="1473163859" size="1241" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions JQueryPlugin/data/System/VarPOPUPWINDOW.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1456220586" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1473163788" format="1.1" version="1"}%
%META:TOPICPARENT{name="Macros"}%
---+ POPUPWINDOW -- opens a topic or url in a new window
---++ Parameters
Expand All @@ -22,7 +22,7 @@
| =createnew= | Create a new window for each popup? | ="1"= |
---++ Examples
* Example with topic link: <pre class="tml">%<nop>POPUPWINDOW{"%BASETOPIC%" label="Open this topic in a new window"}%</pre> Generates: %POPUPWINDOW{"%BASETOPIC%" label="Open this topic in a new window"}%
* Example with URL: <pre class="tml">%<nop>POPUPWINDOW{url="http://foswiki.org"}%</pre> Generates: %POPUPWINDOW{url="http://foswiki.org"}%
* Example with URL: <pre class="tml">%<nop>POPUPWINDOW{url="https://foswiki.org"}%</pre> Generates: %POPUPWINDOW{url="https://foswiki.org"}%
* Enable =POPUPWINDOW= by writing =%<nop>JQREQUIRE{"popupwindow"}%= on the page
%STOPINCLUDE%
<!--%JQREQUIRE{"chili"}%-->
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ sub registerTheme {
my $normalizedName = lc($themeName);

$url ||= $Foswiki::cfg{JQueryPlugin}{Themes}{$themeName}{Url}
|| '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/themes/'
|| '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui/themes/'
. $normalizedName
. '/jquery-ui.css';

Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/',
javascript => [ 'jquery-ui.js', ],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/ACCORDION.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Accordion',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/accordion/',
javascript => ['jquery.ui.accordion.init.js'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Autocomplete',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/autocomplete/',
javascript => ['jquery.ui.autocomplete.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/BUTTON.pm
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Button',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/button/',
javascript => ['jquery.ui.button.init.js'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Datepicker',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/datepicker/',
javascript => ['jquery.ui.datepicker.init.js'],
Expand Down Expand Up @@ -59,7 +59,7 @@ sub init {
my $langTag = $session->i18n->language();
my $messagePath =
$Foswiki::cfg{SystemWebName}
. '/JQueryPlugin/i18n/jquery.ui.datepicker-'
. '/JQueryPlugin/plugins/ui/i18n/datepicker-'
. $langTag . '.js';

my $messageFile = $Foswiki::cfg{PubDir} . '/' . $messagePath;
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DIALOG.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Dialog',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/dialog/',
javascript => ['jquery.ui.dialog.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DRAGGABLE.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Draggable',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/draggable/',
javascript => ['jquery.ui.draggable.init.js'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Progressbar',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/progressbar/',
javascript => ['jquery.ui.progressbar.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/RESIZABLE.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Resizable',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/resizable/',
javascript => ['jquery.ui.resizable.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/SLIDER.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Slider',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/slider/',
javascript => ['jquery.ui.slider.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/SPINNER.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Spinner',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/spinner/',
javascript => ['jquery.ui.spinner.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/TABS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Tabs',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/tabs/',
javascript => ['jquery.ui.tabs.init.js'],
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/TOOLTIP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'UI::Tooltip',
version => '1.10.4',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/ui',
version => '1.12.0',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/ui',
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/tooltip/',
javascript => ['jquery.ui.tooltip.init.js'],
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS=plugins themes ui
SUBDIRS=plugins
TARGET=\
noconflict.js \
jquery-1.9.1.js \
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a8c2405

Please sign in to comment.