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:
Pootle server 2011-11-28 16:40:11 +01:00
commit 2185d39b3e
12 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/db_operations.js
View File

@ -73,7 +73,7 @@ $(document).ready(function() {
}) //end dialog options
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.get()
})
@ -139,7 +139,7 @@ $(document).ready(function() {
PMA_ajaxShowMessage(data.message);
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.get()
}) // end change charset

10
js/db_structure.js
View File

@ -139,7 +139,7 @@ $(document).ready(function() {
if(data.success == true) {
PMA_ajaxShowMessage(data.message);
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
if ($("#insert_table_dialog").length > 0) {
$("#insert_table_dialog").dialog("close").remove();
@ -175,7 +175,7 @@ $(document).ready(function() {
}
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
if ($("#insert_table_dialog").length > 0) {
$("#insert_table_dialog").dialog("close").remove();
@ -228,7 +228,7 @@ $(document).ready(function() {
.replaceWith(span)
.removeClass('truncate_table_anchor');
} else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
}) // end $.get()
}) //end $.PMA_confirm()
@ -274,7 +274,7 @@ $(document).ready(function() {
window.parent.frame_navigation.location.reload();
}
} else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
}); // end $.get()
}); // end $.PMA_confirm()
@ -311,7 +311,7 @@ $(document).ready(function() {
$(curr_tracking_row).hide("medium").remove();
}
else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
}) // end $.get()
}) // end $.PMA_confirm()

18
js/functions.js
View File

@ -2034,8 +2034,6 @@ $(document).ready(function() {
/**
* Attach event handler to the submit action of the create table minimal form
* and retrieve the full table form and display it in a dialog
*
* @uses PMA_ajaxShowMessage()
*/
$("#create_table_form_minimal.ajax").live('submit', function(event) {
event.preventDefault();
@ -2255,7 +2253,7 @@ $(document).ready(function() {
} else {
var $temp_div = $("<div id='temp_div'><div>").append(data);
var $error = $temp_div.find(".error code").addClass("error");
PMA_ajaxShowMessage($error);
PMA_ajaxShowMessage($error, false);
}
}) // end $.post()
} else {
@ -2299,7 +2297,7 @@ $(document).ready(function() {
var $temp_div = $("<div id='temp_div'></div>")
$temp_div.html(data.error);
var $error = $temp_div.find("code").addClass("error");
PMA_ajaxShowMessage($error);
PMA_ajaxShowMessage($error, false);
}
}) // end $.post()
});//end of alterTableOrderby ajax submit
@ -2341,7 +2339,7 @@ $(document).ready(function() {
var $temp_div = $("<div id='temp_div'></div>");
$temp_div.html(data.error);
var $error = $temp_div.find("code").addClass("error");
PMA_ajaxShowMessage($error);
PMA_ajaxShowMessage($error, false);
}
}) // end $.post()
}
@ -2380,7 +2378,7 @@ $(document).ready(function() {
var $temp_div = $("<div id='temp_div'></div>");
$temp_div.html(data.error);
var $error = $temp_div.find("code").addClass("error");
PMA_ajaxShowMessage($error);
PMA_ajaxShowMessage($error, false);
}
}) // end $.post()
});//end of table maintanance ajax click
@ -2459,7 +2457,7 @@ $(document).ready(function() {
}
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.post()
}) // end $().live()
@ -2533,7 +2531,7 @@ $(document).ready(function() {
PMA_ajaxRemoveMessage($msgbox);
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.post()
}) // end handler for Change Password form submission
@ -3220,7 +3218,7 @@ var toggleButton = function ($obj) {
});
eval(callback);
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
$container.removeClass('isActive');
}
});
@ -3497,7 +3495,7 @@ $(document).ready(function() {
var $temp_div = $("<div id='temp_div'></div>")
$temp_div.html(data.error);
var $error = $temp_div.find("code").addClass("error");
PMA_ajaxShowMessage($error);
PMA_ajaxShowMessage($error, false);
}
}) // end $.get()
}); // end $.PMA_confirm()

8
js/gis_data_editor.js
View File

