diff --git a/Makefile b/Makefile
index 49f9ad7b8..c25b61bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,13 @@
# Prefix for packaging
DESTDIR=
+# Flag for optimizations
+PROD=no
+
+# Compression
+JSCOMPRESS=$(PROD)
+CSSCOMPRESS=$(PROD)
+
PERL=$$(which perl)
PERLVERSION=`perl -e '$$version = $$^V; $$version =~ s/v//; print $$version'`
SU=su -c
@@ -419,13 +426,32 @@ install_manager_site: install_conf_dir
@install -v -d ${RMANAGERDIR} $(RMANAGERSTATICDIR) $(RMANAGERPSGIDIR) \
$(RMANAGERTEMPLATESDIR)
@cp -pR $(SRCMANAGERDIR)/site/static/* $(RMANAGERSTATICDIR)
- @cp -pR $(SRCMANAGERDIR)/site/templates/* $(RMANAGERTEMPLATESDIR)
+ @for f in $(SRCMANAGERDIR)/site/templates/*.tpl; do \
+ ./scripts/transform-templates jsminified $(JSCOMPRESS) cssminified $(CSSCOMPRESS) <$$f \
+ > $(RMANAGERTEMPLATESDIR)/`basename $$f`; \
+ done
@cp -pR $(SRCMANAGERDIR)/eg/* $(RMANAGERPSGIDIR)
# Clean svn files
@rm -rf $$(find ${RMANAGERDIR} ${RMANAGERSTATICDIR} $(RMANAGERPSGIDIR) \
$(RMANAGERTEMPLATESDIR) $(RCONFDIR) -type d -name .svn)
$(PERL) -i -pe 's#__MANAGERSTATICDIR__#$(MANAGERRELATIVESTATICDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
$(PERL) -i -pe 's#__MANAGERTEMPLATESDIR__#$(MANAGERTEMPLATESDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
+ @if test "$(CSSCOMPRESS)" = "yes"; then \
+ for f in $(RMANAGERSTATICDIR)/css/*; do \
+ if test "$${f%%.min.css}" = "$$f"; then \
+ echo "Compressing $$f"; \
+ yui-compressor $$f >$${f%%.css}.min.css; \
+ fi; \
+ done; \
+ fi
+ @if test "$(JSCOMPRESS)" = "yes"; then \
+ for f in $(RMANAGERSTATICDIR)/js/*; do \
+ if test "$${f%%.min.js}" = "$$f"; then \
+ echo "Compressing $$f"; \
+ yui-compressor $$f >$${f%%.js}.min.js; \
+ fi; \
+ done; \
+ fi
install_portal_site: install_conf_dir
# Portal install
diff --git a/debian/control b/debian/control
index 51e7928c2..fc12b46de 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,8 @@ Build-Depends-Indep: libapache-session-perl,
libxml-libxslt-perl,
libxml-simple-perl,
omegat,
- perl
+ perl,
+ yui-compressor
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/lemonldap-ng.git
Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/lemonldap-ng.git
diff --git a/debian/rules b/debian/rules
index 86df94d01..6a6595270 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,10 +46,8 @@ override_dh_auto_install:
APACHEUSER=www-data \
APACHEGROUP=www-data \
DEFDOCDIR=/usr/share/doc/lemonldap-ng-doc \
- FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc
-
- test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js')
- test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css')
+ FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
+ PROD=yes
mkdir $(TMP)/$(LMSHAREDIR)/manager $(TMP)/$(LMSHAREDIR)/portal
mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/
diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm
index a9fa71612..aaea5135c 100644
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm
@@ -230,7 +230,7 @@ the first word of /path/info.
=item $dest:
-string, sub ref or hash ref (see "Route types" bellow)
+string, sub ref or hash ref (see "Route types" below)
=item $methods:
diff --git a/lemonldap-ng-manager/site/templates/header.tpl b/lemonldap-ng-manager/site/templates/header.tpl
index 5c5014f6f..59f30b296 100644
--- a/lemonldap-ng-manager/site/templates/header.tpl
+++ b/lemonldap-ng-manager/site/templates/header.tpl
@@ -9,5 +9,8 @@
bwr/bootstrap/dist/css/bootstrap.min.css" />
bwr/bootstrap/dist/css/bootstrap-theme.min.css" />
bwr/angular-ui-tree/dist/angular-ui-tree.min.css" />
+
css/manager.css" />
-
+
diff --git a/lemonldap-ng-manager/site/templates/manager.tpl b/lemonldap-ng-manager/site/templates/manager.tpl
index f30033ba8..76c98a757 100644
--- a/lemonldap-ng-manager/site/templates/manager.tpl
+++ b/lemonldap-ng-manager/site/templates/manager.tpl
@@ -168,8 +168,14 @@
+
+
diff --git a/lemonldap-ng-manager/site/templates/notifications.tpl b/lemonldap-ng-manager/site/templates/notifications.tpl
index 68455d583..3598f8bf8 100644
--- a/lemonldap-ng-manager/site/templates/notifications.tpl
+++ b/lemonldap-ng-manager/site/templates/notifications.tpl
@@ -133,6 +133,10 @@
+
+
diff --git a/lemonldap-ng-manager/site/templates/scripts.tpl b/lemonldap-ng-manager/site/templates/scripts.tpl
index 295dcca14..ebe985c3b 100644
--- a/lemonldap-ng-manager/site/templates/scripts.tpl
+++ b/lemonldap-ng-manager/site/templates/scripts.tpl
@@ -35,5 +35,8 @@
+
-
+
diff --git a/lemonldap-ng-manager/site/templates/sessions.tpl b/lemonldap-ng-manager/site/templates/sessions.tpl
index 83fc61c46..0badf04e2 100644
--- a/lemonldap-ng-manager/site/templates/sessions.tpl
+++ b/lemonldap-ng-manager/site/templates/sessions.tpl
@@ -111,6 +111,10 @@
+
+
diff --git a/scripts/CSS/Minifier.pm b/scripts/CSS/Minifier.pm
deleted file mode 100644
index 23bd692ca..000000000
--- a/scripts/CSS/Minifier.pm
+++ /dev/null
@@ -1,371 +0,0 @@
-package CSS::Minifier;
-
-use strict;
-use warnings;
-
-require Exporter;
-our @ISA = qw(Exporter);
-our @EXPORT_OK = qw(minify);
-
-our $VERSION = '0.01';
-
-# -----------------------------------------------------------------------------
-
-sub isSpace {
- my $x = shift;
- return ( $x eq ' ' || $x eq "\t" );
-}
-
-sub isEndspace {
- my $x = shift;
- return ( $x eq "\n" || $x eq "\r" || $x eq "\f" );
-}
-
-sub isWhitespace {
- my $x = shift;
- return ( isSpace($x) || isEndspace($x) );
-}
-
-# whitespace characters before or after these characters can be removed.
-sub isInfix {
- my $x = shift;
- return ( $x eq '{' || $x eq '}' || $x eq ';' || $x eq ':' );
-}
-
-# whitespace characters after these characters can be removed.
-sub isPrefix {
- my $x = shift;
- return ( isInfix($x) );
-}
-
-# whitespace characters before these characters can removed.
-sub isPostfix {
- my $x = shift;
- return ( isInfix($x) );
-}
-
-# -----------------------------------------------------------------------------
-
-sub _get {
- my $s = shift;
- if ( $s->{inputType} eq 'file' ) {
- return getc( $s->{input} );
- }
- elsif ( $s->{inputType} eq 'string' ) {
- if ( $s->{'inputPos'} < length( $s->{input} ) ) {
- return substr( $s->{input}, $s->{inputPos}++, 1 );
- }
- else { # Simulate getc() when off the end of the input string.
- return undef;
- }
- }
- else {
- die "no input";
- }
-}
-
-sub _put {
- my $s = shift;
- my $x = shift;
- my $outfile = ( $s->{outfile} );
- if ( defined( $s->{outfile} ) ) {
- print $outfile $x;
- }
- else {
- $s->{output} .= $x;
- }
-}
-
-# -----------------------------------------------------------------------------
-# print a
-# new b
-#
-# i.e. print a and advance
-sub action1 {
- my $s = shift;
- $s->{last} = $s->{a};
- _put( $s, $s->{a} );
- action2($s);
-}
-
-# move b to a
-# new b
-#
-# i.e. delete a and advance
-sub action2 {
- my $s = shift;
- $s->{a} = $s->{b};
- $s->{b} = $s->{c};
- $s->{c} = _get($s);
-}
-
-# -----------------------------------------------------------------------------
-
-# put string literals
-# when this sub is called, $s->{a} is on the opening delimiter character
-sub putLiteral {
- my $s = shift;
- my $delimiter = $s->{a}; # ' or "
-
- action1($s);
- do {
- while ( defined( $s->{a} ) && $s->{a} eq '\\' )
- { # escape character escapes only the next one character
- action1($s);
- action1($s);
- }
- action1($s);
- } until ( $s->{last} eq $delimiter || !defined( $s->{a} ) );
- if ( $s->{last} ne $delimiter )
- { # ran off end of file before printing the closing delimiter
- die 'unterminated '
- . ( $delimiter eq '\''
- ? 'single quoted string'
- : 'double quoted string' )
- . ' literal, stopped';
- }
-}
-
-# -----------------------------------------------------------------------------
-
-# If $s->{a} is a whitespace then collapse all following whitespace.
-# If any of the whitespace is a new line then ensure $s->{a} is a new line
-# when this function ends.
-sub collapseWhitespace {
- my $s = shift;
- while (defined( $s->{a} )
- && isWhitespace( $s->{a} )
- && defined( $s->{b} )
- && isWhitespace( $s->{b} ) )
- {
- if ( isEndspace( $s->{a} ) || isEndspace( $s->{b} ) ) {
- $s->{a} = "\n";
- }
- action2($s); # delete b
- }
-}
-
-# Advance $s->{a} to non-whitespace or end of file.
-# Doesn't print any of this whitespace.
-sub skipWhitespace {
- my $s = shift;
- while ( defined( $s->{a} ) && isWhitespace( $s->{a} ) ) {
- action2($s);
- }
-}
-
-# #s->{a} should be on whitespace when this function is called
-sub preserveWhitespace {
- my $s = shift;
- collapseWhitespace($s);
- if ( defined( $s->{a} ) && defined( $s->{b} ) && !isPostfix( $s->{b} ) ) {
- action1($s); # print the whitespace character
- }
- skipWhitespace($s);
-}
-
-# -----------------------------------------------------------------------------
-
-sub minify {
- my %h = @_;
-
-# Immediately turn hash into a hash reference so that notation is the same in this function
-# as others. Easier refactoring.
- my $s = \%h
- ; # hash reference for "state". This module is functional programming and the state is passed between functions.
-
- # determine if the the input is a string or a file handle.
- my $ref = \$s->{input};
- if ( defined($ref) && ref($ref) eq 'SCALAR' ) {
- $s->{inputPos} = 0;
- $s->{inputType} = 'string';
- }
- else {
- $s->{inputType} = 'file';
- }
-
- # Determine if the output is to a string or a file.
- if ( !defined( $s->{outfile} ) ) {
- $s->{output} = '';
- }
-
- # Print the copyright notice first
- if ( $s->{copyright} ) {
- _put( $s, '/* ' . $s->{copyright} . ' */' );
- }
-
- # Initialize the buffer.
- do {
- $s->{a} = _get($s);
- } while ( defined( $s->{a} ) && isWhitespace( $s->{a} ) );
- $s->{b} = _get($s);
- $s->{c} = _get($s);
- $s->{last} = undef;
-
- # local variables
- my $firstCommentSeen = 0;
- my $macIeCommentHackFlag = 0
- ; # marks if a have recently seen a comment with an escaped close like this /* foo \*/
- # and have not yet seen a regular comment to close this like /* bar */
-
- while ( defined( $s->{a} ) )
- { # on this line $s->{a} should always be a non-whitespace character or undef (i.e. end of file)
-
- if ( isWhitespace( $s->{a} ) )
- { # check that this program is running correctly
- die
-'minifier bug: minify while loop starting with whitespace, stopped';
- }
-
-# Each branch handles trailing whitespace and ensures $s->{a} is on non-whitespace or undef when branch finishes
- if ( $s->{a} eq '/' && defined( $s->{b} ) && $s->{b} eq '*' )
- { # a comment
- do {
- if ($firstCommentSeen) {
- action2($s); # advance buffer by one
- }
- else {
- action1($s);
- }
-
- # if a is \, b is *, c is /, hack flag false
- # Mac/IE hack start
- # set hack flag true
- # print /*\*/
- if ( $s->{a} eq '\\'
- && defined( $s->{b} )
- && $s->{b} eq '*'
- && defined( $s->{c} )
- && $s->{c} eq '/'
- && !$macIeCommentHackFlag )
- {
- $macIeCommentHackFlag = 1;
- _put( $s, '/*\\*/' );
- $s->{last} = '/';
- }
-
- # if a is not \, b is *, c is /, hack flag true
- # Mac/IE hack end
- # set hack flag false
- # print /**/
- if ( $s->{a} ne '\\'
- && defined( $s->{b} )
- && $s->{b} eq '*'
- && defined( $s->{c} )
- && $s->{c} eq '/'
- && $macIeCommentHackFlag )
- {
- $macIeCommentHackFlag = 0;
- _put( $s, '/**/' );
- $s->{last} = '/';
- }
-
- } until ( !defined( $s->{b} )
- || ( $s->{a} eq '*' && $s->{b} eq '/' ) );
- if ( defined( $s->{b} ) )
- { # $s->{a} is asterisk and $s->{b} is forward slash
- if ($firstCommentSeen) {
- action2($s); # the *
- $s->{a} = ' '; # the /
- skipWhitespace($s);
- }
- else {
- action1($s);
- $firstCommentSeen++;
- }
- }
- else {
- die 'unterminated comment, stopped';
- }
- }
- elsif ( $s->{a} eq '\'' || $s->{a} eq '"' ) {
- putLiteral($s);
- if ( defined( $s->{a} ) && isWhitespace( $s->{a} ) ) {
- preserveWhitespace($s); # can this be skipWhitespace?
- }
- }
- elsif ( isPrefix( $s->{a} ) ) {
- action1($s);
- skipWhitespace($s);
- }
- else { # anything else just prints
- action1($s);
- if ( defined( $s->{a} ) && isWhitespace( $s->{a} ) ) {
- preserveWhitespace($s);
- }
- }
- }
-
- if ( !defined( $s->{outfile} ) ) {
- return $s->{output};
- }
-
-}
-
-# -----------------------------------------------------------------------------
-
-1;
-__END__
-
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-CSS::Minifier - Perl extension for minifying CSS
-
-=head1 SYNOPSIS
-
-To minify a CSS file and have the output written directly to another file
-
- use CSS::Minifier qw(minify);
- open(INFILE, 'myStylesheet.css') or die;
- open(OUTFILE, 'myStylesheet.css') or die;
- minify(input => *INFILE, outfile => *OUTFILE);
- close(INFILE);
- close(OUTFILE);
-
-To minify a CSS string literal. Note that by omitting the outfile parameter a the minified code is returned as a string.
-
- my minifiedCSS = minify(input => 'div {font-family: serif;}');
-
-To include a copyright comment at the top of the minified code.
-
- minify(input => 'div {font-family: serif;}', copyright => 'BSD License');
-
-The "input" parameter is manditory. The "output" and "copyright" parameters are optional and can be used in any combination.
-
-=head1 DESCRIPTION
-
-This module removes unnecessary whitespace from CSS. The primary requirement developing this module is to not break working stylesheets: if working CSS is in input then working CSS is output. The Mac/Internet Explorer comment hack will be minimized but not stripped and so will continue to function.
-
-This module understands space, horizontal tab, new line, carriage return, and form feed characters to be whitespace. Any other characters that may be considered whitespace are not minimized. These other characters include paragraph separator and vertical tab.
-
-For static CSS files, it is recommended that you minify during the build stage of web deployment. If you minify on-the-fly then it might be a good idea to cache the minified file. Minifying static files on-the-fly repeatedly is wasteful.
-
-=head2 EXPORT
-
-None by default.
-
-Exportable on demand: minifiy()
-
-
-=head1 SEE ALSO
-
-This project is developed using an SVN repository. To check out the repository
-svn co http://dev.michaux.ca/svn/random/CSS-Minifier
-
-You may also be interested in the JavaScript::Minifier module also available on CPAN.
-
-
-=head1 AUTHORS
-
-Peter Michaux, Epetermichaux@gmail.comE
-
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2007 by Peter Michaux
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.6 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/JavaScript/Minifier.pm b/scripts/JavaScript/Minifier.pm
deleted file mode 100644
index bbf71c065..000000000
--- a/scripts/JavaScript/Minifier.pm
+++ /dev/null
@@ -1,507 +0,0 @@
-package JavaScript::Minifier;
-
-use strict;
-use warnings;
-
-require Exporter;
-our @ISA = qw(Exporter);
-our @EXPORT_OK = qw(minify);
-
-our $VERSION = '1.05';
-
-# -----------------------------------------------------------------------------
-
-#return true if the character is allowed in identifier.
-sub isAlphanum {
- my $x = shift;
- return ( $x =~ /[\w\$\\]/ || ord($x) > 126 );
-}
-
-sub isSpace {
- my $x = shift;
- return ( $x eq ' ' || $x eq "\t" );
-}
-
-sub isEndspace {
- my $x = shift;
- return ( $x eq "\n" || $x eq "\r" || $x eq "\f" );
-}
-
-sub isWhitespace {
- my $x = shift;
- return ( isSpace($x) || isEndspace($x) );
-}
-
-# New line characters before or after these characters can be removed.
-# Not + - / in this list because they require special care.
-sub isInfix {
- my $x = shift;
- $x =~ /[,;:=&%*<>\?\|\n]/;
-}
-
-# New line characters after these characters can be removed.
-sub isPrefix {
- my $x = shift;
- return ( $x =~ /[\{\(\[!]/ || isInfix($x) );
-}
-
-# New line characters before these characters can removed.
-sub isPostfix {
- my $x = shift;
- return ( $x =~ /[\}\)\]]/ || isInfix($x) );
-}
-
-# -----------------------------------------------------------------------------
-
-sub _get {
- my $s = shift;
- if ( $s->{inputType} eq 'file' ) {
- return getc( $s->{input} );
- }
- elsif ( $s->{inputType} eq 'string' ) {
- if ( $s->{'inputPos'} < length( $s->{input} ) ) {
- return substr( $s->{input}, $s->{inputPos}++, 1 );
- }
- else { # Simulate getc() when off the end of the input string.
- return undef;
- }
- }
- else {
- die "no input";
- }
-}
-
-sub _put {
- my $s = shift;
- my $x = shift;
- my $outfile = ( $s->{outfile} );
- if ( defined( $s->{outfile} ) ) {
- print $outfile $x;
- }
- else {
- $s->{output} .= $x;
- }
-}
-
-# -----------------------------------------------------------------------------
-
-# print a
-# move b to a
-# move c to b
-# move d to c
-# new d
-#
-# i.e. print a and advance
-sub action1 {
- my $s = shift;
- if ( !isWhitespace( $s->{a} ) ) {
- $s->{lastnws} = $s->{a};
- }
- $s->{last} = $s->{a};
- action2($s);
-}
-
-# sneeky output $s->{a} for comments
-sub action2 {
- my $s = shift;
- _put( $s, $s->{a} );
- action3($s);
-}
-
-# move b to a
-# move c to b
-# move d to c
-# new d
-#
-# i.e. delete a
-sub action3 {
- my $s = shift;
- $s->{a} = $s->{b};
- action4($s);
-}
-
-# move c to b
-# move d to c
-# new d
-#
-# i.e. delete b
-sub action4 {
- my $s = shift;
- $s->{b} = $s->{c};
- $s->{c} = $s->{d};
- $s->{d} = _get($s);
-}
-
-# -----------------------------------------------------------------------------
-
-# put string and regexp literals
-# when this sub is called, $s->{a} is on the opening delimiter character
-sub putLiteral {
- my $s = shift;
- my $delimiter = $s->{a}; # ', " or /
- action1($s);
- do {
- while ( defined( $s->{a} ) && $s->{a} eq '\\' )
- { # escape character only escapes only the next one character
- action1($s);
- action1($s);
- }
- action1($s);
- } until ( $s->{last} eq $delimiter || !defined( $s->{a} ) );
- if ( $s->{last} ne $delimiter )
- { # ran off end of file before printing the closing delimiter
- die 'unterminated '
- . ( $delimiter eq '\'' ? 'single quoted string'
- : $delimiter eq '"' ? 'double quoted string'
- : 'regular expression' )
- . ' literal, stopped';
- }
-}
-
-# -----------------------------------------------------------------------------
-
-# If $s->{a} is a whitespace then collapse all following whitespace.
-# If any of the whitespace is a new line then ensure $s->{a} is a new line
-# when this function ends.
-sub collapseWhitespace {
- my $s = shift;
- while (defined( $s->{a} )
- && isWhitespace( $s->{a} )
- && defined( $s->{b} )
- && isWhitespace( $s->{b} ) )
- {
- if ( isEndspace( $s->{a} ) || isEndspace( $s->{b} ) ) {
- $s->{a} = "\n";
- }
- action4($s); # delete b
- }
-}
-
-# Advance $s->{a} to non-whitespace or end of file.
-# Doesn't print any of this whitespace.
-sub skipWhitespace {
- my $s = shift;
- while ( defined( $s->{a} ) && isWhitespace( $s->{a} ) ) {
- action3($s);
- }
-}
-
-# Advance $s->{a} to non-whitespace or end of file
-# If any of the whitespace is a new line then print one new line.
-sub preserveEndspace {
- my $s = shift;
- collapseWhitespace($s);
- if ( defined( $s->{a} )
- && isEndspace( $s->{a} )
- && defined( $s->{b} )
- && !isPostfix( $s->{b} ) )
- {
- action1($s);
- }
- skipWhitespace($s);
-}
-
-sub onWhitespaceConditionalComment {
- my $s = shift;
- return ( defined( $s->{a} )
- && isWhitespace( $s->{a} )
- && defined( $s->{b} )
- && $s->{b} eq '/'
- && defined( $s->{c} )
- && ( $s->{c} eq '/' || $s->{c} eq '*' )
- && defined( $s->{d} )
- && $s->{d} eq '@' );
-}
-
-# -----------------------------------------------------------------------------
-
-sub minify {
- my %h = @_;
-
-# Immediately turn hash into a hash reference so that notation is the same in this function
-# as others. Easier refactoring.
- my $s = \%h
- ; # hash reference for "state". This module is functional programming and the state is passed between functions.
-
- # determine if the the input is a string or a file handle.
- my $ref = \$s->{input};
- if ( defined($ref) && ref($ref) eq 'SCALAR' ) {
- $s->{inputPos} = 0;
- $s->{inputType} = 'string';
- }
- else {
- $s->{inputType} = 'file';
- }
-
- # Determine if the output is to a string or a file.
- if ( !defined( $s->{outfile} ) ) {
- $s->{output} = '';
- }
-
- # Print the copyright notice first
- if ( $s->{copyright} ) {
- _put( $s, '/* ' . $s->{copyright} . ' */' );
- }
-
- # Initialize the buffer.
- do {
- $s->{a} = _get($s);
- } while ( defined( $s->{a} ) && isWhitespace( $s->{a} ) );
- $s->{b} = _get($s);
- $s->{c} = _get($s);
- $s->{d} = _get($s);
- $s->{last} = undef; # assign for safety
- $s->{lastnws} = undef; # assign for safety
-
- # local variables
- my $firstCommentSeen;
- my $ccFlag
- ; # marks if a comment is an Internet Explorer conditional comment and should be printed to output
-
- while ( defined( $s->{a} ) )
- { # on this line $s->{a} should always be a non-whitespace character or undef (i.e. end of file)
-
- if ( isWhitespace( $s->{a} ) )
- { # check that this program is running correctly
- die
-'minifier bug: minify while loop starting with whitespace, stopped';
- }
-
-# Each branch handles trailing whitespace and ensures $s->{a} is on non-whitespace or undef when branch finishes
- if ( $s->{a} eq '/' ) { # a division, comment, or regexp literal
- if ( defined( $s->{b} ) && $s->{b} eq '/' ) { # slash-slash comment
- $ccFlag =
- defined( $s->{c} )
- && $s->{c} eq '@'
- ; # tests in IE7 show no space allowed between slashes and at symbol
- do {
- $ccFlag ? action2($s) : action3($s);
- } until ( !defined( $s->{a} ) || isEndspace( $s->{a} ) );
- if ( defined( $s->{a} ) ) { # $s->{a} is a new line
- if ($ccFlag) {
- action1($s)
- ; # cannot use preserveEndspace($s) here because it might not print the new line
- skipWhitespace($s);
- }
- elsif (defined( $s->{last} )
- && !isEndspace( $s->{last} )
- && !isPrefix( $s->{last} ) )
- {
- preserveEndspace($s);
- }
- else {
- skipWhitespace($s);
- }
- }
- }
- elsif ( defined( $s->{b} ) && $s->{b} eq '*' )
- { # slash-star comment
- $ccFlag =
- defined( $s->{c} )
- && $s->{c} eq '@'
- ; # test in IE7 shows no space allowed between star and at symbol
- do {
- $ccFlag or !$firstCommentSeen ? action2($s) : action3($s);
- } until ( !defined( $s->{b} )
- || ( $s->{a} eq '*' && $s->{b} eq '/' ) );
- if ( defined( $s->{b} ) )
- { # $s->{a} is asterisk and $s->{b} is foreslash
- if ( $ccFlag or !$firstCommentSeen ) {
- action2($s); # the *
- action2($s); # the /
- # inside the conditional comment there may be a missing terminal semi-colon
- preserveEndspace($s);
- $firstCommentSeen++;
- }
- else { # the comment is being removed
- action3($s); # the *
- $s->{a} = ' '; # the /
- collapseWhitespace($s);
- if (
- defined( $s->{last} )
- && defined( $s->{b} )
- && (
- (
- isAlphanum( $s->{last} )
- && ( isAlphanum( $s->{b} )
- || $s->{b} eq '.' )
- )
- || ( $s->{last} eq '+' && $s->{b} eq '+' )
- || ( $s->{last} eq '-' && $s->{b} eq '-' )
- )
- )
- { # for a situation like 5-/**/-2 or a/**/a
- # When entering this block $s->{a} is whitespace.
- # The comment represented whitespace that cannot be removed. Therefore replace the now gone comment with a whitespace.
- action1($s);
- }
- elsif ( defined( $s->{last} )
- && !isPrefix( $s->{last} ) )
- {
- preserveEndspace($s);
- }
- else {
- skipWhitespace($s);
- }
- }
- }
- else {
- die 'unterminated comment, stopped';
- }
- }
- elsif (
- defined( $s->{lastnws} )
- && ( $s->{lastnws} eq ')'
- || $s->{lastnws} eq ']'
- || $s->{lastnws} eq '.'
- || isAlphanum( $s->{lastnws} ) )
- )
- { # division
- action1($s);
- collapseWhitespace($s);
-
-# don't want a division to become a slash-slash comment with following conditional comment
- onWhitespaceConditionalComment($s)
- ? action1($s)
- : preserveEndspace($s);
- }
- else { # regexp literal
- putLiteral($s);
- collapseWhitespace($s);
-
-# don't want closing delimiter to become a slash-slash comment with following conditional comment
- onWhitespaceConditionalComment($s)
- ? action1($s)
- : preserveEndspace($s);
- }
- }
- elsif ( $s->{a} eq '\'' || $s->{a} eq '"' ) { # string literal
- putLiteral($s);
- preserveEndspace($s);
- }
- elsif ( $s->{a} eq '+' || $s->{a} eq '-' ) { # careful with + + and - -
- action1($s);
- collapseWhitespace($s);
- if ( defined( $s->{a} ) && isWhitespace( $s->{a} ) ) {
- ( defined( $s->{b} ) && $s->{b} eq $s->{last} )
- ? action1($s)
- : preserveEndspace($s);
- }
- }
- elsif ( isAlphanum( $s->{a} ) ) { # keyword, identifiers, numbers
- action1($s);
- collapseWhitespace($s);
- if ( defined( $s->{a} ) && isWhitespace( $s->{a} ) ) {
-
-# if $s->{b} is '.' could be (12 .toString()) which is property invocation. If space removed becomes decimal point and error.
- ( defined( $s->{b} )
- && ( isAlphanum( $s->{b} ) || $s->{b} eq '.' ) )
- ? action1($s)
- : preserveEndspace($s);
- }
- }
- elsif ( $s->{a} eq ']' || $s->{a} eq '}' || $s->{a} eq ')' )
- { # no need to be followed by space but maybe needs following new line
- action1($s);
- preserveEndspace($s);
- }
- elsif ($s->{stripDebug}
- && $s->{a} eq ';'
- && defined( $s->{b} )
- && $s->{b} eq ';'
- && defined( $s->{c} )
- && $s->{c} eq ';' )
- {
- action3($s); # delete one of the semi-colons
- $s->{a} = '/'; # replace the other two semi-colons
- $s->{b} = '/'; # so the remainder of line is removed
- }
- else { # anything else just prints and trailing whitespace discarded
- action1($s);
- skipWhitespace($s);
- }
- }
-
- if ( !defined( $s->{outfile} ) ) {
- return $s->{output};
- }
-
-} # minify()
-
-# -----------------------------------------------------------------------------
-
-1;
-__END__
-
-
-=head1 NAME
-
-JavaScript::Minifier - Perl extension for minifying JavaScript code
-
-
-=head1 SYNOPSIS
-
-To minify a JavaScript file and have the output written directly to another file
-
- use JavaScript::Minifier qw(minify);
- open(INFILE, 'myScript.js') or die;
- open(OUTFILE, '>myScript-min.js') or die;
- minify(input => *INFILE, outfile => *OUTFILE);
- close(INFILE);
- close(OUTFILE);
-
-To minify a JavaScript string literal. Note that by omitting the outfile parameter a the minified code is returned as a string.
-
- my minifiedJavaScript = minify(input => 'var x = 2;');
-
-To include a copyright comment at the top of the minified code.
-
- minify(input => 'var x = 2;', copyright => 'BSD License');
-
-To treat ';;;' as '//' so that debugging code can be removed. This is a common JavaScript convention for minification.
-
- minify(input => 'var x = 2;', stripDebug => 1);
-
-The "input" parameter is manditory. The "output", "copyright", and "stripDebug" parameters are optional and can be used in any combination.
-
-
-=head1 DESCRIPTION
-
-This module removes unnecessary whitespace from JavaScript code. The primary requirement developing this module is to not break working code: if working JavaScript is in input then working JavaScript is output. It is ok if the input has missing semi-colons, snips like '++ +' or '12 .toString()', for example. Internet Explorer conditional comments are copied to the output but the code inside these comments will not be minified.
-
-The ECMAScript specifications allow for many different whitespace characters: space, horizontal tab, vertical tab, new line, carriage return, form feed, and paragraph separator. This module understands all of these as whitespace except for vertical tab and paragraph separator. These two types of whitespace are not minimized.
-
-For static JavaScript files, it is recommended that you minify during the build stage of web deployment. If you minify on-the-fly then it might be a good idea to cache the minified file. Minifying static files on-the-fly repeatedly is wasteful.
-
-
-=head2 EXPORT
-
-None by default.
-
-Exportable on demand: minifiy()
-
-
-=head1 SEE ALSO
-
-This project is developed using an SVN repository. To check out the repository
-svn co http://dev.michaux.ca/svn/random/JavaScript-Minifier
-
-This module is inspired by Douglas Crockford's JSMin:
-http://www.crockford.com/javascript/jsmin.html
-
-You may also be interested in the CSS::Minifier module also available on CPAN.
-
-
-=head1 AUTHORS
-
-Peter Michaux, Epetermichaux@gmail.comE
-Eric Herrera, Eherrera@10east.comE
-
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2007 by Peter Michaux
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.6 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/javascript-indent b/scripts/javascript-indent
deleted file mode 100755
index 22918cd2e..000000000
--- a/scripts/javascript-indent
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl -w
-
-use JavaScript::Beautifier qw/js_beautify/;
-
-unless ( $ARGV[0] and -e $ARGV[0] ) {
- die "Usage $0 ";
-}
-
-open F, $ARGV[0] or die($!);
-my $src;
-while () { $src .= $_; }
-close F;
-
-my @clean = split /\n/, js_beautify( $src, {
- indent_size => 1, indent_character => "\t", preserve_newlines => 1 }
-);
-
-# Clean long lines for tabs
-foreach(@clean){
- if(/\[\s*.{70}/ and /\[\s*(?:['"].*['"],\s*)*\]/) {
- /^(\s*)/;
- my $tab = $1;
- s/(['"])([^"']*)\1(,?)\s*/ $1$2$1$3\n$tab /g;
- }
- $_.="\n";
-}
-
-open F, ">",$ARGV[0] or die($!);
-print F @clean;
-
diff --git a/scripts/minifiercss b/scripts/minifiercss
deleted file mode 100755
index 762991b7f..000000000
--- a/scripts/minifiercss
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl -Iscripts
-
-use CSS::Minifier 'minify';
-
-foreach my $f (@ARGV) {
- unless(-e $f) {
- print STDERR "$f doesn't exists, skipping\n";
- next;
- }
- unless(-w $f) {
- print STDERR "$f is not writeable, skipping\n";
- next;
- }
- my $s='';
- open F, $f;
- $s = minify(input => *F);
- close F;
- open F, ">$f";
- print F $s;
- close F;
-}
diff --git a/scripts/minifierjs b/scripts/minifierjs
deleted file mode 100755
index 431257f32..000000000
--- a/scripts/minifierjs
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl -Iscripts
-
-use JavaScript::Minifier 'minify';
-
-foreach my $f (@ARGV) {
- unless(-e $f) {
- print STDERR "$f doesn't exists, skipping\n";
- next;
- }
- unless(-w $f) {
- print STDERR "$f is not writeable, skipping\n";
- next;
- }
- my $s='';
- open F, $f;
- $s = minify(input => *F);
- close F;
- open F, ">$f";
- print F $s;
- close F;
-}
diff --git a/scripts/transform-templates b/scripts/transform-templates
new file mode 100755
index 000000000..204e7c0b2
--- /dev/null
+++ b/scripts/transform-templates
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+
+use strict;
+
+our $cond = 1;
+our %args;
+for ( my $i = 0 ; $i < @ARGV ; $i += 2 ) {
+ $args{ $ARGV[$i] } =
+ ( $ARGV[ $i + 1 ] and $ARGV[ $i + 1 ] ne 'no' ) ? 1 : 0;
+}
+
+while () {
+ if (m#//endif#) {
+ $cond = 1;
+ }
+ elsif (m#//else#) {
+ $cond = !$cond;
+ }
+ elsif (m#//if:(\w+)#) {
+ $cond = $args{$1};
+ }
+ else {
+ print if ($cond);
+ }
+}