mw.Title: Use $.trimByteLength from jquery.byteLimit module

Change-Id: I39ebd559a72ce72743cbe3bb86abe679d108d94a

diff --git a/resources/Resources.php b/resources/Resources.php
index e139c3a..4d89f87 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1202,6 +1202,7 @@ return [
                ],
                'dependencies' => [
                        'jquery.byteLength',
+                       'jquery.byteLimit',
                        'mediawiki.util',
                ],
                'targets' => [ 'desktop', 'mobile' ],

diff --git a/resources/src/mediawiki/mediawiki.Title.js b/resources/src/mediawiki/mediawiki.Title.js
index 851f06c..6a4ebb1 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -407,21 +407,7 @@
                 * @return {string}
                 */
                trimToByteLength = function ( s, length ) {
-                       var byteLength, chopOffChars, chopOffBytes;
-
-                       // bytelength is always greater or equal to the length in characters
-                       s = s.substr( 0, length );
-                       while ( ( byteLength = $.byteLength( s ) ) > length ) {
-                               // Calculate how many characters can be safely removed
-                               // First, we need to know how many bytes the string exceeds the threshold
-                               chopOffBytes = byteLength - length;
-                               // A character in UTF-8 is at most 4 bytes
-                               // One character must be removed in any case because the
-                               // string is too long
-                               chopOffChars = Math.max( 1, Math.floor( chopOffBytes / 4 ) );
-                               s = s.substr( 0, s.length - chopOffChars );
-                       }
-                       return s;
+                       return $.trimByteLength( '', s, length ).newVal;
                },
 
                /**