gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-12 17:02:50 +02:00
commit 69033c3bc6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/server_privileges.js
View File

@ -166,7 +166,7 @@ function addUser($form)
/**
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('server_privileges.js', function() {
AJAX.registerTeardown('server_privileges.js', function () {
$("#fieldset_add_user_login input[name='username']").die("focusout");
$("#fieldset_add_user a.ajax").die("click");
$('form[name=usersForm]').unbind('submit');
@ -185,7 +185,7 @@ AJAX.registerOnload('server_privileges.js', function () {
/**
* Display a warning if there is already a user by the name entered as the username.
*/
$("#fieldset_add_user_login input[name='username']").live("focusout", function() {
$("#fieldset_add_user_login input[name='username']").live("focusout", function () {
var username = $(this).val();
var $warning = $("#user_exists_warning");
if ($("#select_pred_username").val() == 'userdefined' && username != '') {
@ -196,7 +196,7 @@ AJAX.registerOnload('server_privileges.js', function () {
'validate_username' : true,
'username' : username
};
$.get(href, params, function(data) {
$.get(href, params, function (data) {
if (data.user_exists) {
$warning.show();
} else {

4
js/tbl_structure.js
View File

@ -54,7 +54,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
/**
*Ajax action for submitting the "Column Change" and "Add Column" form
*/
$(".append_fields_form.ajax").die().live('submit', function(event) {
$(".append_fields_form.ajax").die().live('submit', function (event) {
event.preventDefault();
/**
* @var the_form object referring to the export form
@ -73,7 +73,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
PMA_prepareForAjaxRequest($form);
//User wants to submit the form
$msg = PMA_ajaxShowMessage();
$.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function(data) {
$.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) {
if ($("#sqlqueryresults").length != 0) {
$("#sqlqueryresults").remove();
} else if ($(".error:not(.tab)").length != 0) {