Highlight JSON

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index edd44f99216c01d61cdf0804749cd95c5343b257..1a56103719e85c08e9b17b0108947b2cac84cf9c 100644 (file)
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -19,7 +19,7 @@ if ($_GET["file"] == "favicon.ico") {
        echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
        header("Content-Type: text/javascript; charset=utf-8");
-       echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+       echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
        header("Content-Type: image/gif");
        switch ($_GET["file"]) {

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 7bc51a4d8b04e80b0add4ff3db58bfe2b26e864a..d8a672dd1d756b2754c98b6641deffa79a4175d5 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -243,6 +243,9 @@ focus(document.getElementById('username'));
                if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
                        $return = "<i>" . lang('%d byte(s)', strlen($original)) . "</i>";
                }
+               if (preg_match('~json~', $field["type"])) {
+                       $return = "<code class='jush-js'>$return</code>";
+               }
                return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? " rel='noreferrer'" : "") . ">$return</a>" : $return);
        }
 
@@ -855,11 +858,14 @@ focus(document.getElementById('username'));
                                $connection->select_db(DB);
                                $tables = table_status('', true);
                        }
-                       if (support("sql")) {
-                               ?>
+                       ?>
 <script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-js.js"></script>
+<?php
+                       if (support("sql")) {
+                               ?>
 <script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
 <script type="text/javascript">
 <?php

diff --git a/compile.php b/compile.php
index 4015d7a72720fbe51a6c613e0c9a179e2b8cc3e1..5aa14c2cbdf4c2af47191f3f1e622882833e1dbb 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -378,7 +378,7 @@ if ($driver) {
        if (count($drivers) == 1) {
                $file = str_replace('<?php echo html_select("auth[driver]", $drivers, DRIVER); ?>', "<input type='hidden' name='auth[driver]' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
        }
-       $file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+       $file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
 }
 if ($project == "editor") {
        $file = preg_replace('~;../externals/jush/jush.css~', '', $file);
@@ -396,6 +396,7 @@ if ($_SESSION["lang"]) {
 $file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
 $file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>' . "\n", "", $file);
 $file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>' . "\n", "", $file);
+$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-js.js"></script>' . "\n", "", $file);
 $file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>' . "\n", "", $file);
 $file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files