Item14152: Merge remote-tracking branch 'origin/Item13897' into Item1…

…4152
foswiki · Sep 6, 2016 · 6b5e82c · 6b5e82c
2 parents 2905c84 + eb39164
commit 6b5e82c
Show file tree

Hide file tree

Showing 426 changed files with 30,659 additions and 37,296 deletions.
diff --git a/JQueryPlugin/.gitignore b/JQueryPlugin/.gitignore
@@ -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
diff --git a/JQueryPlugin/data/System/JQueryFluidFont.txt b/JQueryPlugin/data/System/JQueryFluidFont.txt
@@ -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"
@@ -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."

diff --git a/JQueryPlugin/data/System/JQueryPlugin.txt b/JQueryPlugin/data/System/JQueryPlugin.txt
@@ -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"}%
 
@@ -125,6 +125,13 @@ 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; \
+                         - Item14171: fix encoding of error message in jquery.render |
 |  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 |
@@ -358,7 +365,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"}%

diff --git a/JQueryPlugin/data/System/JQueryRender.txt b/JQueryPlugin/data/System/JQueryRender.txt
@@ -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%
 
@@ -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',
@@ -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...
@@ -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
 
@@ -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"}%
diff --git a/JQueryPlugin/data/System/VarPOPUPWINDOW.txt b/JQueryPlugin/data/System/VarPOPUPWINDOW.txt
@@ -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
@@ -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"}%-->
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
@@ -24,8 +24,8 @@ BEGIN {
     }
 }
 
-our $VERSION           = '7.04';
-our $RELEASE           = '10 Apr 2016';
+our $VERSION           = '7.10';
+our $RELEASE           = '06 Sep 2016';
 our $SHORTDESCRIPTION  = 'jQuery <nop>JavaScript library for Foswiki';
 our $NO_PREFS_IN_TOPIC = 1;