]> source.dussan.org Git - nextcloud-server.git/commitdiff
Combine and minimize core and default app js files
authorBart Visscher <bartv@thisnet.nl>
Mon, 14 May 2012 21:15:53 +0000 (23:15 +0200)
committerBart Visscher <bartv@thisnet.nl>
Wed, 16 May 2012 16:53:46 +0000 (18:53 +0200)
3rdparty/mediawiki/JavaScriptMinifier.php [new file with mode: 0644]
core/minimizer.php
core/templates/layout.guest.php
core/templates/layout.user.php
lib/app.php
lib/base.php
lib/minimizer/js.php [new file with mode: 0644]
lib/util.php

diff --git a/3rdparty/mediawiki/JavaScriptMinifier.php b/3rdparty/mediawiki/JavaScriptMinifier.php
new file mode 100644 (file)
index 0000000..db5326c
--- /dev/null
@@ -0,0 +1,606 @@
+<?php
+/**
+ * JavaScript Minifier
+ *
+ * @file
+ * @author Paul Copperman <paul.copperman@gmail.com>
+ * @license Choose any of Apache, MIT, GPL, LGPL
+ */
+
+/**
+ * This class is meant to safely minify javascript code, while leaving syntactically correct
+ * programs intact. Other libraries, such as JSMin require a certain coding style to work
+ * correctly. OTOH, libraries like jsminplus, that do parse the code correctly are rather
+ * slow, because they construct a complete parse tree before outputting the code minified.
+ * So this class is meant to allow arbitrary (but syntactically correct) input, while being
+ * fast enough to be used for on-the-fly minifying.
+ */
+class JavaScriptMinifier {
+
+       /* Class constants */
+       /* Parsing states.
+        * The state machine is only necessary to decide whether to parse a slash as division
+        * operator or as regexp literal.
+        * States are named after the next expected item. We only distinguish states when the
+        * distinction is relevant for our purpose.
+        */
+       const STATEMENT                = 0;
+       const CONDITION                = 1;
+       const PROPERTY_ASSIGNMENT      = 2;
+       const EXPRESSION               = 3;
+       const EXPRESSION_NO_NL         = 4; // only relevant for semicolon insertion
+       const EXPRESSION_OP            = 5;
+       const EXPRESSION_FUNC          = 6;
+       const EXPRESSION_TERNARY       = 7; // used to determine the role of a colon
+       const EXPRESSION_TERNARY_OP    = 8;
+       const EXPRESSION_TERNARY_FUNC  = 9;
+       const PAREN_EXPRESSION         = 10; // expression which is not on the top level
+       const PAREN_EXPRESSION_OP      = 11;
+       const PAREN_EXPRESSION_FUNC    = 12;
+       const PROPERTY_EXPRESSION      = 13; // expression which is within an object literal
+       const PROPERTY_EXPRESSION_OP   = 14;
+       const PROPERTY_EXPRESSION_FUNC = 15;
+
+       /* Token types */
+       const TYPE_UN_OP       = 1; // unary operators
+       const TYPE_INCR_OP     = 2; // ++ and --
+       const TYPE_BIN_OP      = 3; // binary operators
+       const TYPE_ADD_OP      = 4; // + and - which can be either unary or binary ops
+       const TYPE_HOOK        = 5; // ?
+       const TYPE_COLON       = 6; // :
+       const TYPE_COMMA       = 7; // ,
+       const TYPE_SEMICOLON   = 8; // ;
+       const TYPE_BRACE_OPEN  = 9; // {
+       const TYPE_BRACE_CLOSE = 10; // }
+       const TYPE_PAREN_OPEN  = 11; // ( and [
+       const TYPE_PAREN_CLOSE = 12; // ) and ]
+       const TYPE_RETURN      = 13; // keywords: break, continue, return, throw
+       const TYPE_IF          = 14; // keywords: catch, for, with, switch, while, if
+       const TYPE_DO          = 15; // keywords: case, var, finally, else, do, try
+       const TYPE_FUNC        = 16; // keywords: function
+       const TYPE_LITERAL     = 17; // all literals, identifiers and unrecognised tokens
+
+       // Sanity limit to avoid excessive memory usage
+       const STACK_LIMIT = 1000;
+
+       /* Static functions */
+
+       /**
+        * Returns minified JavaScript code.
+        *
+        * NOTE: $maxLineLength isn't a strict maximum. Longer lines will be produced when
+        *       literals (e.g. quoted strings) longer than $maxLineLength are encountered
+        *       or when required to guard against semicolon insertion.
+        *
+        * @param $s String JavaScript code to minify
+        * @param $statementsOnOwnLine Bool Whether to put each statement on its own line
+        * @param $maxLineLength Int Maximum length of a single line, or -1 for no maximum.
+        * @return String Minified code
+        */
+       public static function minify( $s, $statementsOnOwnLine = false, $maxLineLength = 1000 ) {
+               // First we declare a few tables that contain our parsing rules
+
+               // $opChars : characters, which can be combined without whitespace in between them
+               $opChars = array(
+                       '!' => true,
+                       '"' => true,
+                       '%' => true,
+                       '&' => true,
+                       "'" => true,
+                       '(' => true,
+                       ')' => true,
+                       '*' => true,
+                       '+' => true,
+                       ',' => true,
+                       '-' => true,
+                       '.' => true,
+                       '/' => true,
+                       ':' => true,
+                       ';' => true,
+                       '<' => true,
+                       '=' => true,
+                       '>' => true,
+                       '?' => true,
+                       '[' => true,
+                       ']' => true,
+                       '^' => true,
+                       '{' => true,
+                       '|' => true,
+                       '}' => true,
+                       '~' => true
+               );
+
+               // $tokenTypes : maps keywords and operators to their corresponding token type
+               $tokenTypes = array(
+                       '!'          => self::TYPE_UN_OP,
+                       '~'          => self::TYPE_UN_OP,
+                       'delete'     => self::TYPE_UN_OP,
+                       'new'        => self::TYPE_UN_OP,
+                       'typeof'     => self::TYPE_UN_OP,
+                       'void'       => self::TYPE_UN_OP,
+                       '++'         => self::TYPE_INCR_OP,
+                       '--'         => self::TYPE_INCR_OP,
+                       '!='         => self::TYPE_BIN_OP,
+                       '!=='        => self::TYPE_BIN_OP,
+                       '%'          => self::TYPE_BIN_OP,
+                       '%='         => self::TYPE_BIN_OP,
+                       '&'          => self::TYPE_BIN_OP,
+                       '&&'         => self::TYPE_BIN_OP,
+                       '&='         => self::TYPE_BIN_OP,
+                       '*'          => self::TYPE_BIN_OP,
+                       '*='         => self::TYPE_BIN_OP,
+                       '+='         => self::TYPE_BIN_OP,
+                       '-='         => self::TYPE_BIN_OP,
+                       '.'          => self::TYPE_BIN_OP,
+                       '/'          => self::TYPE_BIN_OP,
+                       '/='         => self::TYPE_BIN_OP,
+                       '<'          => self::TYPE_BIN_OP,
+                       '<<'         => self::TYPE_BIN_OP,
+                       '<<='        => self::TYPE_BIN_OP,
+                       '<='         => self::TYPE_BIN_OP,
+                       '='          => self::TYPE_BIN_OP,
+                       '=='         => self::TYPE_BIN_OP,
+                       '==='        => self::TYPE_BIN_OP,
+                       '>'          => self::TYPE_BIN_OP,
+                       '>='         => self::TYPE_BIN_OP,
+                       '>>'         => self::TYPE_BIN_OP,
+                       '>>='        => self::TYPE_BIN_OP,
+                       '>>>'        => self::TYPE_BIN_OP,
+                       '>>>='       => self::TYPE_BIN_OP,
+                       '^'          => self::TYPE_BIN_OP,
+                       '^='         => self::TYPE_BIN_OP,
+                       '|'          => self::TYPE_BIN_OP,
+                       '|='         => self::TYPE_BIN_OP,
+                       '||'         => self::TYPE_BIN_OP,
+                       'in'         => self::TYPE_BIN_OP,
+                       'instanceof' => self::TYPE_BIN_OP,
+                       '+'          => self::TYPE_ADD_OP,
+                       '-'          => self::TYPE_ADD_OP,
+                       '?'          => self::TYPE_HOOK,
+                       ':'          => self::TYPE_COLON,
+                       ','          => self::TYPE_COMMA,
+                       ';'          => self::TYPE_SEMICOLON,
+                       '{'          => self::TYPE_BRACE_OPEN,
+                       '}'          => self::TYPE_BRACE_CLOSE,
+                       '('          => self::TYPE_PAREN_OPEN,
+                       '['          => self::TYPE_PAREN_OPEN,
+                       ')'          => self::TYPE_PAREN_CLOSE,
+                       ']'          => self::TYPE_PAREN_CLOSE,
+                       'break'      => self::TYPE_RETURN,
+                       'continue'   => self::TYPE_RETURN,
+                       'return'     => self::TYPE_RETURN,
+                       'throw'      => self::TYPE_RETURN,
+                       'catch'      => self::TYPE_IF,
+                       'for'        => self::TYPE_IF,
+                       'if'         => self::TYPE_IF,
+                       'switch'     => self::TYPE_IF,
+                       'while'      => self::TYPE_IF,
+                       'with'       => self::TYPE_IF,
+                       'case'       => self::TYPE_DO,
+                       'do'         => self::TYPE_DO,
+                       'else'       => self::TYPE_DO,
+                       'finally'    => self::TYPE_DO,
+                       'try'        => self::TYPE_DO,
+                       'var'        => self::TYPE_DO,
+                       'function'   => self::TYPE_FUNC
+               );
+
+               // $goto : This is the main table for our state machine. For every state/token pair
+               //         the following state is defined. When no rule exists for a given pair,
+               //         the state is left unchanged.
+               $goto = array(
+                       self::STATEMENT => array(
+                               self::TYPE_UN_OP      => self::EXPRESSION,
+                               self::TYPE_INCR_OP    => self::EXPRESSION,
+                               self::TYPE_ADD_OP     => self::EXPRESSION,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+                               self::TYPE_RETURN     => self::EXPRESSION_NO_NL,
+                               self::TYPE_IF         => self::CONDITION,
+                               self::TYPE_FUNC       => self::CONDITION,
+                               self::TYPE_LITERAL    => self::EXPRESSION_OP
+                       ),
+                       self::CONDITION => array(
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+                       ),
+                       self::PROPERTY_ASSIGNMENT => array(
+                               self::TYPE_COLON      => self::PROPERTY_EXPRESSION,
+                               self::TYPE_BRACE_OPEN => self::STATEMENT
+                       ),
+                       self::EXPRESSION => array(
+                               self::TYPE_SEMICOLON  => self::STATEMENT,
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+                               self::TYPE_FUNC       => self::EXPRESSION_FUNC,
+                               self::TYPE_LITERAL    => self::EXPRESSION_OP
+                       ),
+                       self::EXPRESSION_NO_NL => array(
+                               self::TYPE_SEMICOLON  => self::STATEMENT,
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+                               self::TYPE_FUNC       => self::EXPRESSION_FUNC,
+                               self::TYPE_LITERAL    => self::EXPRESSION_OP
+                       ),
+                       self::EXPRESSION_OP => array(
+                               self::TYPE_BIN_OP     => self::EXPRESSION,
+                               self::TYPE_ADD_OP     => self::EXPRESSION,
+                               self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+                               self::TYPE_COLON      => self::STATEMENT,
+                               self::TYPE_COMMA      => self::EXPRESSION,
+                               self::TYPE_SEMICOLON  => self::STATEMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+                       ),
+                       self::EXPRESSION_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::STATEMENT
+                       ),
+                       self::EXPRESSION_TERNARY => array(
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+                               self::TYPE_FUNC       => self::EXPRESSION_TERNARY_FUNC,
+                               self::TYPE_LITERAL    => self::EXPRESSION_TERNARY_OP
+                       ),
+                       self::EXPRESSION_TERNARY_OP => array(
+                               self::TYPE_BIN_OP     => self::EXPRESSION_TERNARY,
+                               self::TYPE_ADD_OP     => self::EXPRESSION_TERNARY,
+                               self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+                               self::TYPE_COMMA      => self::EXPRESSION_TERNARY,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+                       ),
+                       self::EXPRESSION_TERNARY_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::STATEMENT
+                       ),
+                       self::PAREN_EXPRESSION => array(
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+                               self::TYPE_FUNC       => self::PAREN_EXPRESSION_FUNC,
+                               self::TYPE_LITERAL    => self::PAREN_EXPRESSION_OP
+                       ),
+                       self::PAREN_EXPRESSION_OP => array(
+                               self::TYPE_BIN_OP     => self::PAREN_EXPRESSION,
+                               self::TYPE_ADD_OP     => self::PAREN_EXPRESSION,
+                               self::TYPE_HOOK       => self::PAREN_EXPRESSION,
+                               self::TYPE_COLON      => self::PAREN_EXPRESSION,
+                               self::TYPE_COMMA      => self::PAREN_EXPRESSION,
+                               self::TYPE_SEMICOLON  => self::PAREN_EXPRESSION,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+                       ),
+                       self::PAREN_EXPRESSION_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::STATEMENT
+                       ),
+                       self::PROPERTY_EXPRESSION => array(
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+                               self::TYPE_FUNC       => self::PROPERTY_EXPRESSION_FUNC,
+                               self::TYPE_LITERAL    => self::PROPERTY_EXPRESSION_OP
+                       ),
+                       self::PROPERTY_EXPRESSION_OP => array(
+                               self::TYPE_BIN_OP     => self::PROPERTY_EXPRESSION,
+                               self::TYPE_ADD_OP     => self::PROPERTY_EXPRESSION,
+                               self::TYPE_HOOK       => self::PROPERTY_EXPRESSION,
+                               self::TYPE_COMMA      => self::PROPERTY_ASSIGNMENT,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+                       ),
+                       self::PROPERTY_EXPRESSION_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::STATEMENT
+                       )
+               );
+
+               // $push : This table contains the rules for when to push a state onto the stack.
+               //         The pushed state is the state to return to when the corresponding
+               //         closing token is found
+               $push = array(
+                       self::STATEMENT => array(
+                               self::TYPE_BRACE_OPEN => self::STATEMENT,
+                               self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+                       ),
+                       self::CONDITION => array(
+                               self::TYPE_PAREN_OPEN => self::STATEMENT
+                       ),
+                       self::PROPERTY_ASSIGNMENT => array(
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT
+                       ),
+                       self::EXPRESSION => array(
+                               self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
+                               self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+                       ),
+                       self::EXPRESSION_NO_NL => array(
+                               self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
+                               self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+                       ),
+                       self::EXPRESSION_OP => array(
+                               self::TYPE_HOOK       => self::EXPRESSION,
+                               self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+                       ),
+                       self::EXPRESSION_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::EXPRESSION_OP
+                       ),
+                       self::EXPRESSION_TERNARY => array(
+                               self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP,
+                               self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
+                       ),
+                       self::EXPRESSION_TERNARY_OP => array(
+                               self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+                               self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
+                       ),
+                       self::EXPRESSION_TERNARY_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP
+                       ),
+                       self::PAREN_EXPRESSION => array(
+                               self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP,
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
+                       ),
+                       self::PAREN_EXPRESSION_OP => array(
+                               self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
+                       ),
+                       self::PAREN_EXPRESSION_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP
+                       ),
+                       self::PROPERTY_EXPRESSION => array(
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP,
+                               self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
+                       ),
+                       self::PROPERTY_EXPRESSION_OP => array(
+                               self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
+                       ),
+                       self::PROPERTY_EXPRESSION_FUNC => array(
+                               self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP
+                       )
+               );
+
+               // $pop : Rules for when to pop a state from the stack
+               $pop = array(
+                       self::STATEMENT              => array( self::TYPE_BRACE_CLOSE => true ),
+                       self::PROPERTY_ASSIGNMENT    => array( self::TYPE_BRACE_CLOSE => true ),
+                       self::EXPRESSION             => array( self::TYPE_BRACE_CLOSE => true ),
+                       self::EXPRESSION_NO_NL       => array( self::TYPE_BRACE_CLOSE => true ),
+                       self::EXPRESSION_OP          => array( self::TYPE_BRACE_CLOSE => true ),
+                       self::EXPRESSION_TERNARY_OP  => array( self::TYPE_COLON       => true ),
+                       self::PAREN_EXPRESSION       => array( self::TYPE_PAREN_CLOSE => true ),
+                       self::PAREN_EXPRESSION_OP    => array( self::TYPE_PAREN_CLOSE => true ),
+                       self::PROPERTY_EXPRESSION    => array( self::TYPE_BRACE_CLOSE => true ),
+                       self::PROPERTY_EXPRESSION_OP => array( self::TYPE_BRACE_CLOSE => true )
+               );
+
+               // $semicolon : Rules for when a semicolon insertion is appropriate
+               $semicolon = array(
+                       self::EXPRESSION_NO_NL => array(
+                               self::TYPE_UN_OP      => true,
+                               self::TYPE_INCR_OP    => true,
+                               self::TYPE_ADD_OP     => true,
+                               self::TYPE_BRACE_OPEN => true,
+                               self::TYPE_PAREN_OPEN => true,
+                               self::TYPE_RETURN     => true,
+                               self::TYPE_IF         => true,
+                               self::TYPE_DO         => true,
+                               self::TYPE_FUNC       => true,
+                               self::TYPE_LITERAL    => true
+                       ),
+                       self::EXPRESSION_OP => array(
+                               self::TYPE_UN_OP      => true,
+                               self::TYPE_INCR_OP    => true,
+                               self::TYPE_BRACE_OPEN => true,
+                               self::TYPE_RETURN     => true,
+                               self::TYPE_IF         => true,
+                               self::TYPE_DO         => true,
+                               self::TYPE_FUNC       => true,
+                               self::TYPE_LITERAL    => true
+                       )
+               );
+
+               // Rules for when newlines should be inserted if
+               // $statementsOnOwnLine is enabled.
+               // $newlineBefore is checked before switching state,
+               // $newlineAfter is checked after
+               $newlineBefore = array(
+                       self::STATEMENT => array(
+                               self::TYPE_BRACE_CLOSE => true,
+                       ),
+               );
+               $newlineAfter = array(
+                       self::STATEMENT => array(
+                               self::TYPE_BRACE_OPEN => true,
+                               self::TYPE_PAREN_CLOSE => true,
+                               self::TYPE_SEMICOLON => true,
+                       ),
+               );
+
+               // $divStates : Contains all states that can be followed by a division operator
+               $divStates = array(
+                       self::EXPRESSION_OP          => true,
+                       self::EXPRESSION_TERNARY_OP  => true,
+                       self::PAREN_EXPRESSION_OP    => true,
+                       self::PROPERTY_EXPRESSION_OP => true
+               );
+
+               // Here's where the minifying takes place: Loop through the input, looking for tokens
+               // and output them to $out, taking actions to the above defined rules when appropriate.
+               $out = '';
+               $pos = 0;
+               $length = strlen( $s );
+               $lineLength = 0;
+               $newlineFound = true;
+               $state = self::STATEMENT;
+               $stack = array();
+               $last = ';'; // Pretend that we have seen a semicolon yet
+               while( $pos < $length ) {
+                       // First, skip over any whitespace and multiline comments, recording whether we
+                       // found any newline character
+                       $skip = strspn( $s, " \t\n\r\xb\xc", $pos );
+                       if( !$skip ) {
+                               $ch = $s[$pos];
+                               if( $ch === '/' && substr( $s, $pos, 2 ) === '/*' ) {
+                                       // Multiline comment. Search for the end token or EOT.
+                                       $end = strpos( $s, '*/', $pos + 2 );
+                                       $skip = $end === false ? $length - $pos : $end - $pos + 2;
+                               }
+                       }
+                       if( $skip ) {
+                               // The semicolon insertion mechanism needs to know whether there was a newline
+                               // between two tokens, so record it now.
+                               if( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip ) {
+                                       $newlineFound = true;
+                               }
+                               $pos += $skip;
+                               continue;
+                       }
+                       // Handle C++-style comments and html comments, which are treated as single line
+                       // comments by the browser, regardless of whether the end tag is on the same line.
+                       // Handle --> the same way, but only if it's at the beginning of the line
+                       if( ( $ch === '/' && substr( $s, $pos, 2 ) === '//' )
+                               || ( $ch === '<' && substr( $s, $pos, 4 ) === '<!--' )
+                               || ( $ch === '-' && $newlineFound && substr( $s, $pos, 3 ) === '-->' )
+                       ) {
+                               $pos += strcspn( $s, "\r\n", $pos );
+                               continue;
+                       }
+
+                       // Find out which kind of token we're handling. $end will point past the end of it.
+                       $end = $pos + 1;
+                       // Handle string literals
+                       if( $ch === "'" || $ch === '"' ) {
+                               // Search to the end of the string literal, skipping over backslash escapes
+                               $search = $ch . '\\';
+                               do{
+                                       $end += strcspn( $s, $search, $end ) + 2;
+                               } while( $end - 2 < $length && $s[$end - 2] === '\\' );
+                               $end--;
+                       // We have to distinguish between regexp literals and division operators
+                       // A division operator is only possible in certain states
+                       } elseif( $ch === '/' && !isset( $divStates[$state] ) ) {
+                               // Regexp literal, search to the end, skipping over backslash escapes and
+                               // character classes
+                               for( ; ; ) {
+                                       do{
+                                               $end += strcspn( $s, '/[\\', $end ) + 2;
+                                       } while( $end - 2 < $length && $s[$end - 2] === '\\' );
+                                       $end--;
+                                       if( $end - 1 >= $length || $s[$end - 1] === '/' ) {
+                                               break;
+                                       }
+                                       do{
+                                               $end += strcspn( $s, ']\\', $end ) + 2;
+                                       } while( $end - 2 < $length && $s[$end - 2] === '\\' );
+                                       $end--;
+                               };
+                               // Search past the regexp modifiers (gi)
+                               while( $end < $length && ctype_alpha( $s[$end] ) ) {
+                                       $end++;
+                               }
+                       } elseif(
+                               $ch === '0'
+                               && ($pos + 1 < $length) && ($s[$pos + 1] === 'x' || $s[$pos + 1] === 'X' )
+                       ) {
+                               // Hex numeric literal
+                               $end++; // x or X
+                               $len = strspn( $s, '0123456789ABCDEFabcdef', $end );
+                               if ( !$len ) {
+                                       return self::parseError($s, $pos, 'Expected a hexadecimal number but found ' . substr( $s, $pos, 5 ) . '...' );
+                               }
+                               $end += $len;
+                       } elseif(
+                               ctype_digit( $ch )
+                               || ( $ch === '.' && $pos + 1 < $length && ctype_digit( $s[$pos + 1] ) )
+                       ) {
+                               $end += strspn( $s, '0123456789', $end );
+                               $decimal = strspn( $s, '.', $end );
+                               if ($decimal) {
+                                       if ( $decimal > 2 ) {
+                                               return self::parseError($s, $end, 'The number has too many decimal points' );
+                                       }
+                                       $end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
+                               }
+                               $exponent = strspn( $s, 'eE', $end );
+                               if( $exponent ) {
+                                       if ( $exponent > 1 ) {
+                                               return self::parseError($s, $end, 'Number with several E' );
+                                       }
+                                       $end++;
+
+                                       // + sign is optional; - sign is required.
+                                       $end += strspn( $s, '-+', $end );
+                                       $len = strspn( $s, '0123456789', $end );
+                                       if ( !$len ) {
+                                               return self::parseError($s, $pos, 'No decimal digits after e, how many zeroes should be added?' );
+                                       }
+                                       $end += $len;
+                               }
+                       } elseif( isset( $opChars[$ch] ) ) {
+                               // Punctuation character. Search for the longest matching operator.
+                               while(
+                                       $end < $length
+                                       && isset( $tokenTypes[substr( $s, $pos, $end - $pos + 1 )] )
+                               ) {
+                                       $end++;
+                               }
+                       } else {
+                               // Identifier or reserved word. Search for the end by excluding whitespace and
+                               // punctuation.
+                               $end += strcspn( $s, " \t\n.;,=<>+-{}()[]?:*/%'\"!&|^~\xb\xc\r", $end );
+                       }
+
+                       // Now get the token type from our type array
+                       $token = substr( $s, $pos, $end - $pos ); // so $end - $pos == strlen( $token )
+                       $type = isset( $tokenTypes[$token] ) ? $tokenTypes[$token] : self::TYPE_LITERAL;
+
+                       if( $newlineFound && isset( $semicolon[$state][$type] ) ) {
+                               // This token triggers the semicolon insertion mechanism of javascript. While we
+                               // could add the ; token here ourselves, keeping the newline has a few advantages.
+                               $out .= "\n";
+                               $state = self::STATEMENT;
+                               $lineLength = 0;
+                       } elseif( $maxLineLength > 0 && $lineLength + $end - $pos > $maxLineLength &&
+                                       !isset( $semicolon[$state][$type] ) && $type !== self::TYPE_INCR_OP )
+                       {
+                               // This line would get too long if we added $token, so add a newline first.
+                               // Only do this if it won't trigger semicolon insertion and if it won't
+                               // put a postfix increment operator on its own line, which is illegal in js.
+                               $out .= "\n";
+                               $lineLength = 0;
+                       // Check, whether we have to separate the token from the last one with whitespace
+                       } elseif( !isset( $opChars[$last] ) && !isset( $opChars[$ch] ) ) {
+                               $out .= ' ';
+                               $lineLength++;
+                       // Don't accidentally create ++, -- or // tokens
+                       } elseif( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) ) {
+                               $out .= ' ';
+                               $lineLength++;
+                       }
+
+                       $out .= $token;
+                       $lineLength += $end - $pos; // += strlen( $token )
+                       $last = $s[$end - 1];
+                       $pos = $end;
+                       $newlineFound = false;
+
+                       // Output a newline after the token if required
+                       // This is checked before AND after switching state
+                       $newlineAdded = false;
+                       if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineBefore[$state][$type] ) ) {
+                               $out .= "\n";
+                               $lineLength = 0;
+                               $newlineAdded = true;
+                       }
+
+                       // Now that we have output our token, transition into the new state.
+                       if( isset( $push[$state][$type] ) && count( $stack ) < self::STACK_LIMIT ) {
+                               $stack[] = $push[$state][$type];
+                       }
+                       if( $stack && isset( $pop[$state][$type] ) ) {
+                               $state = array_pop( $stack );
+                       } elseif( isset( $goto[$state][$type] ) ) {
+                               $state = $goto[$state][$type];
+                       }
+
+                       // Check for newline insertion again
+                       if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineAfter[$state][$type] ) ) {
+                               $out .= "\n";
+                               $lineLength = 0;
+                       }
+               }
+               return $out;
+       }
+
+       static function parseError($fullJavascript, $position, $errorMsg) {
+               // TODO: Handle the error: trigger_error, throw exception, return false...
+               return false;
+       }
+}
index e4e6ff50e66e2a95060d11af7bb57b0447cb14d2..e5703053024c04688e1c5c0c1deaa30ae70c63b6 100644 (file)
@@ -1,5 +1,12 @@
 <?php
 
