Merge pull request wymeditor#254 from winhamwr/issue_249

Fix for wymeditor#249: Added a table editing plugin

CHANGELOG.rst

@@ -8,7 +8,7 @@
 .. _version-1.0.0dev:
 
 1.0.0dev
-=====
+========
 :release-date: TBA
 :branch: master
 
@@ -21,14 +21,35 @@ Enhancements
   shift + tab for list outdent.
 
   It is available at ``wymeditor/plugins/list/jquery.wymeditor.list.js``.
-  To enable the plugin, create a ListPlugin object via the 	
+  To enable the plugin, create a ListPlugin object via the
   ``wymeditor.postInit`` option. eg::
 
-  $('.wymeditor').wymeditor({
-      postInit: function(wym) {
-          var listPlugin = new ListPlugin({}, wym);
-      }
-  }); 
+    $('.wymeditor').wymeditor({
+        postInit: function(wym) {
+            var listPlugin = new ListPlugin({}, wym);
+        }
+    });
+
+* A new Table editing plugin is now available
+
+  The table editing plugin enables the following:
+
+  * Users can now add and remove rows and columns from existing tables.
+  * Users can merge table cells to create either ``colspan`` or ``rowspan``.
+  * Hitting the ``tab`` key while inside a table now moves the cursor to the
+    next cell, improving usability when editing tables. This can be disabled
+    by passing ``enableCellTabbing: false`` to the plugin initialization.
+
+  The plugin is available at ``wymeditor/plugins/table/jquery.wymeditor.table.js``.
+  To enable the plugin, instantiate it during the ``wymeditor.postInit`` option.
+  eg::
+
+    $('.wymeditor').wymeditor({
+        postInit: function(wym) {
+            var tableEditor = wym.table();
+        }
+    });
+
 
 .. _v1-0-0dev-bugfixes:
 
@@ -42,21 +63,22 @@ Bug Fixes
 * It is now possible to paste content in to a table when using internet
   explorer.
 * Fixed some problems with ordered and unordered list nesting in Internet
-  Explorer caused by a regex failing to account for IE's insertion of 
+  Explorer caused by a regex failing to account for IE's insertion of
   whitespace in list HTML.
+* ``colSpan`` and ``rowSpan`` attributes are no longer stripped out in Internet
+  Explorer.
 
 
 .. _version-0.5.1:
 
 0.5.1
 =====
 :release-date: TBA
-:branch: master
+:branch: 0.5.X
 
 .. _v0-5-1-enhancements:
 
 Enhancements
 ---------------
 
-* The Embed plugin now supports embedding via an iframe.
-
+* The Embed plugin now supports embedding via an iframe.

src/test/unit/index.html

@@ -34,13 +34,15 @@
 <script type="text/javascript" src="../../wymeditor/plugins/rangy/rangy-core.js"></script>
 <script type="text/javascript" src="../../wymeditor/plugins/embed/jquery.wymeditor.embed.js"></script>
 <script type="text/javascript" src="../../wymeditor/plugins/list/jquery.wymeditor.list.js"></script>
+<script type="text/javascript" src="../../wymeditor/plugins/table/jquery.wymeditor.table.js"></script>
 
 <script type="text/javascript" src="qunit.js"></script>
 
 <script type="text/javascript" src="utils.js"></script>
 <script type="text/javascript" src="lists.js"></script>
 <script type="text/javascript" src="blocking_elements.js"></script>
 <script type="text/javascript" src="embed.js"></script>
+<script type="text/javascript" src="table_test.js"></script>
 
 <script type="text/javascript" src="test.js"></script>