diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-03 17:05:15 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-07 14:37:40 +0200 |
| commit | 16231da19fdc367ecb4db71abe1ccd0052312469 (patch) | |
| tree | 9e53ef214745e0c220df78898e5ccb624b2cc999 /settings/js | |
| parent | eadc143d91ea26ffa7e1bad586f58fb749dfc183 (diff) | |
| download | nextcloud-server-16231da19fdc367ecb4db71abe1ccd0052312469.tar.gz nextcloud-server-16231da19fdc367ecb4db71abe1ccd0052312469.zip | |
Fix position and template
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/federationscopemenu.js | 6 | ||||
| -rw-r--r-- | settings/js/federationsettingsview.js | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js index 4b1813f90e9..db8b8ff33f7 100644 --- a/settings/js/federationscopemenu.js +++ b/settings/js/federationscopemenu.js @@ -37,7 +37,7 @@ */ var FederationScopeMenu = OC.Backbone.View.extend({ tagName: 'div', - className: 'federationScopeMenu popovermenu bubble hidden menu', + className: 'federationScopeMenu popovermenu bubble menu menu-center', field: undefined, _scopes: undefined, @@ -129,10 +129,6 @@ break; } - var $el = $(context.target); - var offsetIcon = $el.offset(); - var offsetHeading = $el.closest('h2').offset(); - this.render(); this.$el.removeClass('hidden'); diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js index b9722520f6d..d20d7bb78b6 100644 --- a/settings/js/federationsettingsview.js +++ b/settings/js/federationsettingsview.js @@ -62,14 +62,13 @@ render: function() { var self = this; _.each(this._inputFields, function(field) { - var $heading = self.$('#' + field + 'form h2'); - var $icon = self.$('#' + field + 'form h2 > span'); + var $icon = self.$('#' + field + 'form h2 > .federation-menu'); var scopeMenu = new OC.Settings.FederationScopeMenu({field: field}); self.listenTo(scopeMenu, 'select:scope', function(scope) { self._onScopeChanged(field, scope); }); - $heading.append(scopeMenu.$el); + $icon.append(scopeMenu.$el); $icon.on('click', _.bind(scopeMenu.show, scopeMenu)); // Restore initial state @@ -190,7 +189,7 @@ }, _setFieldScopeIcon: function(field, scope) { - var $icon = this.$('#' + field + 'form > h2 > span'); + var $icon = this.$('#' + field + 'form > h2 .icon-federation-menu'); $icon.removeClass('icon-password'); $icon.removeClass('icon-contacts-dark'); |