aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-07-16 12:21:40 +0200
committerArthur Schiwon <blizzz@owncloud.com>2015-08-07 01:22:43 +0200
commitdeb9d4d7788948db627c4b18cd646e39e7190827 (patch)
treed49889e060e42270e612ee14e1961966aa527f67 /apps/files/js
parentd0f73d78f3de2546de80246c8343f6b64e37e5d7 (diff)
downloadnextcloud-server-deb9d4d7788948db627c4b18cd646e39e7190827.tar.gz
nextcloud-server-deb9d4d7788948db627c4b18cd646e39e7190827.zip
Right sidebar now has its own scrollbar
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/detailsview.js17
-rw-r--r--apps/files/js/filelist.js1
2 files changed, 18 insertions, 0 deletions
diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index feced7e34dd..c28de71ab7d 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -83,6 +83,8 @@
self.$el.addClass('disappear');
event.preventDefault();
});
+
+ this._addTestTabs();
},
/**
@@ -94,6 +96,21 @@
}
},
+ _addTestTabs: function() {
+ for (var j = 0; j < 2; j++) {
+ var testView = new OCA.Files.DetailTabView('testtab' + j);
+ testView.index = j;
+ testView.getLabel = function() { return 'Test tab ' + this.index; };
+ testView.render = function() {
+ this.$el.empty();
+ for (var i = 0; i < 100; i++) {
+ this.$el.append('<div>Test tab ' + this.index + ' row ' + i + '</div>');
+ }
+ };
+ this._tabViews.push(testView);
+ }
+ },
+
/**
* Renders this details view
*/
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 5c7fcb6b998..796b14199d8 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -302,6 +302,7 @@
this._detailsView.setFileInfo(_.extend({
path: this.getCurrentDirectory()
}, fileInfo));
+ this._detailsView.$el.scrollTop(0);
_.defer(function() {
self._detailsView.$el.removeClass('disappear hidden');
});