The branch, master has been updated
via 689ed6e6339773aa97685b8d49387b1042ce347a (commit)
via a5dfc6006dbdbd8fc7f901ae32e546bc45ad0e0d (commit)
from 6d77903aad055167b1d79ec4f8a450d9e45eed8b (commit)
- Log -----------------------------------------------------------------
commit 689ed6e6339773aa97685b8d49387b1042ce347a
Author: Marc Delisle <[email protected]>
Date: Tue Mar 8 12:24:35 2011 -0500
- Avoid author names or initials in code
- Better naming for new class
commit a5dfc6006dbdbd8fc7f901ae32e546bc45ad0e0d
Author: onebighack <[email protected]>
Date: Tue Mar 8 12:21:36 2011 -0500
Bug #3202516 Multiple Change Password windows
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index 2484bc6..b86ffe3 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2000,22 +2000,26 @@ $(document).ready(function() {
* Attach Ajax event handler on the change password anchor
* @see $cfg['AjaxEnable']
*/
+ $('#change_password_anchor.dialog_active').live('click',function(event) {
+ event.preventDefault();
+ return false;
+ });
$('#change_password_anchor.ajax').live('click', function(event) {
event.preventDefault();
-
+ $(this).removeClass('ajax').addClass('dialog_active');
/**
* @var button_options Object containing options to be passed to
jQueryUI's dialog
*/
var button_options = {};
-
button_options[PMA_messages['strCancel']] = function()
{$(this).dialog('close').remove();}
-
$.get($(this).attr('href'), {'ajax_request': true}, function(data) {
$('<div id="change_password_dialog"></div>')
.dialog({
title: PMA_messages['strChangePassword'],
width: 600,
- buttons : button_options
+ close: function(ev,ui) {$(this).remove();},
+ buttons : button_options,
+ beforeClose: function(ev,ui){
$('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax')}
})
.append(data);
displayPasswordGenerateButton();
@@ -2051,6 +2055,7 @@ $(document).ready(function() {
$("#topmenucontainer").after(data.sql_query);
$("#change_password_dialog").hide().remove();
$("#edit_user_dialog").dialog("close").remove();
+
$('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax');
}
else {
PMA_ajaxShowMessage(data.error);
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
