X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.special%2Fmediawiki.special.preferences.js;h=0fa661041c5456650bd3953c83a446897bc16997;hb=d7e06fe0aaab53d356f40a7639cd0465d2180629;hp=a756f22d4d3c141f26dbfda2363011f7d5878f8a;hpb=1e24e6cddf5601f6106261e10207b6f7d1ca31f3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.js b/resources/src/mediawiki.special/mediawiki.special.preferences.js
index a756f22d4d..0fa661041c 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.js
@@ -3,10 +3,9 @@
  */
 ( function ( mw, $ ) {
 	$( function () {
-		var $preftoc, $preferences, $fieldsets,
-			labelFunc,
-			$tzSelect, $tzTextbox, $localtimeHolder, servertime,
-			allowCloseWindow, notif;
+		var $preftoc, $preferences, $fieldsets, labelFunc, previousTab,
+			$tzSelect, $tzTextbox, $localtimeHolder, servertime, allowCloseWindow,
+			convertmessagebox = require( 'mediawiki.notification.convertmessagebox' );
 
 		labelFunc = function () {
 			return this.id.replace( /^mw-prefsection/g, 'preftab' );
@@ -82,20 +81,8 @@
 			}
 		}
 
-		// Check for messageboxes (.successbox, .warningbox, .errorbox) to replace with notifications
-		if ( $( '.mw-preferences-messagebox' ).length ) {
-			// If there is a #mw-preferences-success box and javascript is enabled, use a slick notification instead!
-			if ( $( '#mw-preferences-success' ).length ) {
-				notif = mw.notification.notify( mw.message( 'savedprefs' ), { autoHide: false } );
-				// 'change' event not reliable!
-				$( '#preftoc, .prefsection' ).one( 'change keydown mousedown', function () {
-					if ( notif ) {
-						notif.close();
-						notif = null;
-					}
-				} );
-			}
-		}
+		// Check for successbox to replace with notifications
+		convertmessagebox();
 
 		// Enable keyboard users to use left and right keys to switch tabs
 		$preftoc.on( 'keydown', function ( event ) {
@@ -248,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]' ),