-$minimizer = new OC_Minimizer_CSS();
-$files = $minimizer->findFiles(OC_Util::$core_styles);
-$minimizer->output($files);
+if ($service == 'core.css'){
+       $minimizer = new OC_Minimizer_CSS();
+       $files = $minimizer->findFiles(OC_Util::$core_styles);
+       $minimizer->output($files);
+}
+else if ($service == 'core.js'){
+       $minimizer = new OC_Minimizer_JS();
+       $files = $minimizer->findFiles(OC_Util::$core_scripts);
+       $minimizer->output($files);
+}
index 37a74f469687b85972b4185e1362f1195fdad4a8..84422a10b1828a88dda87680a1b943a8d0d4387a 100644 (file)
@@ -15,6 +15,9 @@
                        var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
                        var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
                </script>
+               <?php if (!defined('DEBUG') || !DEBUG): ?>
+               <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+               <?php endif ?>
                <?php foreach($_['jsfiles'] as $jsfile): ?>
                        <script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
                <?php endforeach; ?>
index e6fa910ce040c015ff19a85ce49c2f0eb0689ed8..03b07c07283532ba5294bcb14601533bc4667c3a 100644 (file)
@@ -15,6 +15,9 @@
                        var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
                        var oc_current_user = '<?php echo OC_User::getUser() ?>';
                </script>