@ -151,7 +151,7 @@ function loadGISEditor(value, field, type, input_name, token) {
initGISEditorVisualization();
prepareJSVersion();
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}, 'json');
}
@ -196,7 +196,7 @@ function insertDataAndClose() {
if(data.success == true) {
$("input[name='" + input_name + "']").val(data.result);
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}, 'json');
closeGISEditor();
@ -236,7 +236,7 @@ $(document).ready(function() {
eval(data.openLayers);
initGISEditorVisualization();
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}, 'json');
});
@ -254,7 +254,7 @@ $(document).ready(function() {
initGISEditorVisualization();
prepareJSVersion();
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}, 'json');
});

6
js/makegrid.js
View File

@ -386,7 +386,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
var $temp_div = $(document.createElement('div'));
$temp_div.html(data.error);
$temp_div.addClass("error");
PMA_ajaxShowMessage($temp_div);
PMA_ajaxShowMessage($temp_div, false);
}
});
}
@ -937,7 +937,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}); // end $.post()
$editArea.show();
@ -1241,7 +1241,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.isCellEdited = false;
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}
}); // end $.ajax()

8
js/server_privileges.js
View File

@ -239,7 +239,7 @@ $(document).ready(function() {
appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string);
}
} else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, "7000");
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
})
};
@ -287,7 +287,7 @@ $(document).ready(function() {
PMA_ajaxRemoveMessage($msgbox);
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}); //end $.get()
@ -332,7 +332,7 @@ $(document).ready(function() {
})
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.post()
}) // end Revoke User
@ -452,7 +452,7 @@ $(document).ready(function() {
.removeClass('current_row');
}
else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
});
})

2
js/server_variables.js
View File

@ -150,7 +150,7 @@ function editVariable(link)
if (data.success) {
$cell.html(data.variable);
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
$cell.html($cell.find('span.oldContent').html());
}
$cell.removeClass('edit');

4
js/sql.js
View File

@ -429,7 +429,7 @@ $(document).ready(function() {
}
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
$("#table_results tbody tr.marked .multi_checkbox " +
", #table_results tbody tr td.marked .multi_checkbox").prop("checked", false);
$("#table_results tbody tr.marked .multi_checkbox " +
@ -488,7 +488,7 @@ $(document).ready(function() {
$("#result_query").prepend((data.message));
}
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
$("#table_results tbody tr.marked .multi_checkbox " +
", #table_results tbody tr td.marked .multi_checkbox").prop("checked", false);
$("#table_results tbody tr.marked .multi_checkbox " +

2
js/tbl_change.js
View File

@ -336,7 +336,7 @@ $(document).ready(function() {
$form.find('input:reset').trigger('click');
}
} else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
} else {
//happens for example when no change was done while editing

7
js/tbl_select.js
View File

@ -58,11 +58,12 @@ $(document).ready(function() {
// empty previous search results while we are waiting for new results
$("#sqlqueryresults").empty();
var msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching']);
var $msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching'], false);
PMA_prepareForAjaxRequest($search_form);
$.post($search_form.attr('action'), $search_form.serialize(), function(response) {
PMA_ajaxRemoveMessage($msgbox);
if (typeof response == 'string') {
// found results
$("#sqlqueryresults").html(response);
@ -83,10 +84,6 @@ $(document).ready(function() {
// error message (zero rows)
$("#sqlqueryresults").html(response['message']);
}
msgbox.clearQueue().fadeOut('medium', function() {
$(this).hide();
});
}) // end $.post()
})

6
js/tbl_structure.js
View File

@ -51,7 +51,7 @@ $(document).ready(function() {
$(this).PMA_confirm(question, $(this).attr('href'), function(url) {
PMA_ajaxShowMessage(PMA_messages['strDroppingColumn']);
PMA_ajaxShowMessage(PMA_messages['strDroppingColumn'], false);
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
if(data.success == true) {
@ -91,7 +91,7 @@ $(document).ready(function() {
$(this).PMA_confirm(question, $(this).attr('href'), function(url) {
PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey']);
PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey'], false);
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
if(data.success == true) {
@ -136,7 +136,7 @@ $(document).ready(function() {
$anchor.PMA_confirm(question, $anchor.attr('href'), function(url) {
PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex']);
PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex'], false);
$.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
if(data.success == true) {

2
js/tbl_zoom_plot.js
View File

@ -445,7 +445,7 @@ $(document).ready(function() {
$('#sqlqueryresults').html(data.sql_query);
$("#sqlqueryresults").trigger('appendAnchor');
} else {
PMA_ajaxShowMessage(data.error);
PMA_ajaxShowMessage(data.error, false);
}
}); //End $.post
}//End database update