Browse files

Simplify JavaScript

  • Loading branch information...
1 parent 0997455 commit fbc668cfe385330c282042894d2ceaf4b2b13d71 @vrana committed Jan 31, 2011
Showing with 4 additions and 4 deletions.
  1. +2 −2 adminer/include/adminer.inc.php
  2. +1 −1 adminer/static/functions.js
  3. +1 −1 editor/include/adminer.inc.php
View
4 adminer/include/adminer.inc.php
@@ -736,14 +736,14 @@ function navigation($missing) {
}
?>
<input type="hidden" name="token" value="<?php echo $token; ?>">
-<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>">
+<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" onclick="eventStop(event);">
</p>
</form>
<form action="">
<p>
<?php hidden_fields_get(); ?>
<?php echo ($databases ? html_select("db", array("" => "(" . lang('database') . ")") + $databases, DB, "this.form.submit();") : '<input name="db" value="' . h(DB) . '">'); ?>
-<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?> onclick="this.form.submit(); return false;">
+<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?> onclick="eventStop(event);">
<?php
if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
if (support("scheme")) {
View
2 adminer/static/functions.js
@@ -430,7 +430,7 @@ function bodyClick(event, db, ns) {
var match2 = /&ns=([^&]*)/.exec(el.href);
return !(db == (match ? match[1] : '') && ns == (match2 ? match2[1] : '') && ajaxMain(el.href, '', event));
}
- if (/^input$/i.test(el.tagName) && (el.type == 'image' || (el.type == 'submit' && el.name != 'logout' && !/&(database|scheme|create|view|sql|user|dump)=/.test(location.href)))) {
+ if (/^input$/i.test(el.tagName) && (el.type == 'image' || (el.type == 'submit' && !/&(database|scheme|create|view|sql|user|dump)=/.test(location.href)))) {
return !ajaxForm(el.form, (el.name ? encodeURIComponent(el.name) + (el.type == 'image' ? '.x' : '') + '=1' : ''));
}
return true;
View
2 editor/include/adminer.inc.php
@@ -501,7 +501,7 @@ function navigation($missing) {
<form action="" method="post">
<p class="logout">
<input type="hidden" name="token" value="<?php echo $token; ?>">
-<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>">
+<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" onclick="eventStop(event);">
</p>
</form>
<?php

0 comments on commit fbc668c

Please sign in to comment.