diff options
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardTabGeneric.js | 2 | ||||
| -rw-r--r-- | core/js/core.json | 2 | ||||
| -rw-r--r-- | core/js/lostpassword.js | 4 | ||||
| -rw-r--r-- | core/js/multiselect.js | 6 | ||||
| -rw-r--r-- | core/js/sharedialogshareelistview.js | 4 | ||||
| -rw-r--r-- | settings/js/admin.js | 4 | ||||
| -rw-r--r-- | settings/js/apps.js | 8 |
7 files changed, 15 insertions, 15 deletions
diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js index 21085e3a584..4415172a18c 100644 --- a/apps/user_ldap/js/wizard/wizardTabGeneric.js +++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js @@ -391,7 +391,7 @@ OCA = OCA || {}; */ _setCheckBox: function($element, value) { if(parseInt(value, 10) === 1) { - $element.attr('checked', 'checked'); + $element.prop('checked', 'checked'); } else { $element.removeAttr('checked'); } diff --git a/core/js/core.json b/core/js/core.json index 670051a4ca4..555c683f6f7 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -1,7 +1,7 @@ { "vendor": [ "jquery/dist/jquery.min.js", - "jquery-migrate/jquery-migrate.js", + "jquery-migrate/jquery-migrate.min.js", "jquery-ui/ui/jquery-ui.custom.js", "underscore/underscore.js", "moment/min/moment-with-locales.js", diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js index df28c2308cb..30d7b98f4e8 100644 --- a/core/js/lostpassword.js +++ b/core/js/lostpassword.js @@ -81,12 +81,12 @@ OC.Lostpassword = { $('#password').parents('form').attr('action'), { password : $('#password').val(), - proceed: $('#encrypted-continue').attr('checked') ? 'true' : 'false' + proceed: $('#encrypted-continue').is(':checked') ? 'true' : 'false' }, OC.Lostpassword.resetDone ); } - if($('#encrypted-continue').attr('checked')) { + if($('#encrypted-continue').is(':checked')) { $('#reset-password #submit').hide(); $('#reset-password #float-spinner').removeClass('hidden'); } diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 6d5c54ac0f5..71cf3e10a69 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -120,7 +120,7 @@ label.text(element.text() || item); label.attr('title', element.text() || item); if(settings.checked.indexOf(item) !== -1 || checked) { - input.attr('checked', true); + input.prop('checked', true); } if(checked){ if(settings.singleSelect) { @@ -145,7 +145,7 @@ element.attr('selected','selected'); if(typeof settings.oncheck === 'function') { if(settings.oncheck(value)===false) { - $(this).attr('checked', false); + $(this).prop('checked', false); return; } } @@ -157,7 +157,7 @@ element.attr('selected',null); if(typeof settings.onuncheck === 'function') { if(settings.onuncheck(value)===false) { - $(this).attr('checked',true); + $(this).prop('checked',true); return; } } diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index e4edbf24c08..fd0b6d9d1bd 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -268,11 +268,11 @@ if ($element.attr('name') === 'edit') { checked = $element.is(':checked'); // Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck - $($checkboxes).attr('checked', checked); + $($checkboxes).prop('checked', checked); } else { var numberChecked = $checkboxes.filter(':checked').length; checked = numberChecked > 0; - $('input[name="edit"]', $li).attr('checked', checked); + $('input[name="edit"]', $li).prop('checked', checked); } var permissions = OC.PERMISSION_READ; diff --git a/settings/js/admin.js b/settings/js/admin.js index 1bbb20efa00..34e258065ce 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -38,7 +38,7 @@ $(document).ready(function(){ $('#backgroundjobs span.crondate').tipsy({gravity: 's', live: true}); $('#backgroundjobs input').change(function(){ - if($(this).attr('checked')){ + if($(this).is(':checked')){ var mode = $(this).val(); if (mode === 'ajax' || mode === 'webcron' || mode === 'cron') { OC.AppConfig.setValue('core', 'backgroundjobs_mode', mode); @@ -131,7 +131,7 @@ $(document).ready(function(){ $('#setting_smtphost').removeClass('hidden'); $('#mail_smtpsecure_label').removeClass('hidden'); $('#mail_smtpsecure').removeClass('hidden'); - if ($('#mail_smtpauth').attr('checked')) { + if ($('#mail_smtpauth').is(':checked')) { $('#mail_credentials').removeClass('hidden'); } } diff --git a/settings/js/apps.js b/settings/js/apps.js index 1b687012815..015236f957d 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -193,15 +193,15 @@ OC.Settings.Apps = OC.Settings.Apps || { OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging') || OC.Settings.Apps.isType(app, 'prevent_group_restriction')) { page.find(".groups-enable").hide(); - page.find(".groups-enable__checkbox").attr('checked', null); + page.find(".groups-enable__checkbox").prop('checked', false); } else { page.find('#group_select').val((app.groups || []).join('|')); if (app.active) { if (app.groups.length) { OC.Settings.Apps.setupGroupsSelect(page.find('#group_select')); - page.find(".groups-enable__checkbox").attr('checked','checked'); + page.find(".groups-enable__checkbox").prop('checked', true); } else { - page.find(".groups-enable__checkbox").attr('checked', null); + page.find(".groups-enable__checkbox").prop('checked', false); } page.find(".groups-enable").show(); } else { @@ -289,7 +289,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if (OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') || OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) { - element.parent().find(".groups-enable").attr('checked', null); + element.parent().find(".groups-enable").prop('checked', true); element.parent().find(".groups-enable").hide(); element.parent().find('#group_select').hide().val(null); } else { |