Version 3.4.9
This commit is contained in:
1 parent
c603205a25
commit
f9e857d255
920 files changed
+28189
-6840
No files matched your search
@@ -14,7 +14,6 @@ _topic.prototype.topic = {
|
||||
inSection: '',
|
||||
topic_id: 0,
|
||||
page_id: 0,
|
||||
postcache: [],
|
||||
poll: [],
|
||||
pollPopups: [],
|
||||
deletePerms: {},
|
||||
@@ -45,7 +44,7 @@ _topic.prototype.topic = {
|
||||
{
|
||||
var pid = window.location.hash.substring(1).replace(/entry/, '');
|
||||
|
||||
if ( ipb.topic.redirectPost && pid && $$('a[data-entry-pid]').length && ! $$('a[data-entry-pid="' + pid + '"]').length )
|
||||
if ( ipb.topic.redirectPost && pid && $$('a[data-entry-pid]').length && ( ! $$('a[data-entry-pid="' + pid + '"]').length && ! $( 'postsDelete_' + pid ) ) )
|
||||
{
|
||||
window.location = ipb.vars['board_url'] + '/index.php?app=forums&module=forums§ion=findpost&pid=' + pid + '&t=' + ipb.topic.topic_id;
|
||||
}
|
||||
@@ -568,9 +567,11 @@ _topic.prototype.topic = {
|
||||
edit['tid'] = ipb.topic.topic_id;
|
||||
edit['fid'] = ipb.topic.forum_id;
|
||||
edit['post'] = $( 'post_id_' + edit['pid'] ).down('.post');
|
||||
|
||||
// Find post content
|
||||
ipb.topic.postcache[ edit['pid'] ] = edit['post'].innerHTML;
|
||||
edit['edit_post'] = new Element( 'div', { id: 'post_id_edit_' + edit['pid'] } );
|
||||
|
||||
edit['post'].insert({
|
||||
after: edit['edit_post']
|
||||
});
|
||||
|
||||
url = ipb.vars['base_url'] + 'app=forums&module=ajax§ion=topics&do=editBoxShow&p=' + edit['pid'] +'&t=' + edit['tid'] +'&f=' + edit['fid'];
|
||||
|
||||
@@ -605,7 +606,9 @@ _topic.prototype.topic = {
|
||||
|
||||
// Put it in
|
||||
edit['button'].writeAttribute('_editing', '1');
|
||||
edit['post'].update( t.responseText );
|
||||
|
||||
edit['post'].hide();
|
||||
edit['edit_post'].show().update( t.responseText );
|
||||
|
||||
edit['pid'] = 'e' + edit['pid'];
|
||||
|
||||
@@ -893,7 +896,11 @@ _topic.prototype.topic = {
|
||||
|
||||
var url = ipb.vars['base_url'] + 'app=forums&module=ajax§ion=topics&do=quote&t=' + ipb.topic.topic_id + '&p=' + pid + '&md5check=' + ipb.vars['secure_hash'] + '&isRte=' + ipb.textEditor.getEditor( ipb.topic.fastReplyId ).isRte();
|
||||
Debug.write( url );
|
||||
|
||||
|
||||
/* Make sure the editor is loaded for EDGE - #926867 */
|
||||
editor = ipb.textEditor.getEditor( ipb.topic.fastReplyId );
|
||||
editor.insert( '', 'always' );
|
||||
|
||||
new Ajax.Request( url,
|
||||
{
|
||||
method: 'get',
|
||||
@@ -1004,7 +1011,8 @@ _topic.prototype.topic = {
|
||||
|
||||
ipb.textEditor.getEditor( 'edit-' + postid ).remove();
|
||||
|
||||
$('post_id_' + postid).down('.post').update( t.responseJSON['successString'] );
|
||||
$('post_id_' + postid).down('.post').show().update( t.responseJSON['successString'] );
|
||||
$('post_id_edit_' + postid).remove();
|
||||
|
||||
prettyPrint();
|
||||
}
|
||||
@@ -1030,14 +1038,12 @@ _topic.prototype.topic = {
|
||||
var postid = elem.id.replace('edit_cancel_e', '');
|
||||
if( !postid ){ return; }
|
||||
|
||||
if( ipb.topic.postcache[ postid ] )
|
||||
{
|
||||
ipb.textEditor.getEditor( 'edit-' + postid ).remove();
|
||||
|
||||
$('post_id_' + postid).down('.post').update( ipb.topic.postcache[ postid ] );
|
||||
ipb.editors[ postid ] = null;
|
||||
$('edit_post_' + postid).writeAttribute('_editing', '0');
|
||||
}
|
||||
$('post_id_edit_' + postid).remove();
|
||||
$('post_id_' + postid).down('.post').show();
|
||||
ipb.editors[ postid ] = null;
|
||||
$('edit_post_' + postid).writeAttribute('_editing', '0');
|
||||
|
||||
return;
|
||||
},
|
||||
@@ -1405,7 +1411,11 @@ _topic.prototype.topic = {
|
||||
|
||||
var url = ipb.vars['base_url'] + 'app=forums&module=ajax§ion=topics&do=mqquote&t=' + ipb.topic.topic_id;
|
||||
Debug.write( url );
|
||||
|
||||
|
||||
/* Make sure the editor is loaded for EDGE - #926867 */
|
||||
editor = ipb.textEditor.getEditor( ipb.topic.fastReplyId );
|
||||
editor.insert( '', 'always' );
|
||||
|
||||
new Ajax.Request( url,
|
||||
{
|
||||
method: 'post',
|
||||
|
||||
Reference in new issue
Block a user