Merge pull request #79 from lainchan/clean_prod_vichan_update

Merge vichan changes from upstream and changes directly applied to the site.

1 files changed, 55 insertions, 12 deletions

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 73b6dd9c..f5cda9ad 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -1,26 +1,69 @@
 /*
  * fix-report-delete-submit.js
- * https://github.com/savetheinternet/Tinyboard/blob/master/js/fix-report-delete-submit.js
- *
- * Fixes a known bug regarding the delete/report submit buttons.
- *
- * Released under the MIT license
- * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/post-menu.js';
  *   $config['additional_javascript'][] = 'js/fix-report-delete-submit.js';
  *
  */
 
-$(document).ready(function(){
-	$('form[name="postcontrols"] div.delete input:not([type="checkbox"]):not([type="submit"]):not([type="hidden"])').keypress(function(e) {
-		if(e.which == 13) {
+if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko') {
+$(document).on('menu_ready', function(){
+var Menu = window.Menu;
+	
+if ($('#delete-fields #password').length) {
+	Menu.add_item("delete_post_menu", _("Delete post"));
+	Menu.add_item("delete_file_menu", _("Delete file"));
+	Menu.onclick(function(e, $buf) {
+		var ele = e.target.parentElement.parentElement;
+		var $ele = $(ele);
+		var threadId = $ele.parent().attr('id').replace('thread_', '');
+		var postId = $ele.find('.post_no').not('[id]').text();
+		var board_name = $ele.parent().data('board');
+
+		$buf.find('#delete_post_menu,#delete_file_menu').click(function(e) {
 			e.preventDefault();
-			$(this).next().click();
-			return false;
+			$('#delete_'+postId).prop('checked', 'checked');
+		
+			if ($(this).attr('id') === 'delete_file_menu') {
+				$('#delete_file').prop('checked', 'checked');
+			} else {
+				$('#delete_file').prop('checked', '');
+			}
+			$('input[type="hidden"][name="board"]').val(board_name);
+			$('input[name=delete][type=submit]').click();
+		});
+	});
+}
+
+Menu.add_item("report_menu", _("Report"));
+//Menu.add_item("global_report_menu", _("Global report"));
+Menu.onclick(function(e, $buf) {
+	var ele = e.target.parentElement.parentElement;
+	var $ele = $(ele);
+	var threadId = $ele.parent().attr('id').replace('thread_', '');
+	var postId = $ele.find('.post_no').not('[id]').text();
+	var board_name = $ele.parent().data('board');
+
+	$buf.find('#report_menu,#global_report_menu').click(function(e) {
+		if ($(this).attr('id') === "global_report_menu") {
+			var global = '&global';
+		} else {
+			var global = '';
 		}
-		return true;
+		window.open(configRoot+'report.php?board='+board_name+'&post=delete_'+postId+global, "", (global?"width=600, height=575":"width=500, height=275"));
 	});
 });
 
+$(document).on('new_post', function(){
+	$('input.delete').hide();
+});
+$('input.delete').hide();
+$('#post-moderation-fields').hide();
+});
+
+if (typeof window.Menu !== "undefined") {
+	$(document).trigger('menu_ready');
+}
+}