Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Feryanto <aris_feryanto@yahoo.com>2011-08-10 17:27:31 +0400
committerAris Feryanto <aris_feryanto@yahoo.com>2011-08-10 17:27:31 +0400
commita9cd487f0f48ab9b070823545860f384cfb8a4e0 (patch)
treefc67a90c817af4f6f788d432a922203952574802 /js/db_search.js
parent0e441d93b2b5b2f4d51450834e99dc72be165f4f (diff)
parentf6f133eb09532943976cd38d40d794a008bbccc5 (diff)
Fix merge conflict with origin/master
Diffstat (limited to 'js/db_search.js')
-rw-r--r--js/db_search.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/db_search.js b/js/db_search.js
index 86a4c70567..aef5047be2 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -15,7 +15,8 @@
*/
/** Loads the database search results */
-function loadResult(result_path , table_name , link , ajaxEnable){
+function loadResult(result_path , table_name , link , ajaxEnable)
+{
$(document).ready(function() {
if(ajaxEnable)
{
@@ -42,7 +43,8 @@ function loadResult(result_path , table_name , link , ajaxEnable){
}
/** Delete the selected search results */
-function deleteResult(result_path , msg , ajaxEnable){
+function deleteResult(result_path , msg , ajaxEnable)
+{
$(document).ready(function() {
/** Hides the results shown by the browse criteria */
$("#table-info").hide();