paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Use .attr() properly for disabling name/email change.

Browse Source 
It turns out the consistent `.prop()` approach I switched to a few
commits back didn't actually work.  Instead, we establish consistency
by always using `.attr`, which does.

Usually, I'd go back and fix the older commits, but in this case it
feels not worth it.
This commit is contained in:
Tim Abbott
2018-03-02 12:48:23 -08:00
parent 72a31150f7
commit 92ba40b0c7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend_tests/node_tests/settings_org.js
View File

@@ -528,27 +528,27 @@ function test_change_allow_subdomains(change_allow_subdomains) {
page_params.realm_name_changes_disabled = false;
settings_account.update_name_change_display();
assert.equal($('#full_name').prop('disabled'), false);
assert.equal($('#full_name').attr('disabled'), false);
page_params.realm_name_changes_disabled = true;
settings_account.update_name_change_display();
assert.equal($('#full_name').prop('disabled'), true);
assert.equal($('#full_name').attr('disabled'), 'disabled');
page_params.realm_email_changes_disabled = false;
settings_account.update_email_change_display();
assert.equal($("#change_email .button").prop('disabled'), false);
assert.equal($("#change_email .button").attr('disabled'), false);
page_params.realm_email_changes_disabled = true;
settings_account.update_email_change_display();
assert.equal($("#change_email .button").prop('disabled'), true);
assert.equal($("#change_email .button").attr('disabled'), 'disabled');
// If organization admin, these UI elements are never disabled.
page_params.is_admin = true;
settings_account.update_name_change_display();
assert.equal($('#full_name').prop('disabled'), false);
assert.equal($('#full_name').attr('disabled'), false);
settings_account.update_email_change_display();
assert.equal($("#change_email .button").prop('disabled'), false);
assert.equal($("#change_email .button").attr('disabled'), false);
page_params.realm_description = 'realm description';
settings_org.update_realm_description();

8
static/js/settings_account.js
View File

@@ -27,20 +27,20 @@ exports.update_full_name = function (new_full_name) {
exports.update_name_change_display = function () {
if (page_params.realm_name_changes_disabled && !page_params.is_admin) {
$('#full_name').prop('disabled', true);
$('#full_name').attr('disabled', 'disabled');
$(".change_name_tooltip").show();
} else {
$('#full_name').prop('disabled', false);
$('#full_name').attr('disabled', false);
$(".change_name_tooltip").hide();
}
};
exports.update_email_change_display = function () {
if (page_params.realm_email_changes_disabled && !page_params.is_admin) {
$('#change_email .button').prop('disabled', true);
$('#change_email .button').attr('disabled', 'disabled');
$(".change_email_tooltip").show();
} else {
$('#change_email .button').prop('disabled', false);
$('#change_email .button').attr('disabled', false);
$(".change_email_tooltip").hide();
}
};