Merge "mw.action.edit: Fix byte limit for the edit summary field"

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 7e2ee5e..49e64b5 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -19,26 +19,26 @@
        $( function () {
                var editBox, scrollTop, $editForm;
 
-               // Make sure edit summary does not exceed byte limit
-               // TODO: Replace with this when $wgOOUIEditPage is removed:
-               // OO.ui.infuse( 'wpSummary' ).$input.byteLimit( 255 );
-               $( '#wpSummary' ).byteLimit( 255 );
-
-               // Show a byte-counter to users with how many bytes are left for their edit summary.
-               // TODO: This looks a bit weird, as there is no unit in the UI, just numbers; showing
-               // 'bytes' confused users in testing, and showing 'chars' would be a lie. See T42035.
                if ( $( '#editform' ).hasClass( 'mw-editform-ooui' ) ) {
                        mw.loader.using( 'oojs-ui-core' ).then( function () {
                                var wpSummary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
 
+                               // Make sure edit summary does not exceed byte limit
+                               wpSummary.$input.byteLimit( 255 );
+
+                               // Show a byte-counter to users with how many bytes are left for their edit summary.
+                               // TODO: This looks a bit weird, as there is no unit in the UI, just numbers; showing
+                               // 'bytes' confused users in testing, and showing 'chars' would be a lie. See T42035.
                                function updateSummaryLabelCount() {
                                        wpSummary.setLabel( String( 255 - $.byteLength( wpSummary.getValue() ) ) );
                                }
-
                                wpSummary.on( 'change', updateSummaryLabelCount );
                                // Initialise value
                                updateSummaryLabelCount();
                        } );
+               } else {
+                       // Make sure edit summary does not exceed byte limit
+                       $( '#wpSummary' ).byteLimit( 255 );
                }
 
                // Restore the edit box scroll state following a preview operation,