Update JUSH
This commit is contained in:
parent
f44c8fedf7
commit
9995e35659
|
@ -15,7 +15,7 @@ if ($_GET["file"] == "favicon.ico") {
|
|||
echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
|
||||
} elseif ($_GET["file"] == "functions.js") {
|
||||
header("Content-Type: text/javascript; charset=utf-8");
|
||||
echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js;../externals/jush/modules/jush.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('../adminer/static/functions.js;static/editing.js;../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.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"]) {
|
||||
|
|
|
@ -23,6 +23,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
|
|||
<script type="text/javascript" src="../adminer/static/functions.js"></script>
|
||||
<script type="text/javascript" src="static/editing.js"></script>
|
||||
<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-<?php echo $jush; ?>.js"></script>
|
||||
<?php if ($adminer->head()) { ?>
|
||||
<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
Adminer 4.0.0-dev:
|
||||
Driver for MongoDB, SimpleDB and Elasticsearch
|
||||
Driver for SimpleDB, MongoDB and Elasticsearch
|
||||
Highlight SQL in textareas
|
||||
Save and continue edit by AJAX
|
||||
Split SQL command and import
|
||||
Add a new column in alter table on key press
|
||||
Mark length as required for strings
|
||||
Add label to database selection
|
||||
Add label to database selection, move logout button
|
||||
Add button for dropping an index
|
||||
Display number of selected rows
|
||||
Add links to documentation
|
||||
|
|
|
@ -391,6 +391,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.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-<?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
|
||||
|
|
2
externals/jush
vendored
2
externals/jush
vendored
|
@ -1 +1 @@
|
|||
Subproject commit 6185c4979c7644b69acd9968ab5ea2d67ee7760b
|
||||
Subproject commit 6bfc2f2d971d8d0adbad8acfb2ec7c4702eee684
|
Loading…
Reference in a new issue