Merge "resources: Strip '$' and 'mw' from file closures"

[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 35b1b80..966b5bc 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -1,7 +1,7 @@
 /*!
  * Scripts for action=edit at domready
  */
-( function ( mw, $ ) {
+( function () {
        'use strict';
 
        /**
@@ -18,25 +18,19 @@
 
        $( function () {
                var editBox, scrollTop, $editForm,
-                       // TODO T6714: Once this can be adjusted, read this from config.
-                       summaryByteLimit = 255;
+                       summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
+                       summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
+                       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, summaryByteLimit );
-                       } );
-               } else {
-                       // Make sure edit summary does not exceed byte limit
-                       $( '#wpSummary' ).byteLimit( summaryByteLimit );
+               // 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.
+               // (Showing 'chars' is still confusing with the code point limit, since it's not obvious
+               // that e.g. combining diacritics or zero-width punctuation count as characters.)
+               if ( summaryCodePointLimit ) {
+                       mw.widgets.visibleCodePointLimit( wpSummary, summaryCodePointLimit );
+               } else if ( summaryByteLimit ) {
+                       mw.widgets.visibleByteLimit( wpSummary, summaryByteLimit );
                }
 
                // Restore the edit box scroll state following a preview operation,
@@ -54,4 +48,4 @@
                        } );
                }
        } );
-}( mediaWiki, jQuery ) );
+}() );