X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fjquery%2Fjquery.byteLimit.js;h=a8c0b0659080226f9288354a84b64cc75f465a98;hb=5f130a442d1416a263c2996623de9d991ad185c7;hp=75dc2b908ab26eeb009947da166898e86bca5879;hpb=a570a7351007d9ecf00d7bc65b57fce3e6483664;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/jquery/jquery.byteLimit.js b/resources/jquery/jquery.byteLimit.js
index 75dc2b908a..a8c0b06590 100644
--- a/resources/jquery/jquery.byteLimit.js
+++ b/resources/jquery/jquery.byteLimit.js
@@ -78,7 +78,8 @@
 		// Chop off characters from the end of the "inserted content" string
 		// until the limit is statisfied.
 		if ( fn ) {
-			while ( $.byteLength( fn( inpParts.join( '' ) ) ) > byteLimit ) {
+			// stop, when there is nothing to slice - bug 41450
+			while ( $.byteLength( fn( inpParts.join( '' ) ) ) > byteLimit && inpParts[1].length > 0 ) {
 				inpParts[1] = inpParts[1].slice( 0, -1 );
 			}
 		} else {
@@ -221,8 +222,11 @@
 				// This is a side-effect of limiting after the fact.
 				if ( res.trimmed === true ) {
 					this.value = res.newVal;
-					prevSafeVal = res.newVal;
 				}
+				// Always adjust prevSafeVal to reflect the input value. Not doing this could cause
+				// trimValForByteLength to compare the new value to an empty string instead of the
+				// old value, resulting in trimming always from the end (bug 40850).
+				prevSafeVal = res.newVal;
 			} );
 		} );
 	};