From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Wed, 18 Feb 2015 22:56:54 +0000 (+0100)
Subject: Preferences: Use mediawiki.confirmCloseWindow module
X-Git-Tag: 1.31.0-rc.0~12347
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=2550a3c691b2e8179f4f0181761f9ce16d9630e4;p=lhc%2Fweb%2Fwiklou.git

Preferences: Use mediawiki.confirmCloseWindow module

This logic was duplicated into the preferences page module before we
had refactored it into a separate module.

Bug: T89819
Change-Id: I67a25ff8758f009123526d5194929bfcd7c3039b
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 2168899257..37505936da 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1371,6 +1371,7 @@ return array(
 		),
 		'dependencies' => array(
 			'mediawiki.language',
+			'mediawiki.confirmCloseWindow',
 		),
 	),
 	'mediawiki.special.recentchanges' => array(
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.js b/resources/src/mediawiki.special/mediawiki.special.preferences.js
index a3eedd6dba..2e660ce8ad 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.js
@@ -5,7 +5,7 @@ jQuery( function ( $ ) {
 	var $preftoc, $preferences, $fieldsets, $legends,
 		hash, labelFunc,
 		$tzSelect, $tzTextbox, $localtimeHolder, servertime,
-		$checkBoxes, savedWindowOnBeforeUnload;
+		$checkBoxes, allowCloseWindowFn;
 
 	labelFunc = function () {
 		return this.id.replace( /^mw-prefsection/g, 'preftab' );
@@ -267,39 +267,14 @@ jQuery( function ( $ ) {
 	// Set up a message to notify users if they try to leave the page without
 	// saving.
 	$( '#mw-prefs-form' ).data( 'origdata', $( '#mw-prefs-form' ).serialize() );
-	$( window )
-		.on( 'beforeunload.prefswarning', function () {
-			var retval;
+	allowCloseWindowFn = mediaWiki.confirmCloseWindow( {
+		test: function () {
+			return $( '#mw-prefs-form' ).serialize() !== $( '#mw-prefs-form' ).data( 'origdata' );
+		},
 
-			// Check if anything changed
-			if ( $( '#mw-prefs-form' ).serialize() !== $( '#mw-prefs-form' ).data( 'origdata' ) ) {
-				// Return our message
-				retval = mediaWiki.msg( 'prefswarning-warning', mediaWiki.msg( 'saveprefs' ) );
-			}
-
-			// Unset the onbeforeunload handler so we don't break page caching in Firefox
-			savedWindowOnBeforeUnload = window.onbeforeunload;
-			window.onbeforeunload = null;
-			if ( retval !== undefined ) {
-				// ...but if the user chooses not to leave the page, we need to rebind it
-				setTimeout( function () {
-					window.onbeforeunload = savedWindowOnBeforeUnload;
-				}, 1 );
-				return retval;
-			}
-		} )
-		.on( 'pageshow.prefswarning', function () {
-			// Re-add onbeforeunload handler
-			if ( !window.onbeforeunload ) {
-				window.onbeforeunload = savedWindowOnBeforeUnload;
-			}
-		} );
-	$( '#mw-prefs-form' ).submit( function () {
-		// Unbind our beforeunload handler
-		$( window ).off( '.prefswarning' );
-	} );
-	$( '#mw-prefs-restoreprefs' ).click( function () {
-		// Unbind our beforeunload handler
-		$( window ).off( '.prefswarning' );
+		message: mediaWiki.msg( 'prefswarning-warning', mediaWiki.msg( 'saveprefs' ) ),
+		namespace: 'prefswarning'
 	} );
+	$( '#mw-prefs-form' ).submit( allowCloseWindowFn );
+	$( '#mw-prefs-restoreprefs' ).click( allowCloseWindowFn );
 } );