Merge "Fix commons icon to avoid pixelation"

resources/mmv/ui/mmv.ui.metadataPanel.js

@@ -423,7 +423,7 @@
 		this.$repo.text( repositoryMessage );
 
 		this.$repoLi.css( 'background-image',
-			repoInfo.favIcon ? 'url("' + repoInfo.favIcon + '")' : null );
+			( repoInfo.favIcon && !isCommons ) ? 'url("' + repoInfo.favIcon + '")' : '' );
 
 		this.$repoLi.toggleClass( 'commons', isCommons );
 		this.$repoSubtitle.text(

resources/mmv/ui/mmv.ui.metadataPanel.less

@@ -157,6 +157,8 @@
 	line-height: 1.3;
 
 	&.commons { // there is an extra subtitle for Commons images, box should be larger
+		/* @embed */
+		background-image: url(img/commons.svg);
 		@icon-size: 32px;
 		min-height: @icon-size;
 		padding-left: @icon-size + 2 * @padding;

tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js

@@ -274,4 +274,27 @@
 
 		$qf.removeClass( 'invited' );
 	} );
+
+	QUnit.test( 'Repo icon', 4, function ( assert ) {
+		var $qf = $( '#qunit-fixture' ),
+			panel = new mw.mmv.ui.MetadataPanel( $qf, $( '<div>' ).appendTo( $qf ) ),
+			favIcon = 'http://foo.com/bar',
+			repoData = {
+				favIcon: favIcon,
+				getArticlePath : function() { return 'Foo'; },
+				isCommons: function() { return false; }
+			};
+
+		panel.setRepoDisplay( repoData );
+
+		assert.ok( panel.$repoLi.css( 'background-image' ).indexOf( favIcon ) !== -1, 'Repo favicon is correctly applied' );
+		assert.ok( !panel.$repoLi.hasClass( 'commons' ), 'Repo does not have commons class' );
+
+		repoData.isCommons = function() { return true; };
+
+		panel.setRepoDisplay( repoData );
+
+		assert.ok( panel.$repoLi.css( 'background-image' ).indexOf( 'data:image/svg+xml' ) !== -1, 'Repo favicon is correctly replaced by svg for Commons' );
+		assert.ok( panel.$repoLi.hasClass( 'commons' ), 'Repo has commons class' );
+	} );
 }( mediaWiki, jQuery ) );