You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jspwiki.apache.org by Harry Metske <ha...@gmail.com> on 2014/02/20 20:56:36 UTC
Re: svn commit: r1570320 - in /jspwiki/trunk: ChangeLog
jspwiki-war/src/main/config/wro/wro.properties jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
that fixes it, thanks !
On 20 February 2014 20:27, <br...@apache.org> wrote:
> Author: brushed
> Date: Thu Feb 20 19:27:40 2014
> New Revision: 1570320
>
> URL: http://svn.apache.org/r1570320
> Log:
> 2.10.1-svn-9 : JS fix in haddock template : RegExp expression cause FF to
> crash.
>
> Modified:
> jspwiki/trunk/ChangeLog
> jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
>
> jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
>
> Modified: jspwiki/trunk/ChangeLog
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1570320&r1=1570319&r2=1570320&view=diff
>
> ==============================================================================
> --- jspwiki/trunk/ChangeLog (original)
> +++ jspwiki/trunk/ChangeLog Thu Feb 20 19:27:40 2014
> @@ -1,3 +1,10 @@
> +2014-02-20 Dirk Frederickx (brushed AT apache DOT org)
> +
> + * 2.10.1-svn-9
> +
> + * JS fix in haddock template : RegExp expression cause FF to crash.
> +
> +
> 2014-02-20 Juan Pablo Santos (juanpablo AT apache DOT org)
>
> * 2.10.1-svn-8
>
> Modified: jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties?rev=1570320&r1=1570319&r2=1570320&view=diff
>
> ==============================================================================
> --- jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties (original)
> +++ jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties Thu Feb
> 20 19:27:40 2014
> @@ -16,4 +16,5 @@
> # under the License.
>
> preProcessors=cssImport,semicolonAppender
> -postProcessors=lessCss,yuiCssMin,uglifyJs
> \ No newline at end of file
> +postProcessors=lessCss,yuiCssMin,uglifyJs
> +#postProcessors=lessCss,yuiCssMin
> \ No newline at end of file
>
> Modified:
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1570320&r1=1570319&r2=1570320&view=diff
>
> ==============================================================================
> --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
> (original)
> +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
> Thu Feb 20 19:27:40 2014
> @@ -72,7 +72,7 @@ public final class Release {
> * <p>
> * If the build identifier is empty, it is not added.
> */
> - public static final String BUILD = "8";
> + public static final String BUILD = "9";
>
> /**
> * This is the generic version string you should use when printing
> out the version. It is of
>
> Modified:
> jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js?rev=1570320&r1=1570319&r2=1570320&view=diff
>
> ==============================================================================
> ---
> jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
> (original)
> +++
> jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
> Thu Feb 20 19:27:40 2014
> @@ -67,7 +67,7 @@
> //2. Convert and store in type specific arrays
> (num,dmy,kmgt,nat)
>
> //CHECKME: some corner cases: numbers with leading zero's,
> confusing date string
> - if( /(?:^0\d+)|(^[^+-\d]+\d+$)/.test(val) ){ num=dmy=0; }
> + if( /(?:^0\d+)|(?:^[^\+\-\d]+\d+$)/.test(val) ){ num=dmy=0; }
>
> if( num && isNaN( num[i] = +val ) ) num=0;
>
>
>
>