Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377691 )

Change subject: RCFilters: Preference length is in bytes, so use $.byteLimit
......................................................................

RCFilters: Preference length is in bytes, so use $.byteLimit

Change-Id: I0f93edb0cb61a057da5ce0876b74cd17179c6587
---
M resources/Resources.php
M resources/src/jquery/jquery.byteLength.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
3 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/377691/1

diff --git a/resources/Resources.php b/resources/Resources.php
index f0aa9ec..ca922a3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1772,6 +1772,7 @@
                        
'resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js',
                ],
                'dependencies' => [
+                       'jquery.byteLength',
                        'oojs',
                        'mediawiki.api',
                        'mediawiki.api.options',
diff --git a/resources/src/jquery/jquery.byteLength.js 
b/resources/src/jquery/jquery.byteLength.js
index 7fe25ee..58719b7 100644
--- a/resources/src/jquery/jquery.byteLength.js
+++ b/resources/src/jquery/jquery.byteLength.js
@@ -11,7 +11,7 @@
  * @static
  * @inheritable
  * @param {string} str
- * @return {string}
+ * @return {Number}
  */
 jQuery.byteLength = function ( str ) {
        // This basically figures out how many bytes a UTF-16 string (which is 
what js sees)
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f37229f..ee74ac5 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -863,7 +863,7 @@
                // Stringify state
                stringified = JSON.stringify( state );
 
-               if ( stringified.length > 65535 ) {
+               if ( $.byteLength( stringified ) > 65535 ) {
                        // Sanity check, since the preference can only hold 
that.
                        return;
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/377691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f93edb0cb61a057da5ce0876b74cd17179c6587
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to