Merge "Align "What's this" vertically"

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

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 5b81017..087c5bc 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -17,25 +17,15 @@
         */
 
        $( function () {
-               var editBox, scrollTop, $editForm;
+               var editBox, scrollTop, $editForm,
+                       // TODO T6714: Once this can be adjusted, read this from config.
+                       summaryByteLimit = 255,
+                       wpSummary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
 
-               if ( $( '#editform' ).hasClass( 'mw-editform-ooui' ) ) {
-                       mw.loader.using( 'oojs-ui-core' ).then( function () {
-                               var wpSummary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
-
-                               // Restore appropriate modifier keys for the accesskey in the 'title' attribute
-                               // TODO: This should be an OOjs UI feature, or somehow happen automatically after infusing.
-                               wpSummary.$input.updateTooltipAccessKeys();
-
-                               // 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.
-                               mw.widgets.visibleByteLimit( wpSummary, 255 );
-                       } );
-               } else {
-                       // Make sure edit summary does not exceed byte limit
-                       $( '#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.
+               mw.widgets.visibleByteLimit( wpSummary, summaryByteLimit );
 
                // Restore the edit box scroll state following a preview operation,
                // and set up a form submission handler to remember this state.