Permalink
Browse files

Activate JUSH before loading databases

  • Loading branch information...
1 parent adae922 commit 147957cef761130759f357e0177be300dfe5f815 @vrana committed Jan 30, 2014
Showing with 33 additions and 28 deletions.
  1. +20 −14 adminer/include/adminer.inc.php
  2. +2 −2 adminer/include/design.inc.php
  3. +11 −9 adminer/static/editing.js
  4. +0 −3 editor/static/editing.js
@@ -761,7 +761,7 @@ function homepage() {
* @return null
*/
function navigation($missing) {
- global $VERSION, $jush, $drivers;
+ global $VERSION, $jush, $drivers, $connection;
?>
<h1>
<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
@@ -787,12 +787,31 @@ function navigation($missing) {
}
}
} else {
+ if ($_GET["ns"] !== "" && !$missing && DB != "") {
+ $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-<?php echo $jush; ?>.js"></script>
+<script type="text/javascript">
+<?php
+ if ($tables) {
+ $links = array();
+ foreach ($tables as $table => $type) {
+ $links[] = preg_quote($table, '/');
+ }
+ echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+ foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
+ echo "jushLinks.$val = jushLinks.$jush;\n";
+ }
+ }
+ ?>
+bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');
+</script>
<?php
}
$this->databasesPrint($missing);
@@ -804,23 +823,10 @@ function navigation($missing) {
}
if ($_GET["ns"] !== "" && !$missing && DB != "") {
echo '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
- $tables = table_status('', true);
if (!$tables) {
echo "<p class='message'>" . lang('No tables.') . "\n";
} else {
$this->tablesPrint($tables);
- if (support("sql")) {
- $links = array();
- foreach ($tables as $table => $type) {
- $links[] = preg_quote($table, '/');
- }
- echo "<script type='text/javascript'>\n";
- echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
- foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
- echo "jushLinks.$val = jushLinks.$jush;\n";
- }
- echo "</script>\n";
- }
}
}
}
@@ -7,7 +7,7 @@
* @return null
*/
function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
- global $LANG, $VERSION, $adminer, $connection, $drivers, $jush;
+ global $LANG, $VERSION, $adminer, $drivers, $jush;
page_headers();
$title_all = $title . ($title2 != "" ? ": $title2" : "");
$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
@@ -29,7 +29,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<?php } ?>
<?php } ?>
-<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$VERSION');"); ?>">
+<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);"<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " onload=\"verifyVersion('$VERSION');\""); ?>>
<script type="text/javascript">
document.body.className = document.body.className.replace(/ nojs/, ' js');
</script>
View
@@ -6,16 +6,18 @@
function bodyLoad(version) {
if (window.jush) {
jush.create_links = ' target="_blank" rel="noreferrer"';
- for (var key in jush.urls) {
- var obj = jush.urls;
- if (typeof obj[key] != 'string') {
- obj = obj[key];
- key = 0;
+ if (version) {
+ for (var key in jush.urls) {
+ var obj = jush.urls;
+ if (typeof obj[key] != 'string') {
+ obj = obj[key];
+ key = 0;
+ }
+ obj[key] = obj[key]
+ .replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
+ .replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
+ ;
}
- obj[key] = obj[key]
- .replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
- .replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
- ;
}
if (window.jushLinks) {
jush.custom_links = jushLinks;
View
@@ -1,8 +1,5 @@
// Editor specific functions
-function bodyLoad(version) {
-}
-
function selectFieldChange(form) {
}

0 comments on commit 147957c

Please sign in to comment.