diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2021-12-13 23:44:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2021-12-13 23:44:16 +0000 |
| commit | 56d44f0bc44107782362c635a1699605e82d9515 (patch) | |
| tree | dc09d78dbaf79bd83330775edede6b740f20f821 | |
| parent | c58c280118f0b45717b1d2a191f1d10975657cce (diff) | |
| parent | 8a6aafc50719e131ba82e24abcea6295caa6f3b9 (diff) | |
Merge "Use native method to disable new users checkbox in Special:Preferences"
| -rw-r--r-- | includes/preferences/DefaultPreferencesFactory.php | 1 | ||||
| -rw-r--r-- | resources/Resources.php | 1 | ||||
| -rw-r--r-- | resources/src/mediawiki.special.preferences.ooui/personalEmail.js | 26 |
3 files changed, 1 insertions, 27 deletions
diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index ef70b02a11e9..80b51a83f7c2 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -779,6 +779,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { 'section' => 'personal/email', 'label-message' => 'email-allow-new-users-label', 'disabled' => $disableEmailPrefs, + 'disable-if' => [ '!==', 'disablemail', '1' ], ]; $defaultPreferences['ccmeonemails'] = [ diff --git a/resources/Resources.php b/resources/Resources.php index 0b0f1c7851fb..fee9693246bd 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2177,7 +2177,6 @@ return [ 'resources/src/mediawiki.special.preferences.ooui/signature.js', 'resources/src/mediawiki.special.preferences.ooui/tabs.js', 'resources/src/mediawiki.special.preferences.ooui/timezone.js', - 'resources/src/mediawiki.special.preferences.ooui/personalEmail.js', ], 'messages' => [ 'prefs-tabs-navigation-hint', diff --git a/resources/src/mediawiki.special.preferences.ooui/personalEmail.js b/resources/src/mediawiki.special.preferences.ooui/personalEmail.js deleted file mode 100644 index e75f10260419..000000000000 --- a/resources/src/mediawiki.special.preferences.ooui/personalEmail.js +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * JavaScript for Special:Preferences: Email preferences better UX - */ -( function () { - $( function () { - var allowEmail, $allowEmail, allowEmailFromNewUsers, $allowEmailFromNewUsers; - - $allowEmail = $( '#wpAllowEmail' ); - $allowEmailFromNewUsers = $( '#wpAllowEmailFromNewUsers' ); - - // This preference could theoretically be disabled ($wgHiddenPrefs) - if ( !$allowEmail.length || !$allowEmailFromNewUsers.length ) { - return; - } - - allowEmail = OO.ui.infuse( $allowEmail ); - allowEmailFromNewUsers = OO.ui.infuse( $allowEmailFromNewUsers ); - - function toggleDisabled() { - allowEmailFromNewUsers.setDisabled( allowEmail.isDisabled() || !allowEmail.isSelected() ); - } - - allowEmail.on( 'change', toggleDisabled ); - toggleDisabled(); - } ); -}() ); |