[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23804-g12eacbf
Rouslan Placella
roccivic at users.sourceforge.net
Mon Nov 28 14:47:37 CET 2011
The branch, master has been updated
via 12eacbffea6b07045e619686aeab0b009c16d082 (commit)
from 1621df60a1be1cc05c1b62f512f154973353345b (commit)
- Log -----------------------------------------------------------------
commit 12eacbffea6b07045e619686aeab0b009c16d082
Author: Rouslan Placella <rouslan at placella.com>
Date: Mon Nov 28 13:47:06 2011 +0000
Error notifications should not time out
-----------------------------------------------------------------------
Summary of changes:
js/db_operations.js | 4 ++--
js/db_structure.js | 10 +++++-----
js/functions.js | 18 ++++++++----------
js/gis_data_editor.js | 8 ++++----
js/makegrid.js | 6 +++---
js/server_privileges.js | 8 ++++----
js/server_variables.js | 2 +-
js/sql.js | 4 ++--
js/tbl_change.js | 2 +-
js/tbl_select.js | 7 ++-----
js/tbl_structure.js | 6 +++---
js/tbl_zoom_plot.js | 2 +-
12 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/js/db_operations.js b/js/db_operations.js
index bc61679..9cc5581 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -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
diff --git a/js/db_structure.js b/js/db_structure.js
index a3f1c37..c00bd45 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -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()
diff --git a/js/functions.js b/js/functions.js
index 6e92047..08b8655 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -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()
diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js
index f77e286..6cab319 100644
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@@ -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_ajaxShowMessa lization(); { (data.result); ame, token) { ; " + data.error, false); rY i+ PT‚ãÿ ÀT‚ãÿ uÚœ i+ €ú i+ õ½ i+ ’è¹ i+ ÀT‚ãÿ € Ü i+ °I‚ãÿ €H‚ãÿ kðœ i+ 6 è è ! è ! PT‚ãÿ ÀT‚ãÿ x¤¹ i+ °J‚ãÿ ’Òœ i+ †ðœ i+ PT‚ãÿ `Òœ i+ T‚ãÿ ÀŸ i+ uÚœ i+ i+ Ø” i+ ¨™ i+ €ú i+ x¤¹ i+ °J‚ãÿ €I‚ãÿ kðœ i+ à! à! PT‚ãÿ ÀT‚ãÿ Hn™ i+ K‚ãÿ ’Òœ i+ †ðœ i+ PT‚ãÿ `Òœ i+ T‚ãÿ €T‚ãÿ xT‚ãÿ 8û½ i+ Œp˜ ÀT‚ãÿ uÚœ i+ €ú i+ K‚ãÿ `J‚ãÿ kðœ i+ G H I J K M N O P PT‚ãÿ ÀT‚ãÿ H%p i+ 0M‚ãÿ ’Òœ i+ †ðœ i+ PT‚ãÿ 0Ÿ i+ uÚœ i+ °¹ i+ YM i+ i+ Ø” i+ ¨™ i+ €ú i+ H%p i+ 0M‚ãÿ pK‚ãÿ kðœ i+ 8%p i+ 0M‚ãÿ K‚ãÿ kðœ i+ (%p i+ 0M‚ãÿ ÐK‚ãÿ kðœ i+ %p i+ 0M‚ãÿ L‚ãÿ kðœ i+ ¨ž i+ uÚœ i+ ¨™ i+ €F‚ãÿ Š¨M i+ eÙœ i+ Ø” i+ L‚ãÿ y¨M i+ eÙœ i+ i+ ÐL‚ãÿ Z¨M i+ eÙœ i+ ØTM i+ °¹ i+ YM i+ i+ Ø´¹ i+ Ø” i+ ¨™ i+ €ú i+ 8û½ i+ i+ ÀT‚ãÿ pëL i+ €N‚ãÿ PM‚ãÿ kðœ i+ 5 6 7 8 : < = > ? @ B D PT‚ãÿ ÀT‚ãÿ à i+ ÀT‚ãÿ uÚœ i+ õ½ i+ M‚ãÿ i+ eÙœ i+ õ½ i+ Õ_ at f ÆS Qöl±í Á3å i+ ÀT‚ãÿ à i+ O‚ãÿ `N‚ãÿ kðœ i+ u]ÞÓ 4Q ÷U^Qʉ§ ¶uª¹ñìò*Ä“vPT‚ãÿ ÀT‚ãÿ Hnâ i+ ´ i+ V‚ãÿ ¦À€ i+ ¦À€ i+ i+ T‚ãÿ ÀU‚ãÿ xT‚ãÿ àP‚ãÿ ¿¹ i+ uÚœ i+ Ø´¹ i+ @W‚ãÿ ¢À€ i+ V‚ãÿ Q‚ãÿ ÿÿÿÿÿÿÿÿ¢À€ i+ ÈT‚ãÿ ge(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');
});
diff --git a/js/makegrid.js b/js/makegrid.js
index 299315a..e13ec7e 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -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()
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 5d5cca8..eb8b3b3 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -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);
}
});
})
diff --git a/js/server_variables.js b/js/server_variables.js
index 93bc348..3a14c0b 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -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');
diff --git a/js/sql.js b/js/sql.js
index a7cfe98..90ea43a 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -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 " +
diff --git a/js/tbl_change.js b/js/tbl_change.js
index bfe5934..eaefe58 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -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
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 03d611a..acd8b1f 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -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()
})
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index c49165a..fb68f53 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -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) {
diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js
index dac2650..521fc84 100644
--- a/js/tbl_zoom_plot.js
+++ b/js/tbl_zoom_plot.js
@@ -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
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list