diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-12 11:45:36 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-12 11:45:36 +0100 |
| commit | 759086e654bb0ee09bf20a60992b88d255f44c76 (patch) | |
| tree | abecd6b02ce0d2f56d4e5210de218e062ac52d28 /phpBB | |
| parent | d9e94903664d754914ea66ded880a54f51f46281 (diff) | |
| download | forums-759086e654bb0ee09bf20a60992b88d255f44c76.tar forums-759086e654bb0ee09bf20a60992b88d255f44c76.tar.gz forums-759086e654bb0ee09bf20a60992b88d255f44c76.tar.bz2 forums-759086e654bb0ee09bf20a60992b88d255f44c76.tar.xz forums-759086e654bb0ee09bf20a60992b88d255f44c76.zip | |
[ticket/9657] Remove AJAX from delete button and approval/restore form
When a post is being deleted and the user goes to the next page, the first
post of that next page is now on the page before. So the user performing
the action will skip the post. Until we found a good solution to fix this,
we just remove the AJAX from these features.
For more information see http://tracker.phpbb.com/browse/PHPBB3-11340
PHPBB3-9657
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 12 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 7a4aceee0b..40da09377e 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -317,18 +317,6 @@ phpbb.ajaxify = function(options) { }); } }, false); - - // Add the click function to the code we just laoded. - // Should be removed and replace with a call to .on() - // when jQuery is updated to 1.7.x or higher - // $(document).on('click', '#delete_permanent', function () {}); - $('#delete_permanent').click(function () { - if ($(this).attr('checked')) { - $('#delete_reason').hide(); - } else { - $('#delete_reason').show(); - } - }); } } diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index d20520b421..f5a4028223 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -137,7 +137,7 @@ <!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE --> <ul class="profile-icons"> <!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF --> - <!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" data-ajax="post_delete"<!-- IF postrow.POST_NUMBER == 1 --> data-refresh="true"<!-- ENDIF -->><span>{L_DELETE_POST}</span></a></li><!-- ENDIF --> + <!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF --> @@ -150,7 +150,7 @@ <p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » {postrow.POST_DATE} </p> <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_DELETED or postrow.S_POST_REPORTED --> - <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}" data-ajax="post_visibility"> + <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> <p class="rules"> <!-- IF postrow.S_POST_UNAPPROVED --> {UNAPPROVED_IMG} <strong>{L_POST_UNAPPROVED}</strong> |