Replace JSMin by JsShrink

diff --git a/.gitmodules b/.gitmodules
index afa3554fdce62dad5a2fef13ce557578ec3513d5..9b4770cbcc16ab507ea2e01649e36d540d4665af 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "jush"]
        path = externals/jush
        url = git://jush.git.sourceforge.net/gitroot/jush/jush
-[submodule "jsmin-php"]
-       path = externals/jsmin-php
-       url = git://github.com/rgrove/jsmin-php.git
 [submodule "tinymce"]
        path = externals/tinymce
        url = git://github.com/tinymce/tinymce.git
@@ -16,3 +13,6 @@
 [submodule "wymeditor"]
        path = externals/wymeditor
        url = git://github.com/wymeditor/wymeditor.git
+[submodule "JsShrink"]
+       path = externals/JsShrink
+       url = git://github.com/vrana/JsShrink.git

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index c89feb46c95b25ad9eb62c9dad251dfdadd65a1b..202c0c9cf13f28a18669c6231712a5cef50254f2 100644 (file)
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -9,7 +9,7 @@ if ($_GET["file"] == "favicon.ico") {
        ?>compile_file('../adminer/static/default.css', 'minify_css');<?php
 } elseif ($_GET["file"] == "functions.js") {
        header("Content-Type: text/javascript; charset=utf-8");
-       ?>compile_file('../adminer/static/functions.js', 'JSMin::minify');compile_file('static/editing.js', 'JSMin::minify');<?php
+       ?>compile_file('../adminer/static/functions.js', 'jsShrink');compile_file('static/editing.js', 'jsShrink');<?php
 } else {
        header("Content-Type: image/gif");
        switch ($_GET["file"]) {

diff --git a/changes.txt b/changes.txt
index c23469c9f67968e5efedb38c996a27349cd9ad54..b0250b18cbcf6b90e738607c8fd24cca2122626b 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.4.0-dev:
+Replace JSMin by better JavaScript minifier
 
 Adminer 3.3.4 (released 2012-03-07):
 Foreign keys default actions (bug #3397606)

diff --git a/compile.php b/compile.php
index de9590735647dc66dd1493acee490946e02d6b71..78a7a43074447fa31255cda77352705d5ccd29ea 100644 (file)
--- a/compile.php
+++ b/compile.php
@@ -1,21 +1,11 @@
 <?php
 error_reporting(6135); // errors and warnings
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
-include dirname(__FILE__) . "/externals/jsmin-php/jsmin.php";
+include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";
 
-if (!class_exists("JSMin")) {
-       /** Simple JS minifier without full support for regex literals
-       * @link http://pastebin.com/2Jc2swSr
-       */
-       class JSMin {
-               /*private static*/ function callback($match) {
-                       $s = trim($match[0]);
-                       return ($s === "" ? "\n" : ($s[0] === "/" && ($s[1] === "*" || $s[1] === "/") ? "" : $s));
-               }
-               
-               /*static*/ function minify($input) {
-                       return preg_replace_callback('~//[^\n]*|/\*.*?\*/|/(?!\s)(?:\\\\.|[^/\\\\])*/|\'(?:\\\\.|[^\'\\\\])*\'|"(?:\\\\.|[^"\\\\])*"|\s*[^0-9a-z_$\'"/\s]\s*|\s+~si', array('JSMin', 'callback'), $input);
-               }
+if (!function_exists('jsShrink')) {
+       function jsShrink($code) {
+               return $code;
        }
 }
 

diff --git a/externals/JsShrink b/externals/JsShrink
new file mode 160000 (submodule)
index 0000000..2298c30
--- /dev/null
+++ b/externals/JsShrink
@@ -0,0 +1 @@
+Subproject commit 2298c30f3f1fc35596b18044b5bff2fa4fb513fd

diff --git a/externals/jsmin-php b/externals/jsmin-php
deleted file mode 160000 (submodule)
index 8689392..0000000
--- a/externals/jsmin-php
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8689392dab23d80810a9360e667667c4ddb09579