jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367378 )
Change subject: Remove code for magnify icon from figcaption node
......................................................................
Remove code for magnify icon from figcaption node
This icon is now added by Parsoid content CSS.
Bug: T160960
Depends-On: Id66f09c54103854ccbaa54a03e7c62890b67cba9
Change-Id: I8d76d759641b091c1821ff658b1201ca625fd146
---
M modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
M modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
2 files changed, 0 insertions(+), 38 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
index 1eeee43..f6896e2 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
@@ -36,39 +36,6 @@
ve.ce.MWImageCaptionNode.static.tagName = 'figcaption';
-/* Methods */
-
-/**
- * Reset the magnify button if the structure of the caption changed,
- * so it is always rendered in the right place.
- *
- * The magnify icon will always be attached to the caption; we
- * handle hiding and showing it per block image type in the CSS rules.
- */
-ve.ce.MWImageCaptionNode.prototype.onSplice = function () {
- if ( this.$magnify ) {
- this.$magnify.detach();
- } else {
- this.buildMagnify();
- }
-
- // Parent method
- ve.ce.MWImageCaptionNode.super.prototype.onSplice.apply( this,
arguments );
-
- // Reset the magnify icon, prepend it to the caption
- this.$magnify.prependTo( this.$element );
-};
-
-/** */
-ve.ce.MWImageCaptionNode.prototype.buildMagnify = function () {
- this.$magnify = $( '<div>' )
- .addClass( 'magnify' )
- .prop( 'contentEditable', 'false' );
- this.$a = $( '<a>' )
- .addClass( 'internal' )
- .appendTo( this.$magnify );
-};
-
/* Registration */
ve.ce.nodeFactory.register( ve.ce.MWImageCaptionNode );
diff --git a/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
b/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
index 2dc0e4f..d0bba81 100644
--- a/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
+++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
@@ -9,8 +9,3 @@
.ve-ce-mwBlockImageNode > figcaption p {
margin: 0 !important; /* stylelint-disable-line
declaration-no-important */
}
-
-.ve-ce-mwBlockImageNode > figcaption > .magnify {
- cursor: default;
- pointer-events: none;
-}
--
To view, visit https://gerrit.wikimedia.org/r/367378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d76d759641b091c1821ff658b1201ca625fd146
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
