diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-11-24 15:47:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-24 15:47:55 +0100 |
commit | cbf943301fd2a7896b4b6e4b4617580fdb3b2180 (patch) | |
tree | abc21e829cb6772e48c6cf326dc2306ef4447b09 /settings | |
parent | ddf944eca1968bcfa92b2ae085367867554551f8 (diff) | |
parent | 91f735acf3051898b7bfc4735a97f9d76c44c477 (diff) | |
download | nextcloud-server-cbf943301fd2a7896b4b6e4b4617580fdb3b2180.tar.gz nextcloud-server-cbf943301fd2a7896b4b6e4b4617580fdb3b2180.zip |
Merge pull request #2224 from nextcloud/fix-visibility-switcher
Fix visibility switcher for avatar
Diffstat (limited to 'settings')
-rw-r--r-- | settings/js/federationscopemenu.js | 2 | ||||
-rw-r--r-- | settings/js/federationsettingsview.js | 2 | ||||
-rw-r--r-- | settings/templates/personal.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js index 066f648c104..0862556a2c3 100644 --- a/settings/js/federationscopemenu.js +++ b/settings/js/federationscopemenu.js @@ -113,7 +113,7 @@ this._context = context; var currentlyActiveValue = $('#'+context.target.closest('form').id).find('.icon-checkmark > input')[0].value; - for(var i = 0 in this._scopes) { + for(var i in this._scopes) { this._scopes[i].active = false; } diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js index 7a629fc2ab6..b71b450546d 100644 --- a/settings/js/federationsettingsview.js +++ b/settings/js/federationsettingsview.js @@ -137,7 +137,7 @@ this._config.set(field + 'Scope', scope); - $('#' + field).parent().find('span > input').val(scope); + $('#' + field + 'scope').val(scope); // TODO: user loading/success feedback this._config.save(); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 2ae6c1dcdf2..f40cc2d78c3 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -60,6 +60,7 @@ <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div> </div> </div> + <span class="icon-checkmark hidden"/> <input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>"> </form> </div> |