Version 3.2.3

upload/public/js/ips.messenger.js

@@ -1,4 +1,4 @@
-/************************************************/
+/************************************************/
 /* IPB3 Javascript								*/
 /* -------------------------------------------- */
 /* ips.messenger.js - Messenger code			*/
@@ -7,13 +7,12 @@
 /* Author: Rikki Tissier						*/
 /************************************************/
 
-/* @TODO Lang Abstraction */
-
 var _msg = window.IPBoard;
 
 _msg.prototype.messenger = {
 	folderTemplate: '',
 	inviteInit: false,
+	disabled: 0,
 	editShown: 0,
 	
 	/*------------------------------*/
@@ -83,10 +82,18 @@ _msg.prototype.messenger = {
 		// Delegate for delete post
 		ipb.delegate.register('.delete_post', ipb.messenger.deleteReply);
 		
-		// Resize images
-		$$('.post', '.poll').each( function(elem){
-			ipb.global.findImgs( $( elem ) );
-		});
+		// Messenger disabled?
+		if ( ipb.messenger.disabled )
+		{
+			new ipb.Popup( 'pmdisabled', { type: 'modal',
+														 initial: $('pmDisabled').innerHTML,
+														 stem: true,
+														 hideAtStart: false,
+														 modal: true,
+														 modalOpacity: 0.8,
+														 hideClose: true,
+														 w: '450px' });
+		}
 	},
 	
 	/* ------------------------------ */
@@ -124,7 +131,7 @@ _msg.prototype.messenger = {
 								{
 									if( Object.isUndefined( t.responseJSON ) )
 									{
-										alert("An error occurred");
+										alert( ipb.lang['error_occured'] );
 										return;
 									}
 									
@@ -134,10 +141,9 @@ _msg.prototype.messenger = {
 										return;
 									}
 									
-									if ( t.responseJSON['msg'] && $('email_convo_text_' + id ) )
+									if ( t.responseJSON['msg'] )
 									{
-										$('email_convo_text_' + id ).update( t.responseJSON['msg'] );
-										Effect.Pulsate( $('email_convo_text_' + id ) );
+										ipb.global.showInlineNotification( t.responseJSON['msg'].toString() );
 									}
 								}
 							}
@@ -265,7 +271,7 @@ _msg.prototype.messenger = {
 								{
 									if( Object.isUndefined( t.responseJSON ) )
 									{
-										alert("Ошибка!");
+										alert( ipb.lang['error_occured'] );
 										return;
 									}
 									
@@ -279,7 +285,8 @@ _msg.prototype.messenger = {
 									if( $('f_' + id).select('.total')[0] )
 									{
 										$('f_' + id).select('.total')[0].update('0');
-										new Effect.Highlight( $('f_' + id) );
+										//new Effect.Highlight( $('f_' + id) );
+										ipb.global.showInlineNotification( ipb.lang['folder_emptied'] );
 									}
 									
 									if( !Object.isUndefined( ipb.messenger.curFolder ) && ipb.messenger.curFolder == id )
@@ -341,9 +348,6 @@ _msg.prototype.messenger = {
 											case 'cannotDeleteUndeletable':
 												alert( ipb.lang['cant_delete_folder'] );
 												break;
-											case 'cannotDeleteHasMessages':
-												/* SKINNOTE: let this function delete messages too */
-												break;
 											default:
 												alert( t.responseJSON['error'] );
 												break;
@@ -562,9 +566,7 @@ _msg.prototype.messenger = {
 	deletePM: function ( e, tid )
 	{
 		Event.stop(e);
-		
-		//var topicID = e.id.replace( 'pm_delete_', '' );
-		
+
 		if ( confirm( ipb.lang['delete_pm_confirm'] ) !== true )
 		{
 			Event.stop(e);
@@ -701,6 +703,28 @@ _msg.prototype.messenger = {
 								
 								$('f_' + t.responseJSON['newID']).select('.f_empty')[0].observe('click', ipb.messenger.emptyFolder );
 								$('f_' + t.responseJSON['newID']).select('.f_delete')[0].observe('click', ipb.messenger.deleteFolder );
+								
+								if( ipb.messenger.editShown ){
+									var elem = $('f_' + t.responseJSON['newID']).select("a[rel='folder_name']")[0];
+									var parent = $( elem ).up('.folder');
+									if( !$( parent ) ){ return; }
+									if( $( parent ).hasClassName('protected') ){ return; }
+									
+									// Create new textbox
+									var textbox = new Element('input', { type: 'text', 'class': 'input_text', value: $( elem ).innerHTML, size: '10', id: $(parent).id + '_rename' });
+									var submit = new Element('input', { type: 'submit', 'class': 'input_submit add_folder', value: ipb.lang['save_folder'], id: $(parent).id + '_save'});
+									
+									$(parent).select(".total")[0].hide();
+									$(parent).select(".edit_folders")[0].show();
+
+									$( elem ).insert( { before: submit } );
+									$( submit ).insert( { before: textbox } );
+									$( elem ).hide();
+
+									$( submit ).observe( 'click', ipb.messenger.saveFolderName.bindAsEventListener( this, $( parent ).id ) );
+									$( textbox ).observe( 'keypress', ipb.messenger.checkNameSubmit.bindAsEventListener( this, $( parent ).id ) );
+
+								}
 							}
 						}
 					);