diff options
| -rw-r--r-- | apps/files/lib/Controller/ApiController.php | 2 | ||||
| -rw-r--r-- | core/css/styles.scss | 5 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 4 | ||||
| -rw-r--r-- | core/templates/filepicker.html | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php index a967c8bd7bb..f9e4bcb5738 100644 --- a/apps/files/lib/Controller/ApiController.php +++ b/apps/files/lib/Controller/ApiController.php @@ -286,7 +286,7 @@ class ApiController extends Controller { * @NoAdminRequired */ public function getGridView() { - $status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '1') === '1'; + $status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '0') === '1'; return new JSONResponse(['gridview' => $status]); } diff --git a/core/css/styles.scss b/core/css/styles.scss index 66addec7c91..d739bab1013 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -767,12 +767,10 @@ code { background-color: var(--color-main-background); width: 100%; } - #filestable.filelist { + #picker-filestable.filelist { /* prevent the filepicker to overflow */ min-width: initial; margin-bottom: 50px; - } - .filelist { thead { tr { border-bottom: 1px solid var(--color-border); @@ -872,6 +870,7 @@ code { background-position: center top; background-size: contain; line-height: $name-height; + max-width: none; } &.filesize { line-height: $name-height / 3; diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 3169dab4b88..f1fa2b41c9d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -242,7 +242,7 @@ var OCdialogs = { // No grid for IE! if (OC.Util.isIE()) { self.$filePicker.find('#picker-view-toggle').remove(); - self.$filePicker.find('#filestable').removeClass('view-grid'); + self.$filePicker.find('#picker-filestable').removeClass('view-grid'); } $('body').append(self.$filePicker); @@ -808,7 +808,7 @@ var OCdialogs = { _getGridSettings: function() { var self = this; $.get(OC.generateUrl('/apps/files/api/v1/showgridview'), function(response) { - self.$showGridView.checked = response.gridview; + self.$showGridView.get(0).checked = response.gridview; self.$showGridView.next('#picker-view-toggle') .removeClass('icon-toggle-filelist icon-toggle-pictures') .addClass(response.gridview ? 'icon-toggle-filelist' : 'icon-toggle-pictures') diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html index 090e6bce773..2f61d32f3f4 100644 --- a/core/templates/filepicker.html +++ b/core/templates/filepicker.html @@ -7,7 +7,7 @@ <div class="icon-folder"></div> <h2>{emptytext}</h2> </div> - <table id="filestable" class="filelist list-container view-grid"> + <table id="picker-filestable" class="filelist list-container view-grid"> <thead> <tr> <th id="headerName" class="column-name"> |