jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove last non-test related use of
writeCokkie/readCookie
......................................................................
Hygiene: Remove last non-test related use of writeCokkie/readCookie
Remove the functions and the test for it, too.
Change-Id: I35efb109f1a55be096b358b1b69f35bd10612c09
---
M includes/Resources.php
M javascripts/common/settings.js
M javascripts/modules/mf-stop-mobile-redirect.js
D tests/qunit/common/test_settings.js
4 files changed, 10 insertions(+), 40 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 8feebdb..083cbcf 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -614,6 +614,7 @@
'mediawiki.util',
'mobile.templates',
'mobile.overlays',
+ 'jquery.cookie',
),
'templates' => array(
'wikitext/commons-upload.hogan',
diff --git a/javascripts/common/settings.js b/javascripts/common/settings.js
index 6f9a735..b2488b5 100644
--- a/javascripts/common/settings.js
+++ b/javascripts/common/settings.js
@@ -17,16 +17,6 @@
}
}
- // FIXME: Deprecate - use $.cookie instead
- function writeCookie( name, value, days, path, domain ) {
- $.cookie( name, value, { path: path, expires: days, domain:
domain } );
- }
-
- // FIXME: Deprecate - use $.cookie instead
- function readCookie( name ) {
- return $.cookie( name );
- }
-
/**
* Saves a user setting for a later browser settings via localStorage
*
@@ -38,7 +28,7 @@
function saveUserSetting( name, value, useCookieFallback ) {
return M.supportsLocalStorage ?
localStorage.setItem( name, value ) :
- ( useCookieFallback ? writeCookie( name, value,
1 ) : false );
+ ( useCookieFallback ? $.cookie( name, value, {
expires: 1 } ) : false );
}
/**
@@ -50,14 +40,12 @@
*/
function getUserSetting( name, useCookieFallback ) {
return M.supportsLocalStorage ? localStorage.getItem( name ) :
- ( useCookieFallback ? readCookie( name ) : false );
+ ( useCookieFallback ? $.cookie( name ) : false );
}
return {
getUserSetting: getUserSetting,
- readCookie: readCookie,
saveUserSetting: saveUserSetting,
- writeCookie: writeCookie,
cookiesEnabled: cookiesEnabled
};
}());
diff --git a/javascripts/modules/mf-stop-mobile-redirect.js
b/javascripts/modules/mf-stop-mobile-redirect.js
index fa09035..50531b0 100644
--- a/javascripts/modules/mf-stop-mobile-redirect.js
+++ b/javascripts/modules/mf-stop-mobile-redirect.js
@@ -14,8 +14,7 @@
( function( M, $ ) {
- var writeCookie = M.settings.writeCookie,
- cookiesEnabled = M.settings.cookiesEnabled,
+ var cookiesEnabled = M.settings.cookiesEnabled,
popup = M.require( 'toast' );
function desktopViewClick() {
@@ -34,12 +33,14 @@
redirectCookie = mw.config.get(
'wgStopMobileRedirectCookie' );
// expire the cookie defined by wgUseFormatCookie
- writeCookie( useFormatCookie.name, '', useFormatCookie.duration,
- useFormatCookie.path, useFormatCookie.domain );
+ $.cookie( useFormatCookie.name, '',
+ { path: useFormatCookie.path, expires:
useFormatCookie.duration,
+ domain: useFormatCookie.domain } );
// set the stopMobileRedirect cookie
- writeCookie( redirectCookie.name, 'true',
redirectCookie.duration,
- redirectCookie.path, redirectCookie.domain );
+ $.cookie( redirectCookie.name, 'true',
+ { path: redirectCookie.path, expires:
redirectCookie.duration,
+ domain: redirectCookie.domain } );
}
$( '#mw-mf-display-toggle' ).on( 'click', desktopViewClick );
diff --git a/tests/qunit/common/test_settings.js
b/tests/qunit/common/test_settings.js
deleted file mode 100644
index 740516e..0000000
--- a/tests/qunit/common/test_settings.js
+++ /dev/null
@@ -1,20 +0,0 @@
-( function ( MFEB ) {
-// FIXME: Deprecate writeCookie and readCookie removing need for these tests
-QUnit.module( 'MobileFrontend settings.js: cookies' );
-
-QUnit.test( 'read and write cookies', 1, function() {
- var cookie_name = 'test_cookies_module', cookieVal;
- MFEB.writeCookie( cookie_name, 'yes', 40000 );
- cookieVal = MFEB.readCookie( cookie_name );
- strictEqual(cookieVal, "yes",
- "Are you running off localhost?");
-});
-
-QUnit.test( 'remove cookie via write', 1, function() {
- var cookie_name = 'test_cookies_module', cookieVal;
- MFEB.writeCookie( cookie_name, "", -1 );
- cookieVal = MFEB.readCookie( cookie_name );
- strictEqual(cookieVal, null, "Cookie deleted");
-});
-
-}( mw.mobileFrontend.settings ) );
--
To view, visit https://gerrit.wikimedia.org/r/153741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35efb109f1a55be096b358b1b69f35bd10612c09
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
