X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.action%2Fmediawiki.action.edit.js;h=966b5bcb90684535b9c45ab43711218c2214d1a6;hp=68d6cbb3d075944424f22c4be5f8714674c23859;hb=fe94275c8fcfc248a5eae857dde7c5772d993ab5;hpb=6c9a2923fe1ee3a65cb027be5e781772f2b12fbd

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 68d6cbb3d0..966b5bcb90 100644
--- 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,21 +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' ) );
-
-				// 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,
@@ -50,4 +48,4 @@
 			} );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );