Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-08 14:12:40 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Merge pull request #5334 from owncloud/files-sharing-actionsafterupload

Browse Source 
Files sharing actions + navigation fixes
This commit is contained in:
Morris Jobke 2013-10-15 08:11:17 -07:00
commit 04ea419f50
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/ajax/upload.php
View File

@ -130,7 +130,7 @@ if (strpos($dir, '..') === false) {
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'permissions' => $meta['permissions'],
'permissions' => $meta['permissions'] & OCP\PERMISSION_READ
);
}
@ -156,7 +156,7 @@ if (strpos($dir, '..') === false) {
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'permissions' => $meta['permissions'],
'permissions' => $meta['permissions'] & OCP\PERMISSION_READ
);
}
}

44
apps/files/js/filelist.js
View File

@ -677,6 +677,7 @@ var FileList={
};
$(document).ready(function(){
var isPublic = !!$('#isPublic').val();
// handle upload events
var file_upload_start = $('#file_upload_start');
@ -924,29 +925,32 @@ $(document).ready(function(){
return (params && params.dir) || '/';
}
// fallback to hashchange when no history support
if (!window.history.pushState){
$(window).on('hashchange', function(){
FileList.changeDirectory(parseCurrentDirFromUrl(), false);
});
}
window.onpopstate = function(e){
var targetDir;
if (e.state && e.state.dir){
targetDir = e.state.dir;
// disable ajax/history API for public app (TODO: until it gets ported)
if (!isPublic){
// fallback to hashchange when no history support
if (!window.history.pushState){
$(window).on('hashchange', function(){
FileList.changeDirectory(parseCurrentDirFromUrl(), false);
});
}
else{
// read from URL
targetDir = parseCurrentDirFromUrl();
window.onpopstate = function(e){
var targetDir;
if (e.state && e.state.dir){
targetDir = e.state.dir;
}
else{
// read from URL
targetDir = parseCurrentDirFromUrl();
}
if (targetDir){
FileList.changeDirectory(targetDir, false);
}
}
if (targetDir){
FileList.changeDirectory(targetDir, false);
}
}
if (parseInt($('#ajaxLoad').val(), 10) === 1){
// need to initially switch the dir to the one from the hash (IE8)
FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
if (parseInt($('#ajaxLoad').val(), 10) === 1){
// need to initially switch the dir to the one from the hash (IE8)
FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
}
}
FileList.createFileSummary();

4
apps/files/js/files.js
View File

@ -705,7 +705,9 @@ function checkTrashStatus() {
function onClickBreadcrumb(e){
var $el = $(e.target).closest('.crumb'),
$targetDir = $el.data('dir');
if ($targetDir !== undefined){
isPublic = !!$('#isPublic').val();
if ($targetDir !== undefined && !isPublic){
e.preventDefault();
FileList.changeDirectory(decodeURIComponent($targetDir));
}