Merge branch 'nikerabbit-badges'

This commit is contained in:
Santhosh Thottingal
2016-06-09 15:08:28 +05:30
3 changed files with 34 additions and 19 deletions

View File

@@ -21,20 +21,19 @@
margin: 0 0 1.5em;
}
.uls-language-list ul li {
cursor: pointer;
font-weight: normal;
overflow: hidden;
white-space: nowrap;
.uls-language-list ul {
/*
* Some languages have long names for various reasons and we still want
* them to appear on one line.
* To make it work correctly, the directionality must be set correctly
* on the item level.
* We don't want any visible bullets in this list. Not by default anyway.
* Using very unspecific selector here to allow other classes to override.
* Bug because overflow: hidden is incompatible with bullets, also render
* the bullets inside the list in case there should be any.
*/
text-overflow: ellipsis;
list-style-image: none;
list-style-type: none;
}
.uls-language-list li {
cursor: pointer;
/*
* The directionality (ltr/rtl) for each list item is set dynamically
* as HTML attributes in JavaScript. Setting directionality also applies
@@ -45,14 +44,9 @@
* is readable.
*/
text-align: left;
/*
* We don't want any visible bullets in this list.
*/
list-style-image: none;
list-style-type: none;
}
/* TODO: looks unused */
.uls-language-list strong {
text-decoration: underline;
}
@@ -63,6 +57,18 @@
color: #3366bb;
font-size: 14px;
line-height: 1.6em;
display: inline-block;
width: 100%;
overflow: hidden;
/*
* Some languages have long names for various reasons and we still want
* them to appear on one line.
* To make it work correctly, the directionality must be set correctly
* on the item level.
*/
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: middle;
}
.uls-language-block {

View File

@@ -21,11 +21,19 @@
$( document ).ready( function () {
$( '.uls-trigger' ).uls( {
languageDecorator: function ( $language, languageCode ) {
if ( languageCode.indexOf( 'm' ) >= 0 ) {
$language.parent().addClass( 'badge' );
}
$language.prop( 'href', '//' + languageCode + '.wikipedia.org' );
},
} );
} );
</script>
<style>
.badge {
list-style-type: square;
}
</style>
</head>
<body>

View File

@@ -273,13 +273,14 @@
// Not using jQuery as this is performance hotspot
li = document.createElement( 'li' );
li.title = name;
li.lang = code;
li.dir = $.uls.data.getDir( code );
li.setAttribute( 'data-code', code );
a = document.createElement( 'a' );
a.appendChild( document.createTextNode( autonym ) );
a.className = 'autonym';
a.lang = code;
a.dir = $.uls.data.getDir( code );
li.appendChild( a );
if ( this.options.languageDecorator ) {