mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8646 from owncloud/publicshare-fixes 

[master] Fixed for public link page
This commit is contained in:
Björn Schießle 2014-05-21 05:41:35 -04:00
parent 9b23a210c9 7d98bcf9a2
commit 319942bccb
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/js/fileactions.js
View File

@ -244,7 +244,7 @@
this.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
return OC.imagePath('core', 'actions/download');
}, function (filename) {
var url = OCA.Files.Files.getDownloadUrl(filename, fileList.getCurrentDirectory());
var url = fileList.getDownloadUrl(filename, fileList.getCurrentDirectory());
if (url) {
OC.redirect(url);
}

35
apps/files_sharing/js/public.js
View File

@ -18,12 +18,15 @@ OCA.Sharing.PublicApp = {
_initialized: false,
initialize: function($el) {
var self = this;
if (this._initialized) {
return;
}
this._initialized = true;
this.initialDir = $('#dir').val();
// file list mode ?
if ($el.find('#filestable')) {
if ($el.find('#filestable').length) {
this.fileList = new OCA.Files.FileList(
$el,
{
@ -55,7 +58,7 @@ OCA.Sharing.PublicApp = {
var params = {
x: $(document).width() * window.devicePixelRatio,
a: 'true',
file: encodeURIComponent($('#dir').val() + $('#filename').val()),
file: encodeURIComponent(this.initialDir + $('#filename').val()),
t: $('#sharingToken').val()
};
@ -112,7 +115,7 @@ OCA.Sharing.PublicApp = {
data.formData = {
requesttoken: $('#publicUploadRequestToken').val(),
dirToken: $('#dirToken').val(),
subdir: $('input#dir').val(),
subdir: self.fileList.getCurrentDirectory(),
file_directory: fileDirectory
};
});
@ -122,7 +125,7 @@ OCA.Sharing.PublicApp = {
delete this.fileActions.actions.all.Share;
this.fileList.setFileActions(this.fileActions);
this.fileList.changeDirectory($('#dir').val() || '/', false, true);
this.fileList.changeDirectory(this.initialDir || '/', false, true);
// URL history handling
this.fileList.$el.on('changeDirectory', _.bind(this._onDirectoryChanged, this));
@ -156,16 +159,18 @@ $(document).ready(function() {
var App = OCA.Sharing.PublicApp;
App.initialize($('#preview'));
// HACK: for oc-dialogs previews that depends on Files:
Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
return App.fileList.lazyLoadPreview({
path: path,
mime: mime,
callback: ready,
width: width,
height: height,
etag: etag
});
};
if (window.Files) {
// HACK: for oc-dialogs previews that depends on Files:
Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
return App.fileList.lazyLoadPreview({
path: path,
mime: mime,
callback: ready,
width: width,
height: height,
etag: etag
});
};
}
});

18
apps/files_sharing/js/share.js
View File

@ -15,14 +15,16 @@ $(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
// TODO: make a separate class for this or a hook or jQuery event ?
var oldCreateRow = OCA.Files.FileList.prototype._createRow;
OCA.Files.FileList.prototype._createRow = function(fileData) {
var tr = oldCreateRow.apply(this, arguments);
if (fileData.shareOwner) {
tr.attr('data-share-owner', fileData.shareOwner);
}
return tr;
};
if (OCA.Files.FileList) {
var oldCreateRow = OCA.Files.FileList.prototype._createRow;
OCA.Files.FileList.prototype._createRow = function(fileData) {
var tr = oldCreateRow.apply(this, arguments);
if (fileData.shareOwner) {
tr.attr('data-share-owner', fileData.shareOwner);
}
return tr;
};
}
$('#fileList').on('fileActionsReady',function(){
var $fileList = $(this);