diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-01-17 11:17:40 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-01-22 11:45:08 -0600 |
| commit | 418ebfbdf4c5b73fb29007c70dfde576ca799943 (patch) | |
| tree | 4d27cf7525be27bd75b87e5b40fcf46ce315173d /apps/files/js | |
| parent | 0d6e3ca86b28fcf87a2541b97e1984a7a36c8bc6 (diff) | |
| download | nextcloud-server-418ebfbdf4c5b73fb29007c70dfde576ca799943.tar.gz nextcloud-server-418ebfbdf4c5b73fb29007c70dfde576ca799943.zip | |
fit newFileMenu to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/js/newfilemenu.js | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index bb50814dfdc..f0e794cdc1e 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2951,7 +2951,7 @@ this._newFileMenu = new OCA.Files.NewFileMenu({ fileList: this }); - $('body').append(this._newFileMenu.$el); + this._newButton.append(this._newFileMenu.$el); } this._newFileMenu.showAt($target); diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index 75c4cdcc0ba..91cf63c9508 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -38,7 +38,8 @@ */ var NewFileMenu = OC.Backbone.View.extend({ tagName: 'div', - className: 'newFileMenu popovermenu bubble hidden open menu', + // Menu is opened by default because it's rendered on "add-button" click + className: 'newFileMenu popovermenu bubble menu open menu-center', events: { 'click .menuitem': '_onClickAction' @@ -235,13 +236,6 @@ */ showAt: function($target) { this.render(); - var targetOffset = $target.offset(); - this.$el.css({ - left: targetOffset.left, - top: targetOffset.top + $target.height() - }); - this.$el.removeClass('hidden'); - OC.showMenu(null, this.$el); } }); |