jenkins-bot has submitted this change and it was merged.
Change subject: Remove TableCaptionCommand
......................................................................
Remove TableCaptionCommand
Table captions are now modified in the TableDialog, not directly
from the surface, so this is unused.
Change-Id: Ifec177f3345f919d2c70b686f6b580a9a2d303c2
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
D src/ui/commands/ve.ui.TableCaptionCommand.js
M tests/index.html
5 files changed, 0 insertions(+), 64 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/modules.json b/build/modules.json
index 45c4701..7491503 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -454,7 +454,6 @@
"src/ui/commands/ve.ui.HistoryCommand.js",
"src/ui/commands/ve.ui.IndentationCommand.js",
"src/ui/commands/ve.ui.MergeCellsCommand.js",
- "src/ui/commands/ve.ui.TableCaptionCommand.js",
"src/ui/dialogs/ve.ui.FragmentDialog.js",
"src/ui/dialogs/ve.ui.NodeDialog.js",
"src/ui/dialogs/ve.ui.ToolbarDialog.js",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 02dc179..4eca8cf 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -412,7 +412,6 @@
<script
src="../../src/ui/commands/ve.ui.HistoryCommand.js"></script>
<script
src="../../src/ui/commands/ve.ui.IndentationCommand.js"></script>
<script
src="../../src/ui/commands/ve.ui.MergeCellsCommand.js"></script>
- <script
src="../../src/ui/commands/ve.ui.TableCaptionCommand.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
<script src="../../src/ui/dialogs/ve.ui.NodeDialog.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.ToolbarDialog.js"></script>
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 85c69dc..2661e5f 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -414,7 +414,6 @@
<script
src="../../src/ui/commands/ve.ui.HistoryCommand.js"></script>
<script
src="../../src/ui/commands/ve.ui.IndentationCommand.js"></script>
<script
src="../../src/ui/commands/ve.ui.MergeCellsCommand.js"></script>
- <script
src="../../src/ui/commands/ve.ui.TableCaptionCommand.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
<script src="../../src/ui/dialogs/ve.ui.NodeDialog.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.ToolbarDialog.js"></script>
diff --git a/src/ui/commands/ve.ui.TableCaptionCommand.js
b/src/ui/commands/ve.ui.TableCaptionCommand.js
deleted file mode 100644
index 35d45aa..0000000
--- a/src/ui/commands/ve.ui.TableCaptionCommand.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * VisualEditor UserInterface TableCaptionCommand class.
- *
- * @copyright 2011-2016 VisualEditor Team and others; see
http://ve.mit-license.org
- */
-
-/**
- * UserInterface table caption command.
- *
- * @class
- * @extends ve.ui.Command
- *
- * @constructor
- */
-ve.ui.TableCaptionCommand = function VeUiTableCaptionCommand() {
- // Parent constructor
- ve.ui.TableCaptionCommand.super.call(
- this, 'tableCaption', 'table', 'caption',
- { supportedSelections: [ 'linear', 'table' ] }
- );
-};
-
-/* Inheritance */
-
-OO.inheritClass( ve.ui.TableCaptionCommand, ve.ui.Command );
-
-/* Methods */
-
-/**
- * @inheritdoc
- */
-ve.ui.TableCaptionCommand.prototype.isExecutable = function ( fragment ) {
- var i, len, nodes, hasCaptionNode, selection;
-
- // Parent method
- if ( !ve.ui.TableCaptionCommand.super.prototype.isExecutable.apply(
this, arguments ) ) {
- return false;
- }
-
- selection = fragment.getSelection();
-
- if ( selection instanceof ve.dm.TableSelection ) {
- return true;
- } else {
- nodes = fragment.getSelectedLeafNodes();
- hasCaptionNode = !!nodes.length;
-
- for ( i = 0, len = nodes.length; i < len; i++ ) {
- if ( !nodes[ i ].hasMatchingAncestor( 'tableCaption' )
) {
- hasCaptionNode = false;
- break;
- }
- }
- return hasCaptionNode;
- }
-};
-
-/* Registration */
-
-ve.ui.commandRegistry.register( new ve.ui.TableCaptionCommand() );
diff --git a/tests/index.html b/tests/index.html
index d0f9f14..f6aed89 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -338,7 +338,6 @@
<script
src="../src/ui/commands/ve.ui.HistoryCommand.js"></script>
<script
src="../src/ui/commands/ve.ui.IndentationCommand.js"></script>
<script
src="../src/ui/commands/ve.ui.MergeCellsCommand.js"></script>
- <script
src="../src/ui/commands/ve.ui.TableCaptionCommand.js"></script>
<script
src="../src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
<script src="../src/ui/dialogs/ve.ui.NodeDialog.js"></script>
<script src="../src/ui/dialogs/ve.ui.ToolbarDialog.js"></script>
--
To view, visit https://gerrit.wikimedia.org/r/278324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifec177f3345f919d2c70b686f6b580a9a2d303c2
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits