diff options
| author | brumsel <brumsel@losecatcher.de> | 2014-12-03 23:04:49 +0100 |
|---|---|---|
| committer | brumsel <brumsel@losecatcher.de> | 2014-12-03 23:04:49 +0100 |
| commit | 4ba520e2144630f05ce5022a48e764d86bc94b28 (patch) | |
| tree | ddb7a96581a03da3b23533644b791cb1ab3ce5d7 /apps/files/js/files.js | |
| parent | 1e1be409b7c27a9f04e52607d7347d05edbfc6c8 (diff) | |
| parent | 2eb81ff78f8ca5a14490be96429df6c6fb940d42 (diff) | |
| download | nextcloud-server-4ba520e2144630f05ce5022a48e764d86bc94b28.tar.gz nextcloud-server-4ba520e2144630f05ce5022a48e764d86bc94b28.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 5fcf99d24af..b11ef03eab2 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -195,7 +195,10 @@ /** * Generates a preview URL based on the URL space. - * @param urlSpec map with {x: width, y: height, file: file path} + * @param urlSpec attributes for the URL + * @param {int} urlSpec.x width + * @param {int} urlSpec.y height + * @param {String} urlSpec.file path to the file * @return preview URL * @deprecated used OCA.Files.FileList.generatePreviewUrl instead */ @@ -350,7 +353,7 @@ var createDragShadow = function(event) { } // do not show drag shadow for too many files - var selectedFiles = _.first(FileList.getSelectedFiles(), FileList.pageSize); + var selectedFiles = _.first(FileList.getSelectedFiles(), FileList.pageSize()); selectedFiles = _.sortBy(selectedFiles, FileList._fileInfoCompare); if (!isDragSelected && selectedFiles.length === 1) { |