Version 3.1.4

upload/admin/js/acp.members.js

@@ -1,4 +1,4 @@
-/************************************************/
+/************************************************/
 /* IPB3 Javascript								*/
 /* -------------------------------------------- */
 /* acp.members.js - Member functions			*/
@@ -54,15 +54,24 @@ _temp.prototype.members = {
 	{
 		Event.stop(e);
 		
+		if ( $('m_avatar_popup') )
+		{
+			$('m_avatar_popup').remove();
+		}
+		
+		acp.members.hideActionMenu();
+		
 		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
 		url = url.replace( /&/g, '&' );
 		
-		var afterInit = function( popup ){
-							if( $('avatar_gallery') )
-							{
-								$('avatar_gallery').observe('change', acp.members.updateAvatarGallery);
-							}
-						}
+		var afterInit = function( popup )
+		{
+			if( $('avatar_gallery') )
+			{
+				$('avatar_gallery').observe('change', acp.members.updateAvatarGallery);
+			}
+		};
+		
 		acp.members.popups['avatar'] = new ipb.Popup('m_avatar', { type: 'pane', modal: false, hideAtStart: false, w: '600px', ajaxURL: url }, { 'afterInit': afterInit } );
 	},
 	
@@ -121,6 +130,8 @@ _temp.prototype.members = {
 	{
 		Event.stop(e);
 		
+		acp.members.hideActionMenu();
+		
 		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
 		url = url.replace( /&/g, '&' );
 		
@@ -131,6 +142,8 @@ _temp.prototype.members = {
 	{
 		Event.stop(e);
 		
+		acp.members.hideActionMenu();
+		
 		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
 		url = url.replace( /&/g, '&' );
 		
@@ -166,7 +179,8 @@ _temp.prototype.members = {
 								else
 								{
 									try {
-										$('MF__avatar').src = '';
+										$('MF__avatar').remove();
+										$('MF__avatar_link').remove();
 									} catch(err) {
 										Debug.write( err );
 									}
@@ -220,6 +234,8 @@ _temp.prototype.members = {
 	{
 		Event.stop(e);
 		
+		acp.members.hideActionMenu();
+		
 		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
 		url = url.replace( /&/g, '&' );
 		
@@ -238,6 +254,13 @@ _temp.prototype.members = {
 	
 	saveField: function( e, id )
 	{
+		// Allow "inline form" with normal form submission
+		// See member password inline form
+		if( acp.members.fields[ id ]['bypass'] )
+		{
+			return true;
+		}
+		
 		Event.stop(e);
 		
 		//firebug.d.console.cmd.dir( acp.members.fields );
@@ -323,11 +346,18 @@ _temp.prototype.members = {
 								
 								Debug.write("Success");
 							},
-							onException: function(t){ alert("Ошибка: " + t.responseText) },
-							onFailure: function(t){ alert("Ошибка: " + t.responseText ) }
+							onException: function(t){ alert("Ошибка: " + t.responseText); },
+							onFailure: function(t){ alert("Ошибка: " + t.responseText ); }
 						} );
 								
 								
+	},
+	
+	hideActionMenu: function()
+	{
+		if ( $('member_tasks_menucontent').visible() )
+		{
+			$('member_tasks_menucontent').hide();
+		}
 	}
-			
-}
+};