Merge "Use descriptive key for array of in a Special:EditWatchlist line"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.jqueryMsg.js

diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js b/resources/src/mediawiki/mediawiki.jqueryMsg.js
index 9d34d62..a81730e 100644 (file)
--- a/resources/src/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki/mediawiki.jqueryMsg.js
@@ -1086,7 +1086,11 @@
                        } else {
                                $el = $( '<a>' );
                                if ( typeof arg === 'function' ) {
-                                       $el.click( arg ).attr( 'href', '#' );
+                                       $el.attr( 'href', '#' )
+                                       .click( function ( e ) {
+                                               e.preventDefault();
+                                       } )
+                                       .click( arg );
                                } else {
                                        $el.attr( 'href', arg.toString() );
                                }
@@ -1125,9 +1129,16 @@
                 * @return {string} selected pluralized form according to current language
                 */
                plural: function ( nodes ) {
-                       var forms, count;
+                       var forms, formIndex, node, count;
                        count = parseFloat( this.language.convertNumber( nodes[0], true ) );
                        forms = nodes.slice( 1 );
+                       for ( formIndex = 0; formIndex < forms.length; formIndex++ ) {
+                               node = forms[formIndex];
+                               if ( node.jquery && node.hasClass( 'mediaWiki_htmlEmitter' )  ) {
+                                       // This is a nested node, already expanded.
+                                       forms[formIndex] = forms[formIndex].html();
+                               }
+                       }
                        return forms.length ? this.language.convertPlural( count, forms ) : '';
                },