From aeca5a8253336b5fce0b91bd4897706f2c228380 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Mon, 24 Jul 2017 11:31:27 +0100 Subject: [PATCH] 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 --- .../ce/nodes/ve.ce.MWImageCaptionNode.js | 33 ------------------- .../styles/nodes/ve.ce.MWBlockImageNode.css | 5 --- 2 files changed, 38 deletions(-) diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js index 1eeee430ef..f6896e281b 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.name = 'mwImageCaption'; 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 = $( '
' ) - .addClass( 'magnify' ) - .prop( 'contentEditable', 'false' ); - this.$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 2dc0e4f3bd..d0bba81364 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; -}