diff options
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/admin.js | 4 | ||||
| -rw-r--r-- | settings/js/apps.js | 2 | ||||
| -rw-r--r-- | settings/js/certificates.js | 1 | ||||
| -rw-r--r-- | settings/js/personal.js | 6 |
4 files changed, 11 insertions, 2 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index 90b1de68370..1bbb20efa00 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -161,6 +161,10 @@ $(document).ready(function(){ }); }); + $('#allowGroupSharing').change(function() { + $('#allowGroupSharing').toggleClass('hidden', !this.checked); + }); + $('#shareapiExcludeGroups').change(function() { $("#selectExcludedGroups").toggleClass('hidden', !this.checked); }); diff --git a/settings/js/apps.js b/settings/js/apps.js index e6631762fd4..9322319d4ba 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -3,7 +3,7 @@ Handlebars.registerHelper('score', function() { if(this.score) { var score = Math.round( this.score / 10 ); - var imageName = 'rating/s' + score + '.png'; + var imageName = 'rating/s' + score + '.svg'; return new Handlebars.SafeString('<img src="' + OC.imagePath('core', imageName) + '">'); } diff --git a/settings/js/certificates.js b/settings/js/certificates.js index 9ce9f9aa8d8..f2a8e6b0afb 100644 --- a/settings/js/certificates.js +++ b/settings/js/certificates.js @@ -16,6 +16,7 @@ $(document).ready(function () { $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); $('#rootcert_import').fileupload({ + pasteZone: null, submit: function (e, data) { data.formData = _.extend(data.formData || {}, { requesttoken: OC.requestToken diff --git a/settings/js/personal.js b/settings/js/personal.js index b0bfa8eb230..bd13b7fd251 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -83,7 +83,10 @@ function changeDisplayName () { $('#oldDisplayName').val($('#displayName').val()); // update displayName on the top right expand button $('#expandDisplayName').text($('#displayName').val()); - updateAvatar(); + // update avatar if avatar is available + if(!$('#removeavatar').hasClass('hidden')) { + updateAvatar(); + } } else { $('#newdisplayname').val(data.data.displayName); @@ -241,6 +244,7 @@ $(document).ready(function () { }); var uploadparms = { + pasteZone: null, done: function (e, data) { var response = data; if (typeof data.result === 'string') { |