Permalink
Browse files

Item14024: Item14025: Merge branch 'Release02x01'

  • Loading branch information...
2 parents 2a17ac1 + 819775b commit 18f827ebcc1b01615c6782408b1bfa691cc833bb @jast jast committed Apr 4, 2016
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1458294779" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1459777187" format="1.1" version="1"}%
---+!! %TOPIC%
%FORMFIELD{"Description"}%
@@ -125,6 +125,7 @@ required for Foswiki 1.1 or later.
---++ Change History
%TABLE{columnwidths="7em" tablewidth="100%"}%
+| 04 Apr 2016: | (7.02) - Item14024: fix issue with JSON::XS 3.02 in some environments |
| 18 Mar 2016: | (7.01) - added jQery-1.12.2 / jQuery-2.2.2; \
fixed textboxlist loosing tags with leading or trailing spaces; \
updated imagesLoaded |
@@ -24,8 +24,8 @@ BEGIN {
}
}
-our $VERSION = '7.01';
-our $RELEASE = '18 Mar 2016';
+our $VERSION = '7.02';
+our $RELEASE = '4 Apr 2016';
our $SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;
@@ -97,7 +97,7 @@ sub init {
my $text =
"<script class='\$zone \$id foswikiPreferences' type='text/json'>"
- . JSON::to_json( \%prefs, { pretty => 1 } )
+ . JSON::to_json( \%prefs, { pretty => 1, allow_nonref => 1 } )
. "</script>";
Foswiki::Func::addToZone( "script", "JQUERYPLUGIN::FOSWIKI::PREFERENCES",
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1458352247" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1459777187" format="1.1" version="1"}%
---+!! %TOPIC%
%FORMFIELD{"Description"}%
@@ -216,6 +216,7 @@ If a namespace, method, or parameters are specified as part of a JSON-RPC reques
%$DEPENDENCIES%
---++ Change History
+| 04 Apr 2016: (2.26) | Foswikitask:Item14025: Fix issues with JSON::XS 3.02 in some environments. |
| 18 Mar 2016: (2.25) | Foswikitask:Item14011: Make sure HTTP2 is always compressing. |
| 03 Feb 2016: (2.24) | Foswikitask:Item13405: Add NFC normalization of Unicode strings. |
| 14 Jul 2015: (2.23) | fixed encoding of compressed responses Foswikitask:Item13521 |
@@ -21,8 +21,8 @@ BEGIN {
=cut
-our $VERSION = '2.25';
-our $RELEASE = '4 Jan 2016';
+our $VERSION = '2.26';
+our $RELEASE = '4 Apr 2016';
our $SHORTDESCRIPTION = 'JSON-RPC interface for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;
our $SERVER;
@@ -140,7 +140,8 @@ sub json {
my $this = shift;
unless ( defined $this->{json} ) {
- $this->{json} = JSON->new->pretty(DEBUG)->convert_blessed(1);
+ $this->{json} =
+ JSON->new->pretty(DEBUG)->convert_blessed(1)->allow_nonref(1);
}
return $this->{json};

0 comments on commit 18f827e

Please sign in to comment.