X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/mediawiki.git/blobdiff_plain/19e297c21b10b1b8a3acad5e73fc71dcb35db44a..6932310fd58ebef145fa01eb76edf7150284d8ea:/maintenance/minify.php?ds=sidebyside diff --git a/maintenance/minify.php b/maintenance/minify.php index 2884fd7b..16e4d1c9 100644 --- a/maintenance/minify.php +++ b/maintenance/minify.php @@ -1,12 +1,35 @@ addOption( 'js-statements-on-own-line', - "Boolean value for putting statements on their own line when minifying JavaScript.", - false, true ); - $this->addOption( 'js-max-line-length', - "Maximum line length for JavaScript minification.", - false, true ); - $this->mDescription = "Minify a file or set of files.\n\n" . + $this->addDescription( "Minify a file or set of files.\n\n" . "If --outfile is not specified, then the output file names will have a .min extension\n" . - "added, e.g. jquery.js -> jquery.min.js."; - + "added, e.g. jquery.js -> jquery.min.js." + ); } public function execute() { @@ -43,6 +60,7 @@ class MinifyScript extends Maintenance { // Minify one file $this->minify( $this->getArg( 0 ), $this->getOption( 'outfile' ) ); + return; } @@ -80,12 +98,11 @@ class MinifyScript extends Maintenance { $this->error( "No file extension, cannot determine type: $fileName" ); exit( 1 ); } + return substr( $fileName, $dotPos + 1 ); } public function minify( $inPath, $outPath ) { - global $wgResourceLoaderMinifierStatementsOnOwnLine, $wgResourceLoaderMinifierMaxLineLength; - $extension = $this->getExtension( $inPath ); $this->output( basename( $inPath ) . ' -> ' . basename( $outPath ) . '...' ); @@ -102,10 +119,7 @@ class MinifyScript extends Maintenance { switch ( $extension ) { case 'js': - $outText = JavaScriptMinifier::minify( $inText, - $this->getOption( 'js-statements-on-own-line', $wgResourceLoaderMinifierStatementsOnOwnLine ), - $this->getOption( 'js-max-line-length', $wgResourceLoaderMinifierMaxLineLength ) - ); + $outText = JavaScriptMinifier::minify( $inText ); break; case 'css': $outText = CSSMin::minify( $inText ); @@ -121,4 +135,4 @@ class MinifyScript extends Maintenance { } $maintClass = 'MinifyScript'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN;