Oliverb has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159315
Change subject: Add table example and include necessary source files in demo.
......................................................................
Add table example and include necessary source files in demo.
Change-Id: Ia8d80a5388d115f987459ceb3ba757ad1cccef1f
---
M demos/ve/desktop.html
A demos/ve/pages/table.html
2 files changed, 84 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/15/159315/1
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index fb3c4d3..fe3ccc4 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -186,6 +186,7 @@
<script src="../../src/dm/nodes/ve.dm.TableNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.TableRowNode.js"></script>
<script
src="../../src/dm/nodes/ve.dm.TableSectionNode.js"></script>
+ <script src="../../src/dm/nodes/ve.dm.TableMatrix.js"></script>
<script src="../../src/dm/nodes/ve.dm.TextNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.ImageNode.js"></script>
<script
src="../../src/dm/nodes/ve.dm.BlockImageNode.js"></script>
@@ -299,6 +300,7 @@
<script
src="../../src/ui/actions/ve.ui.HistoryAction.js"></script>
<script
src="../../src/ui/actions/ve.ui.IndentationAction.js"></script>
<script src="../../src/ui/actions/ve.ui.ListAction.js"></script>
+ <script
src="../../src/ui/actions/ve.ui.TableAction.js"></script>
<script
src="../../src/ui/actions/ve.ui.WindowAction.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.CommandHelpDialog.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
@@ -323,6 +325,7 @@
<script
src="../../src/ui/tools/ve.ui.InspectorTool.js"></script>
<script
src="../../src/ui/tools/ve.ui.LanguageInspectorTool.js"></script>
<script src="../../src/ui/tools/ve.ui.ListTool.js"></script>
+ <script src="../../src/ui/tools/ve.ui.TableTool.js"></script>
<script
src="../../src/ui/inspectors/ve.ui.FragmentInspector.js"></script>
<script
src="../../src/ui/inspectors/ve.ui.AnnotationInspector.js"></script>
<script
src="../../src/ui/inspectors/ve.ui.InsertionInspector.js"></script>
@@ -358,7 +361,8 @@
"image": "pages/image.html",
"isolation": "pages/isolation.html",
"rtl": "pages/rtl.html",
- "simple": "pages/simple.html"
+ "simple": "pages/simple.html",
+ "table": "pages/table.html"
};
</script>
diff --git a/demos/ve/pages/table.html b/demos/ve/pages/table.html
new file mode 100644
index 0000000..5b07be3
--- /dev/null
+++ b/demos/ve/pages/table.html
@@ -0,0 +1,79 @@
+<h1>Tables</h1>
+
+<h2>Simple table</h2>
+
+<table>
+ <tr>
+ <td>A</td><td>B</td><td>C</td><td>D</td>
+ </tr>
+ <tr>
+ <td>E</td><td>F</td><td>G</td><td>H</td>
+ </tr>
+ <tr>
+ <td>I</td><td>J</td><td>K</td><td>L</td>
+ </tr>
+ <tr>
+ <td>M</td><td>N</td><td>O</td><td>P</td>
+ </tr>
+</table>
+
+
+<h2>Merged cells</h2>
+
+<table>
+ <tr>
+ <td>1</td><td>2</td><td>3</td><td rowspan='3'>4</td><td>5</td><td>6</td>
+ </tr>
+ <tr>
+ <td>7</td><td colspan='2'>8</td><td rowspan='4'>9</td><td>10</td>
+ </tr>
+ <tr>
+ <td>11</td><td>12</td><td>13</td><td>14</td>
+ </tr>
+ <tr>
+ <td>15</td><td rowspan='3' colspan='3'>16</td><td>17</td>
+ </tr>
+ <tr>
+ <td>18</td><td>19</td>
+ </tr>
+ <tr>
+ <td>20</td><td colspan='2'>21</td>
+ </tr>
+ <tr>
+ <td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td>
+ </tr>
+</table>
+
+
+<h2>Nested tables</h2>
+
+<table>
+ <tr>
+ <td>cell 1 row 1</td>
+ <td>cell 2 row 1</td>
+ </tr>
+ <tr>
+ <td>cell 1 row 2</td>
+ <td><table>
+ <tr>
+ <td>table 2 cell 1 row 1</td>
+ <td>table 2 cell 2 row 1</td>
+ </tr>
+ <tr>
+ <td>table 2 cell 1 row 2</td>
+ <td><table>
+ <tr>
+ <td>table 3 cell 1 row 1</td>
+ <td>table 3 cell 2 row 1</td>
+ </tr>
+ <tr>
+ <td>table 3 cell 1 row 2</td>
+ <td>table 3 cell 2 row 2</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
--
To view, visit https://gerrit.wikimedia.org/r/159315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8d80a5388d115f987459ceb3ba757ad1cccef1f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Oliverb <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
