From 6f3d5718a2974f6f93aa8c99203d019ffe40bd12 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Mon, 27 Feb 2017 14:07:48 -0800
Subject: [PATCH] mediawiki.special.preferences: Use mw.storage.session for
 sessionStorage

Consistent access pattern.

Change-Id: Icc2591159a88eb5f80c601b22219c06df15f2347
---
 .../mediawiki.special.preferences.js          | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.js b/resources/src/mediawiki.special/mediawiki.special.preferences.js
index 163e85d335..0fa661041c 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.js
@@ -3,7 +3,7 @@
  */
 ( function ( mw, $ ) {
 	$( function () {
-		var $preftoc, $preferences, $fieldsets, labelFunc,
+		var $preftoc, $preferences, $fieldsets, labelFunc, previousTab,
 			$tzSelect, $tzTextbox, $localtimeHolder, servertime, allowCloseWindow,
 			convertmessagebox = require( 'mediawiki.notification.convertmessagebox' );
 
@@ -235,22 +235,19 @@
 			updateTimezoneSelection();
 		}
 
-		// Preserve the tab after saving the preferences
-		// Not using cookies, because their deletion results are inconsistent.
-		// Not using jStorage due to its enormous size (for this feature)
-		if ( window.sessionStorage ) {
-			if ( sessionStorage.getItem( 'mediawikiPreferencesTab' ) !== null ) {
-				switchPrefTab( sessionStorage.getItem( 'mediawikiPreferencesTab' ), 'noHash' );
-			}
+		// Restore the active tab after saving the preferences
+		previousTab = mw.storage.session.get( 'mwpreferences-prevTab' );
+		if ( previousTab ) {
+			switchPrefTab( previousTab, 'noHash' );
 			// Deleting the key, the tab states should be reset until we press Save
-			sessionStorage.removeItem( 'mediawikiPreferencesTab' );
-
-			$( '#mw-prefs-form' ).submit( function () {
-				var storageData = $( $preftoc ).find( 'li.selected a' ).attr( 'id' ).replace( 'preftab-', '' );
-				sessionStorage.setItem( 'mediawikiPreferencesTab', storageData );
-			} );
+			mw.storage.session.remove( previousTab );
 		}
 
+		$( '#mw-prefs-form' ).on( 'submit', function () {
+			var value = $( $preftoc ).find( 'li.selected a' ).attr( 'id' ).replace( 'preftab-', '' );
+			mw.storage.session.set( 'mwpreferences-prevTab', value );
+		} );
+
 		// Check if all of the form values are unchanged
 		function isPrefsChanged() {
 			var inputs = $( '#mw-prefs-form :input[name]' ),
-- 
2.20.1