Merge "mediawiki.notification: Refactor $.ready handler and init()"

[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 706e1fe..ab1ce27 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -8,15 +8,17 @@
         * @param {jQuery.Event} e
         */
        function doLivePreview( e ) {
-               var isDiff, api, parseRequest, diffRequest, postData, copySelectors, section,
-                       $wikiPreview, $wikiDiff, $editform, $textbox, $summary, $copyElements, $spinner, $errorBox;
+               var isDiff, api, parseRequest, diffRequest, postData, copySelectors, section, summary,
+                       $wikiPreview, $wikiDiff, $editform, $textbox, $copyElements, $spinner, $errorBox;
 
                isDiff = ( e.target.name === 'wpDiff' );
                $wikiPreview = $( '#wikiPreview' );
                $wikiDiff = $( '#wikiDiff' );
                $editform = $( '#editform' );
                $textbox = $editform.find( '#wpTextbox1' );
-               $summary = $editform.find( '#wpSummary' );
+
+               summary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
+
                $spinner = $( '.mw-spinner-preview' );
                $errorBox = $( '.errorbox' );
                section = $editform.find( '[name="wpSection"]' ).val();
@@ -78,7 +80,7 @@
                        formatversion: 2,
                        action: 'parse',
                        title: mw.config.get( 'wgPageName' ),
-                       summary: $summary.textSelection( 'getContents' ),
+                       summary: summary.getValue(),
                        prop: ''
                };
 
@@ -201,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 )
                                                        );
@@ -307,7 +310,7 @@
                }
 
                if ( !$( '.mw-summary-preview' ).length ) {
-                       $( '#wpSummary' ).after(
+                       $( '#wpSummaryWidget' ).after(
                                $( '<div>' ).addClass( 'mw-summary-preview' )
                        );
                }