+               <?php if (!defined('DEBUG') || !DEBUG): ?>
+               <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+               <?php endif ?>
                <?php foreach($_['jsfiles'] as $jsfile): ?>
                        <script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
                <?php endforeach; ?>
index 39e90ada019c839ce90d61b57f8b5a21a7a98013..8bd095d8c6c3210078f71d81b5ef508afc3bb493 100644 (file)
@@ -75,6 +75,8 @@ class OC_App{
 
                if (!defined('DEBUG') || !DEBUG){
                        if (is_null($types)) {
+                               OC_Util::$core_scripts = OC_Util::$scripts;
+                               OC_Util::$scripts = array();
                                OC_Util::$core_styles = OC_Util::$styles;
                                OC_Util::$styles = array();
                        }
index 673a47ba450455453b0bfa3814d996f0ab31365e..1b3554a42a9c367ae73eab447d6dbbaeb5345959 100644 (file)
@@ -231,6 +231,7 @@ class OC{
                        }
 
                        OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+                       OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
 
                        OC_App::updateApps();
                }
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
new file mode 100644 (file)
index 0000000..4ddaa79
--- /dev/null
@@ -0,0 +1,62 @@
+<?php
+
+require_once('mediawiki/JavaScriptMinifier.php');
+
+class OC_Minimizer_JS extends OC_Minimizer
+{
+       protected $contentType = 'application/javascript';
+
+       public function findFiles($scripts) {
+               // Read the selected theme from the config file
+               $theme=OC_Config::getValue( "theme" );
+
+               // Read the detected formfactor and use the right file name.
+               $fext = OC_Template::getFormFactorExtension();
+               // Add the core js files or the js files provided by the selected theme
+               foreach($scripts as $script){
+                       // Is it in 3rd party?
+                       if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+
+                       // Is it in apps and overwritten by the theme?
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
+
+                       // Is it part of an app?
+                       }elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
+                       }elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
+
+                       // Is it in the owncloud root but overwritten by the theme?
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
+
+                       // Is it in the owncloud root ?
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
+
+                       // Is in core but overwritten by a theme?
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
+
+                       // Is it in core?
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
+                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
+
+                       }else{
+                               echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+                               die();
+                       }
+               }
+               return $this->files;
+       }
+
+       public function minimizeFiles($files) {
+               $js_out = '';
+               foreach($files as $file_info) {
+                       $file = $file_info[0] . '/' . $file_info[2];
+                       $js_out .= '/* ' . $file . ' */' . "\n";
+                       $js_out .= file_get_contents($file);
+               }
+               $js_out = JavaScriptMinifier::minify($js_out);
+               return $js_out;
+       }
+}
index c7a5a9cfd68cddb5960371240dc6b047f5614e36..95b5f8df3db37e2dc8abe8918b1e656c31740e09 100644 (file)
@@ -11,6 +11,7 @@ class OC_Util {
        private static $rootMounted=false;
        private static $fsSetup=false;
        public static $core_styles=array();
+       public static $core_scripts=array();
 
        // Can be set up
        public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration