1 files changed, 4 insertions, 1 deletions
diff --git a/resources/jquery/jquery.byteLimit.js b/resources/jquery/jquery.byteLimit.js
index 75dc2b90..f2b98f09 100644
--- a/resources/jquery/jquery.byteLimit.js
+++ b/resources/jquery/jquery.byteLimit.js
@@ -221,8 +221,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;
 			} );
 		} );
 	};