Skip to content

Cleanup structure #9982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 11 commits into from
Jul 20, 2018
Merged

Cleanup structure #9982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8425830
Cleanup structure
skjnldsv Jun 25, 2018
d6b7185
Sidebar fix
skjnldsv Jun 26, 2018
fe6f444
Fixed sticky controls
skjnldsv Jul 6, 2018
562e2aa
Adjust acceptance tests to sidebar changes in Files app
skjnldsv Jun 26, 2018
e27e430
use flex for main content
skjnldsv Jul 12, 2018
ecaf4d7
Fix sidebar close button
skjnldsv Jul 12, 2018
a9f6539
Widen left navigation to 300px and set max-width of right sidebar to …
jancborchardt Jul 17, 2018
43ab208
Fixed filestable min-width
skjnldsv Jul 17, 2018
8d3f58c
Jsunit fixes 1
skjnldsv Jul 17, 2018
4877cd0
Bump karma config
skjnldsv Jul 17, 2018
89ee10a
Jsunit fixes
skjnldsv Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/files/css/detailsView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
position: absolute;
top: 0;
right: 0;
padding: 14px;
opacity: .5;
z-index: 1;
width: 44px;
height: 44px;
}
1 change: 1 addition & 0 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#filestable {
position: relative;
width: 100%;
min-width: 500px;
}

#filestable tbody tr {
Expand Down
2 changes: 1 addition & 1 deletion apps/files/css/mobile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/* don’t require a minimum width for files table */
#body-user #filestable {
min-width: initial !important;
min-width: 300px;
}

table th#headerSize,
Expand Down
7 changes: 7 additions & 0 deletions apps/files/js/detailsview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@
* Renders this details view
*/
render: function() {
// remove old instances
if ($('#app-sidebar').length === 0) {
this.$el.insertAfter($('#app-content'));
} else {
$('#app-sidebar').replaceWith(this.$el)
}

var templateVars = {
closeLabel: t('files', 'Close')
};
Expand Down
4 changes: 2 additions & 2 deletions apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@

/**
* Number of files per page
* Always show a minimum of 1
*
* @return {int} page size
*/
pageSize: function() {
return Math.ceil(this.$container.height() / 50);
return Math.max(Math.ceil(this.$container.height() / 50), 1);
},

/**
Expand Down Expand Up @@ -274,7 +275,6 @@

if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
this._detailsView = new OCA.Files.DetailsView();
this._detailsView.$el.insertBefore(this.$el);
this._detailsView.$el.addClass('disappear');
}

Expand Down
2 changes: 2 additions & 0 deletions apps/files/tests/js/favoritespluginspec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ describe('OCA.Files.FavoritesPlugin tests', function() {

beforeEach(function() {
$('#testArea').append(
'<div id="content">' +
'<div id="app-navigation">' +
'<ul><li data-id="files"><a>Files</a></li>' +
'<li data-id="sharingin"><a></a></li>' +
Expand All @@ -25,6 +26,7 @@ describe('OCA.Files.FavoritesPlugin tests', function() {
'<div id="app-content-favorites" class="hidden">' +
'</div>' +
'</div>' +
'</div>' +
'</div>'
);
OC.Plugins.attach('OCA.Files.App', Plugin);
Expand Down
5 changes: 3 additions & 2 deletions apps/files/tests/js/filelistSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2491,7 +2491,8 @@ describe('OCA.Files.FileList tests', function() {

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
fileList.remove('One.txt');
expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
// sidebar is removed on close before being
expect($('#app-sidebar').length).toEqual(0);
jQuery.fx.off = false;
});
it('returns the currently selected model instance when calling getModelForFile', function() {
Expand All @@ -2515,7 +2516,7 @@ describe('OCA.Files.FileList tests', function() {

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
fileList.changeDirectory('/another');
expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
expect($('#app-sidebar').length).toEqual(0);
jQuery.fx.off = false;
});
});
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/js/public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ OCA.Sharing.PublicApp = {
$el,
{
id: 'files.public',
scrollContainer: $('#content-wrapper'),
scrollContainer: $('#app-content'),
dragOptions: dragOptions,
folderDropOptions: folderDropOptions,
fileActions: fileActions,
Expand Down
Loading