Merge "Skin: Make skins aware of their registered skin name"

[lhc/web/wiklou.git] / resources / src / mediawiki.action / mediawiki.action.edit.preview.js

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index c26d915..ab1ce27 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -3,15 +3,13 @@
  */
 ( function ( mw, $ ) {
 
-       var oojsuieditform;
-
        /**
         * @ignore
         * @param {jQuery.Event} e
         */
        function doLivePreview( e ) {
                var isDiff, api, parseRequest, diffRequest, postData, copySelectors, section, summary,
-                       $wikiPreview, $wikiDiff, $editform, $textbox, $summary, $copyElements, $spinner, $errorBox;
+                       $wikiPreview, $wikiDiff, $editform, $textbox, $copyElements, $spinner, $errorBox;
 
                isDiff = ( e.target.name === 'wpDiff' );
                $wikiPreview = $( '#wikiPreview' );
@@ -19,11 +17,7 @@
                $editform = $( '#editform' );
                $textbox = $editform.find( '#wpTextbox1' );
 
-               if ( oojsuieditform ) {
-                       summary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
-               } else {
-                       $summary = $editform.find( '#wpSummary' );
-               }
+               summary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
 
                $spinner = $( '.mw-spinner-preview' );
                $errorBox = $( '.errorbox' );
@@ -86,7 +80,7 @@
                        formatversion: 2,
                        action: 'parse',
                        title: mw.config.get( 'wgPageName' ),
-                       summary: oojsuieditform ? summary.getValue() : $summary.val(),
+                       summary: summary.getValue(),
                        prop: ''
                };
 
@@ -209,14 +203,15 @@
                                if ( response.parse.langlinks && mw.config.get( 'skin' ) === 'vector' ) {
                                        newList = [];
                                        $.each( response.parse.langlinks, function ( i, langlink ) {
+                                               var bcp47 = mw.language.bcp47( langlink.lang );
                                                li = $( '<li>' )
                                                        .addClass( 'interlanguage-link interwiki-' + langlink.lang )
                                                        .append( $( '<a>' )
                                                                .attr( {
                                                                        href: langlink.url,
                                                                        title: langlink.title + ' - ' + langlink.langname,
-                                                                       lang: langlink.lang,
-                                                                       hreflang: langlink.lang
+                                                                       lang: bcp47,
+                                                                       hreflang: bcp47
                                                                } )
                                                                .text( langlink.autonym )
                                                        );
@@ -289,8 +284,6 @@
        }
 
        $( function () {
-               oojsuieditform = $( '#editform' ).hasClass( 'mw-editform-ooui' );
-
                // Do not enable on user .js/.css pages, as there's no sane way of "previewing"
                // the scripts or styles without reloading the page.
                if ( $( '#mw-userjsyoucanpreview' ).length || $( '#mw-usercssyoucanpreview' ).length ) {
@@ -317,7 +310,7 @@
                }
 
                if ( !$( '.mw-summary-preview' ).length ) {
-                       $( oojsuieditform ? '#wpSummaryWidget' : '#wpSummary' ).after(
+                       $( '#wpSummaryWidget' ).after(
                                $( '<div>' ).addClass( 'mw-summary-preview' )
                        );
                }