[MediaWiki-commits] [Gerrit] Drop references to magnify-clip-{ltr, rtl}.png file - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155165

Change subject: Drop references to magnify-clip-{ltr,rtl}.png file
......................................................................

Drop references to magnify-clip-{ltr,rtl}.png file

This is now embedded via CSS in MediaWiki core's Linker as of 1.24wmf18.

Change-Id: Ib095740611de3f84f1aad229939b92d788b537c2
---
M VisualEditor.hooks.php
M modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
2 files changed, 1 insertion(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/65/155165/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 803253f..87c834d 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -17,7 +17,7 @@
                // parties who attempt to install VisualEditor onto non-alpha 
wikis, as
                // this should have no impact on deploying to Wikimedia's wiki 
cluster;
                // is fine for release tarballs because 1.22wmf11 < 1.22alpha < 
1.22.0.
-               wfUseMW( '1.24wmf17' );
+               wfUseMW( '1.24wmf18' );
 
                $coreConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'main' );
                $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
@@ -365,10 +365,6 @@
 
                $vars['wgVisualEditor'] = array(
                        'isPageWatched' => $out->getUser()->isWatched( 
$out->getTitle() ),
-                       // Same as in Linker.php
-                       'magnifyClipIconURL' => $out->getConfig()->get( 
'StylePath' ) .
-                               '/common/images/magnify-clip' .
-                               ( $pageLanguage->isRTL() ? '-rtl' : '' ) . 
'.png',
                        'pageLanguageCode' => $pageLanguage->getHtmlCode(),
                        'pageLanguageDir' => $pageLanguage->getDir(),
                        'svgMaxSize' => $out->getConfig()->get( 'SVGMaxSize' ),
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
index 8379db9..70e2938 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
@@ -58,16 +58,7 @@
                .addClass( 'magnify' );
        this.$a = this.$( '<a>' )
                .addClass( 'internal' )
-               // It's inside a protected node, so user can't see href/title 
anyways.
-               //.attr( 'href', '/wiki/File:Wiki.png' )
-               //.attr( 'title', 'Enlarge' )
                .appendTo( this.$magnify );
-       this.$img = this.$( '<img>' )
-               .attr( 'src', mw.config.get( 'wgVisualEditor' 
).magnifyClipIconURL )
-               .attr( 'width', 15 )
-               .attr( 'height', 11 )
-               //.attr( 'alt', '' )
-               .appendTo( this.$a );
 };
 
 /* Registration */

-- 
To view, visit https://gerrit.wikimedia.org/r/155165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib095740611de3f84f1aad229939b92d788b537c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits