From 6c9d202057babfb1fbe59a1bd88a9f4b5273a846 Mon Sep 17 00:00:00 2001
From: Moritz Pfeiffer <moritz.pfeiffer@alp-phone.ch>
Date: Fri, 10 Jun 2016 09:17:07 +0200
Subject: [PATCH] Removed cell content aligment options from table editor
 context menu.

---
 CHANGELOG.txt                                     |  1 +
 docs/releases/1.6.rst                             |  1 +
 .../table_block/static/table_block/js/table.js    | 15 ++++++++++++++-
 .../templates/table_block/widgets/table.html      |  1 -
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 20ac65cf55..7107094b31 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -11,6 +11,7 @@ Changelog
  * `FieldRowPanel` now creates equal-width columns automatically if `col*` classnames are not specified (Chris Rogers)
  * Form builder now validates against multiple fields with the same name (Richard McMillan)
  * Fix: Email templates and document uploader now support custom `STATICFILES_STORAGE` (Jonny Scholes)
+ * Fix: Removed alignment options (deprecated in HTML and not rendered by Wagtail) from `TableBlock` context menu (Moritz Pfeiffer)
 
 
 1.5.2 (08.06.2016)
diff --git a/docs/releases/1.6.rst b/docs/releases/1.6.rst
index f877e6a4da..169d146d53 100644
--- a/docs/releases/1.6.rst
+++ b/docs/releases/1.6.rst
@@ -26,6 +26,7 @@ Bug fixes
 ~~~~~~~~~
 
  * Email templates and document uploader now support custom `STATICFILES_STORAGE` (Jonny Scholes)
+ * Removed alignment options (deprecated in HTML and not rendered by Wagtail) from `TableBlock` context menu (Moritz Pfeiffer)
 
 
 Upgrade considerations
diff --git a/wagtail/contrib/table_block/static/table_block/js/table.js b/wagtail/contrib/table_block/static/table_block/js/table.js
index c8e74b6ed9..582b51fd30 100644
--- a/wagtail/contrib/table_block/static/table_block/js/table.js
+++ b/wagtail/contrib/table_block/static/table_block/js/table.js
@@ -35,7 +35,7 @@ function initTable(id, tableOptions) {
         var parentDiv = $('.widget-table_input').parent();
         parentDiv.find('.field-content').width(width);
         parentDiv.find('.fieldname-table .field-content .field-content').width('80%');
-    };
+    }
 
     try {
         dataForForm = $.parseJSON(hiddenStreamInput.val());
@@ -108,6 +108,19 @@ function initTable(id, tableOptions) {
     finalOptions.afterCreateRow = structureEvent;
     finalOptions.afterRemoveCol = structureEvent;
     finalOptions.afterRemoveRow = structureEvent;
+    finalOptions.contextMenu = [
+        'row_above',
+        'row_below',
+        '---------',
+        'col_left',
+        'col_right',
+        '---------',
+        'remove_row',
+        'remove_col',
+        '---------',
+        'undo',
+        'redo'
+    ];
     hot = new Handsontable(document.getElementById(containerId), finalOptions);
     hot.render(); // Call to render removes 'null' literals from empty cells
 
diff --git a/wagtail/contrib/table_block/templates/table_block/widgets/table.html b/wagtail/contrib/table_block/templates/table_block/widgets/table.html
index d6b301057f..96b59905e9 100644
--- a/wagtail/contrib/table_block/templates/table_block/widgets/table.html
+++ b/wagtail/contrib/table_block/templates/table_block/widgets/table.html
@@ -21,4 +21,3 @@
 <br/>
 <div id="{{ attrs.id }}-handsontable-container"></div>
 {{ original_field_html }}
-