From 9995e35659e299e8a244e5b93433689ad9e0e8fc Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 7 Jan 2014 13:03:48 -0800
Subject: [PATCH] Update JUSH

---
 adminer/file.inc.php           | 2 +-
 adminer/include/design.inc.php | 1 +
 changes.txt                    | 5 +++--
 compile.php                    | 1 +
 externals/jush                 | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index 75da39d4b..f7654261c 100644
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -15,7 +15,7 @@
 	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"]) {
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 8f4f549c3..cc06c2e41 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -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">
diff --git a/changes.txt b/changes.txt
index 6179ee5c7..6fe9bbd93 100644
--- a/changes.txt
+++ b/changes.txt
@@ -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
diff --git a/compile.php b/compile.php
index d32fef6a7..bbe87b1e3 100755
--- a/compile.php
+++ b/compile.php
@@ -391,6 +391,7 @@ function compile_file($match) {
 }
 $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
diff --git a/externals/jush b/externals/jush
index 6185c4979..6bfc2f2d9 160000
--- a/externals/jush
+++ b/externals/jush
@@ -1 +1 @@
-Subproject commit 6185c4979c7644b69acd9968ab5ea2d67ee7760b
+Subproject commit 6bfc2f2d971d8d0adbad8acfb2ec7c4702eee684