summaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js/filelist.js')
-rw-r--r--apps/files/js/filelist.js390
1 files changed, 205 insertions, 185 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 84ff1093253..694ddb0c803 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1,7 +1,7 @@
var FileList={
useUndo:true,
- postProcessList: function(){
- $('#fileList tr').each(function(){
+ postProcessList: function() {
+ $('#fileList tr').each(function() {
//little hack to set unescape filenames in attribute
$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
});
@@ -11,20 +11,20 @@ var FileList={
permissions = $('#permissions').val(),
isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
$fileList.empty().html(fileListHtml);
- $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').length > 0);
+ $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').exists());
$fileList.find('tr').each(function () {
FileActions.display($(this).children('td.filename'));
});
$fileList.trigger(jQuery.Event("fileActionsReady"));
FileList.postProcessList();
// "Files" might not be loaded in extending apps
- if (window.Files){
+ if (window.Files) {
Files.setupDragAndDrop();
}
FileList.updateFileSummary();
$fileList.trigger(jQuery.Event("updated"));
},
- createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions){
+ createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions) {
var td, simpleSize, basename, extension;
//containing tr
var tr = $('<tr></tr>').attr({
@@ -45,7 +45,7 @@ var FileList={
"href": linktarget
});
//split extension from filename for non dirs
- if (type != 'dir' && name.indexOf('.')!=-1) {
+ if (type !== 'dir' && name.indexOf('.') !== -1) {
basename=name.substr(0,name.lastIndexOf('.'));
extension=name.substr(name.lastIndexOf('.'));
} else {
@@ -54,11 +54,11 @@ var FileList={
}
var name_span=$('<span></span>').addClass('nametext').text(basename);
link_elem.append(name_span);
- if(extension){
+ if (extension) {
name_span.append($('<span></span>').addClass('extension').text(extension));
}
//dirs can show the number of uploaded files
- if (type == 'dir') {
+ if (type === 'dir') {
link_elem.append($('<span></span>').attr({
'class': 'uploadtext',
'currentUploads': 0
@@ -68,9 +68,9 @@ var FileList={
tr.append(td);
//size column
- if(size!=t('files', 'Pending')){
+ if (size !== t('files', 'Pending')) {
simpleSize = humanFileSize(size);
- }else{
+ } else {
simpleSize=t('files', 'Pending');
}
var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2));
@@ -92,7 +92,7 @@ var FileList={
tr.append(td);
return tr;
},
- addFile:function(name,size,lastModified,loading,hidden,param){
+ addFile:function(name, size, lastModified, loading, hidden, param) {
var imgurl;
if (!param) {
@@ -122,9 +122,9 @@ var FileList={
);
FileList.insertElement(name, 'file', tr);
- if(loading){
- tr.data('loading',true);
- }else{
+ if (loading) {
+ tr.data('loading', true);
+ } else {
tr.find('td.filename').draggable(dragOptions);
}
if (hidden) {
@@ -132,7 +132,7 @@ var FileList={
}
return tr;
},
- addDir:function(name,size,lastModified,hidden){
+ addDir:function(name, size, lastModified, hidden) {
var tr = this.createRow(
'dir',
@@ -144,7 +144,7 @@ var FileList={
$('#permissions').val()
);
- FileList.insertElement(name,'dir',tr);
+ FileList.insertElement(name, 'dir', tr);
var td = tr.find('td.filename');
td.draggable(dragOptions);
td.droppable(folderDropOptions);
@@ -158,25 +158,26 @@ var FileList={
* @brief Changes the current directory and reload the file list.
* @param targetDir target directory (non URL encoded)
* @param changeUrl false if the URL must not be changed (defaults to true)
+ * @param {boolean} force set to true to force changing directory
*/
- changeDirectory: function(targetDir, changeUrl, force){
+ changeDirectory: function(targetDir, changeUrl, force) {
var $dir = $('#dir'),
url,
currentDir = $dir.val() || '/';
targetDir = targetDir || '/';
- if (!force && currentDir === targetDir){
+ if (!force && currentDir === targetDir) {
return;
}
FileList.setCurrentDir(targetDir, changeUrl);
FileList.reload();
},
- linkTo: function(dir){
+ linkTo: function(dir) {
return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
},
- setCurrentDir: function(targetDir, changeUrl){
+ setCurrentDir: function(targetDir, changeUrl) {
$('#dir').val(targetDir);
- if (changeUrl !== false){
- if (window.history.pushState && changeUrl !== false){
+ if (changeUrl !== false) {
+ if (window.history.pushState && changeUrl !== false) {
url = FileList.linkTo(targetDir);
window.history.pushState({dir: targetDir}, '', url);
}
@@ -189,9 +190,9 @@ var FileList={
/**
* @brief Reloads the file list using ajax call
*/
- reload: function(){
+ reload: function() {
FileList.showMask();
- if (FileList._reloadCall){
+ if (FileList._reloadCall) {
FileList._reloadCall.abort();
}
FileList._reloadCall = $.ajax({
@@ -200,7 +201,7 @@ var FileList={
dir : $('#dir').val(),
breadcrumb: true
},
- error: function(result){
+ error: function(result) {
FileList.reloadCallback(result);
},
success: function(result) {
@@ -208,7 +209,7 @@ var FileList={
}
});
},
- reloadCallback: function(result){
+ reloadCallback: function(result) {
var $controls = $('#controls');
delete FileList._reloadCall;
@@ -219,17 +220,17 @@ var FileList={
return;
}
- if (result.status === 404){
+ if (result.status === 404) {
// go back home
FileList.changeDirectory('/');
return;
}
- if (result.data.permissions){
+ if (result.data.permissions) {
FileList.setDirectoryPermissions(result.data.permissions);
}
- if(typeof(result.data.breadcrumb) != 'undefined'){
+ if (typeof(result.data.breadcrumb) !== 'undefined') {
$controls.find('.crumb').remove();
$controls.prepend(result.data.breadcrumb);
@@ -238,81 +239,83 @@ var FileList={
Files.resizeBreadcrumbs(width, true);
// in case svg is not supported by the browser we need to execute the fallback mechanism
- if(!SVGSupport()) {
+ if (!SVGSupport()) {
replaceSVG();
}
}
FileList.update(result.data.files);
},
- setDirectoryPermissions: function(permissions){
+ setDirectoryPermissions: function(permissions) {
var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
$('#permissions').val(permissions);
$('.creatable').toggleClass('hidden', !isCreatable);
$('.notCreatable').toggleClass('hidden', isCreatable);
},
- remove:function(name){
- $('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
- $('tr').filterAttr('data-file',name).remove();
+ remove:function(name) {
+ $('tr[data-file="'+name+'"]').find('td.filename').draggable('destroy');
+ $('tr[data-file="'+name+'"]').remove();
FileList.updateFileSummary();
- if($('tr[data-file]').length==0){
+ if ( ! $('tr[data-file]').exists() ) {
$('#emptycontent').removeClass('hidden');
}
},
- insertElement:function(name,type,element){
+ insertElement:function(name, type, element) {
//find the correct spot to insert the file or folder
var pos, fileElements=$('tr[data-file][data-type="'+type+'"]:visible');
- if(name.localeCompare($(fileElements[0]).attr('data-file'))<0){
- pos=-1;
- }else if(name.localeCompare($(fileElements[fileElements.length-1]).attr('data-file'))>0){
- pos=fileElements.length-1;
- }else{
- for(pos=0;pos<fileElements.length-1;pos++){
- if(name.localeCompare($(fileElements[pos]).attr('data-file'))>0 && name.localeCompare($(fileElements[pos+1]).attr('data-file'))<0){
+ if (name.localeCompare($(fileElements[0]).attr('data-file')) < 0) {
+ pos = -1;
+ } else if (name.localeCompare($(fileElements[fileElements.length-1]).attr('data-file')) > 0) {
+ pos = fileElements.length - 1;
+ } else {
+ for(pos = 0; pos<fileElements.length-1; pos++) {
+ if (name.localeCompare($(fileElements[pos]).attr('data-file')) > 0
+ && name.localeCompare($(fileElements[pos+1]).attr('data-file')) < 0)
+ {
break;
}
}
}
- if(fileElements.length){
- if(pos==-1){
+ if (fileElements.exists()) {
+ if (pos === -1) {
$(fileElements[0]).before(element);
- }else{
+ } else {
$(fileElements[pos]).after(element);
}
- }else if(type=='dir' && $('tr[data-file]').length>0){
+ } else if (type === 'dir' && $('tr[data-file]').exists()) {
$('tr[data-file]').first().before(element);
- } else if(type=='file' && $('tr[data-file]').length>0) {
+ } else if (type === 'file' && $('tr[data-file]').exists()) {
$('tr[data-file]').last().before(element);
- }else{
+ } else {
$('#fileList').append(element);
}
$('#emptycontent').addClass('hidden');
FileList.updateFileSummary();
},
- loadingDone:function(name, id){
- var mime, tr=$('tr').filterAttr('data-file',name);
- tr.data('loading',false);
- mime=tr.data('mime');
- tr.attr('data-mime',mime);
- if (id != null) {
+ loadingDone:function(name, id) {
+ var mime, tr = $('tr[data-file="'+name+'"]');
+ tr.data('loading', false);
+ mime = tr.data('mime');
+ tr.attr('data-mime', mime);
+ if (id) {
tr.attr('data-id', id);
}
var path = getPathForPreview(name);
- lazyLoadPreview(path, mime, function(previewpath){
+ lazyLoadPreview(path, mime, function(previewpath) {
tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
tr.find('td.filename').draggable(dragOptions);
},
- isLoading:function(name){
- return $('tr').filterAttr('data-file',name).data('loading');
+ isLoading:function(name) {
+ return $('tr[data-file="'+name+'"]').data('loading');
},
- rename:function(name){
+ rename:function(oldname) {
var tr, td, input, form;
- tr=$('tr').filterAttr('data-file',name);
+ tr = $('tr[data-file="'+oldname+'"]');
tr.data('renaming',true);
- td=tr.children('td.filename');
- input=$('<input type="text" class="filename"/>').val(name);
- form=$('<form></form>');
+ td = tr.children('td.filename');
+ input = $('<input type="text" class="filename"/>').val(oldname);
+ form = $('<form></form>');
form.append(input);
td.children('a.name').hide();
td.append(form);
@@ -322,18 +325,29 @@ var FileList={
if (len === -1) {
len = input.val().length;
}
- input.selectRange(0,len);
-
- form.submit(function(event){
+ input.selectRange(0, len);
+
+ var checkInput = function () {
+ var filename = input.val();
+ if (filename !== oldname) {
+ if (!Files.isFileNameValid(filename)) {
+ // Files.isFileNameValid(filename) throws an exception itself
+ } else if($('#dir').val() === '/' && filename === 'Shared') {
+ throw t('files','Invalid name. Usage of \'Shared\' is reserved by ownCloud');
+ } else if (FileList.inList(filename)) {
+ throw t('files', '{new_name} already exists', {new_name: filename});
+ }
+ }
+ return true;
+ };
+
+ form.submit(function(event) {
event.stopPropagation();
event.preventDefault();
- var newname=input.val();
- if (!Files.isFileNameValid(newname)) {
- return false;
- } else if (newname != name) {
- if (FileList.checkName(name, newname, false)) {
- newname = name;
- } else {
+ try {
+ var newname = input.val();
+ if (newname !== oldname) {
+ checkInput();
// save background image, because it's replaced by a spinner while async request
var oldBackgroundImage = td.css('background-image');
// mark as loading
@@ -343,16 +357,16 @@ var FileList={
data: {
dir : $('#dir').val(),
newname: newname,
- file: name
+ file: oldname
},
success: function(result) {
if (!result || result.status === 'error') {
- OC.Notification.show(result.data.message);
- newname = name;
+ OC.dialogs.alert(result.data.message, t('core', 'Could not rename file'));
// revert changes
+ newname = oldname;
tr.attr('data-file', newname);
var path = td.children('a.name').attr('href');
- td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+ td.children('a.name').attr('href', path.replace(encodeURIComponent(oldname), encodeURIComponent(newname)));
if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
var basename=newname.substr(0,newname.lastIndexOf('.'));
} else {
@@ -360,7 +374,7 @@ var FileList={
}
td.find('a.name span.nametext').text(basename);
if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
- if (td.find('a.name span.extension').length === 0 ) {
+ if ( ! td.find('a.name span.extension').exists() ) {
td.find('a.name span.nametext').append('<span class="extension"></span>');
}
td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
@@ -368,70 +382,76 @@ var FileList={
tr.find('.fileactions').effect('highlight', {}, 5000);
tr.effect('highlight', {}, 5000);
}
+ // reinsert row
+ tr.detach();
+ FileList.insertElement( tr.attr('data-file'), tr.attr('data-type'),tr );
// remove loading mark and recover old image
td.css('background-image', oldBackgroundImage);
}
});
}
- }
- tr.data('renaming',false);
- tr.attr('data-file', newname);
- var path = td.children('a.name').attr('href');
- td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
- if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
- var basename=newname.substr(0,newname.lastIndexOf('.'));
- } else {
- var basename=newname;
- }
- td.find('a.name span.nametext').text(basename);
- if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
- if (td.find('a.name span.extension').length == 0 ) {
- td.find('a.name span.nametext').append('<span class="extension"></span>');
+ input.tipsy('hide');
+ tr.data('renaming',false);
+ tr.attr('data-file', newname);
+ var path = td.children('a.name').attr('href');
+ // FIXME this will fail if the path contains the filename.
+ td.children('a.name').attr('href', path.replace(encodeURIComponent(oldname), encodeURIComponent(newname)));
+ var basename = newname;
+ if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+ basename = newname.substr(0, newname.lastIndexOf('.'));
+ }
+ td.find('a.name span.nametext').text(basename);
+ if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+ if ( ! td.find('a.name span.extension').exists() ) {
+ td.find('a.name span.nametext').append('<span class="extension"></span>');
+ }
+ td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
}
- td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
+ form.remove();
+ td.children('a.name').show();
+ } catch (error) {
+ input.attr('title', error);
+ input.tipsy({gravity: 'w', trigger: 'manual'});
+ input.tipsy('show');
+ input.addClass('error');
}
- form.remove();
- td.children('a.name').show();
return false;
});
- input.keyup(function(event){
- if (event.keyCode == 27) {
+ input.keyup(function(event) {
+ // verify filename on typing
+ try {
+ checkInput();
+ input.tipsy('hide');
+ input.removeClass('error');
+ } catch (error) {
+ input.attr('title', error);
+ input.tipsy({gravity: 'w', trigger: 'manual'});
+ input.tipsy('show');
+ input.addClass('error');
+ }
+ if (event.keyCode === 27) {
+ input.tipsy('hide');
tr.data('renaming',false);
form.remove();
td.children('a.name').show();
}
});
- input.click(function(event){
+ input.click(function(event) {
event.stopPropagation();
event.preventDefault();
});
- input.blur(function(){
+ input.blur(function() {
form.trigger('submit');
});
},
- checkName:function(oldName, newName, isNewFile) {
- if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
- var html;
- if(isNewFile){
- html = t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span>&nbsp;<span class="cancel">'+t('files', 'cancel')+'</span>';
- }else{
- html = t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>';
- }
- html = $('<span>' + html + '</span>');
- html.attr('data-oldName', oldName);
- html.attr('data-newName', newName);
- html.attr('data-isNewFile', isNewFile);
- OC.Notification.showHtml(html);
- return true;
- } else {
- return false;
- }
+ inList:function(filename) {
+ return $('#fileList tr[data-file="'+filename+'"]').length;
},
replace:function(oldName, newName, isNewFile) {
// Finish any existing actions
- $('tr').filterAttr('data-file', oldName).hide();
- $('tr').filterAttr('data-file', newName).hide();
- var tr = $('tr').filterAttr('data-file', oldName).clone();
+ $('tr[data-file="'+oldName+'"]').hide();
+ $('tr[data-file="'+newName+'"]').hide();
+ var tr = $('tr[data-file="'+oldName+'"]').clone();
tr.attr('data-replace', 'true');
tr.attr('data-file', newName);
var td = tr.children('td.filename');
@@ -460,14 +480,14 @@ var FileList={
FileList.finishReplace();
};
if (!isNewFile) {
- OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
+ OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
}
},
finishReplace:function() {
if (!FileList.replaceCanceled && FileList.replaceOldName && FileList.replaceNewName) {
$.ajax({url: OC.filePath('files', 'ajax', 'rename.php'), async: false, data: { dir: $('#dir').val(), newname: FileList.replaceNewName, file: FileList.replaceOldName }, success: function(result) {
- if (result && result.status == 'success') {
- $('tr').filterAttr('data-replace', 'true').removeAttr('data-replace');
+ if (result && result.status === 'success') {
+ $('tr[data-replace="true"').removeAttr('data-replace');
} else {
OC.dialogs.alert(result.data.message, 'Error moving file');
}
@@ -478,12 +498,12 @@ var FileList={
}});
}
},
- do_delete:function(files){
- if(files.substr){
+ do_delete:function(files) {
+ if (files.substr) {
files=[files];
}
for (var i=0; i<files.length; i++) {
- var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
+ var deleteAction = $('tr[data-file="'+files[i]+'"]').children("td.date").children(".action.delete");
deleteAction.removeClass('delete-icon').addClass('progress-icon');
}
// Finish any existing actions
@@ -494,10 +514,10 @@ var FileList={
var fileNames = JSON.stringify(files);
$.post(OC.filePath('files', 'ajax', 'delete.php'),
{dir:$('#dir').val(),files:fileNames},
- function(result){
- if (result.status == 'success') {
- $.each(files,function(index,file){
- var files = $('tr').filterAttr('data-file',file);
+ function(result) {
+ if (result.status === 'success') {
+ $.each(files,function(index,file) {
+ var files = $('tr[data-file="'+file+'"]');
files.remove();
files.find('input[type="checkbox"]').removeAttr('checked');
files.removeClass('selected');
@@ -507,14 +527,14 @@ var FileList={
FileList.updateFileSummary();
} else {
$.each(files,function(index,file) {
- var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
+ var deleteAction = $('tr[data-file="'+files[i]+'"]').children("td.date").children(".action.delete");
deleteAction.removeClass('progress-icon').addClass('delete-icon');
});
}
});
},
createFileSummary: function() {
- if( $('#fileList tr').length > 0 ) {
+ if ( $('#fileList tr').exists() ) {
var totalDirs = 0;
var totalFiles = 0;
var totalSize = 0;
@@ -536,7 +556,7 @@ var FileList={
var infoVars = {
dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
files: '</span><span class="fileinfo">'+fileInfo+'</span>'
- }
+ };
var info = t('files', '{dirs} and {files}', infoVars);
@@ -618,10 +638,10 @@ var FileList={
}
}
},
- showMask: function(){
+ showMask: function() {
// in case one was shown before
var $mask = $('#content .mask');
- if ($mask.length){
+ if ($mask.exists()) {
return;
}
@@ -632,31 +652,31 @@ var FileList={
$('#content').append($mask);
// block UI, but only make visible in case loading takes longer
- FileList._maskTimeout = window.setTimeout(function(){
+ FileList._maskTimeout = window.setTimeout(function() {
// reset opacity
$mask.removeClass('transparent');
}, 250);
},
- hideMask: function(){
+ hideMask: function() {
var $mask = $('#content .mask').remove();
- if (FileList._maskTimeout){
+ if (FileList._maskTimeout) {
window.clearTimeout(FileList._maskTimeout);
}
},
scrollTo:function(file) {
//scroll to and highlight preselected file
- var scrolltorow = $('tr[data-file="'+file+'"]');
- if (scrolltorow.length > 0) {
- scrolltorow.addClass('searchresult');
- $(window).scrollTop(scrolltorow.position().top);
+ var $scrolltorow = $('tr[data-file="'+file+'"]');
+ if ($scrolltorow.exists()) {
+ $scrolltorow.addClass('searchresult');
+ $(window).scrollTop($scrolltorow.position().top);
//remove highlight when hovered over
- scrolltorow.one('hover', function(){
- scrolltorow.removeClass('searchresult');
+ $scrolltorow.one('hover', function() {
+ $scrolltorow.removeClass('searchresult');
});
}
},
- filter:function(query){
- $('#fileList tr:not(.summary)').each(function(i,e){
+ filter:function(query) {
+ $('#fileList tr:not(.summary)').each(function(i,e) {
if ($(e).data('file').toLowerCase().indexOf(query.toLowerCase()) !== -1) {
$(e).addClass("searchresult");
} else {
@@ -665,18 +685,18 @@ var FileList={
});
//do not use scrollto to prevent removing searchresult css class
var first = $('#fileList tr.searchresult').first();
- if (first.length !== 0) {
+ if (first.exists()) {
$(window).scrollTop(first.position().top);
}
},
- unfilter:function(){
- $('#fileList tr.searchresult').each(function(i,e){
+ unfilter:function() {
+ $('#fileList tr.searchresult').each(function(i,e) {
$(e).removeClass("searchresult");
});
}
};
-$(document).ready(function(){
+$(document).ready(function() {
var isPublic = !!$('#isPublic').val();
// handle upload events
@@ -686,16 +706,16 @@ $(document).ready(function(){
OC.Upload.log('filelist handle fileuploaddrop', e, data);
var dropTarget = $(e.originalEvent.target).closest('tr, .crumb');
- if(dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
+ if (dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
// remember as context
data.context = dropTarget;
var dir = dropTarget.data('file');
// if from file list, need to prepend parent dir
- if (dir){
+ if (dir) {
var parentDir = $('#dir').val() || '/';
- if (parentDir[parentDir.length - 1] != '/'){
+ if (parentDir[parentDir.length - 1] !== '/') {
parentDir += '/';
}
dir = parentDir + dir;
@@ -719,12 +739,12 @@ $(document).ready(function(){
OC.Upload.log('filelist handle fileuploadadd', e, data);
//finish delete if we are uploading a deleted file
- if(FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!==-1){
+ if (FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!==-1) {
FileList.finishDelete(null, true); //delete file before continuing
}
// add ui visualization to existing folder
- if(data.context && data.context.data('type') === 'dir') {
+ if (data.context && data.context.data('type') === 'dir') {
// add to existing folder
// update upload counter ui
@@ -734,7 +754,7 @@ $(document).ready(function(){
uploadtext.attr('currentUploads', currentUploads);
var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
- if(currentUploads === 1) {
+ if (currentUploads === 1) {
var img = OC.imagePath('core', 'loading.gif');
data.context.find('td.filename').attr('style','background-image:url('+img+')');
uploadtext.text(translatedText);
@@ -761,7 +781,7 @@ $(document).ready(function(){
}
var result=$.parseJSON(response);
- if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+ if (typeof result[0] !== 'undefined' && result[0].status === 'success') {
var file = result[0];
if (data.context && data.context.data('type') === 'dir') {
@@ -772,7 +792,7 @@ $(document).ready(function(){
currentUploads -= 1;
uploadtext.attr('currentUploads', currentUploads);
var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
- if(currentUploads === 0) {
+ if (currentUploads === 0) {
var img = OC.imagePath('core', 'filetypes/folder.png');
data.context.find('td.filename').attr('style','background-image:url('+img+')');
uploadtext.text(translatedText);
@@ -789,18 +809,18 @@ $(document).ready(function(){
} else {
// only append new file if dragged onto current dir's crumb (last)
- if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')){
+ if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')) {
return;
}
// add as stand-alone row to filelist
var size=t('files', 'Pending');
- if (data.files[0].size>=0){
+ if (data.files[0].size>=0) {
size=data.files[0].size;
}
var date=new Date();
var param = {};
- if ($('#publicUploadRequestToken').length) {
+ if ($('#publicUploadRequestToken').exists()) {
param.download_url = document.location.href + '&download&path=/' + $('#dir').val() + '/' + file.name;
}
//should the file exist in the list remove it
@@ -813,14 +833,14 @@ $(document).ready(function(){
data.context.attr('data-mime',file.mime).attr('data-id',file.id);
var permissions = data.context.data('permissions');
- if(permissions !== file.permissions) {
+ if (permissions !== file.permissions) {
data.context.attr('data-permissions', file.permissions);
data.context.data('permissions', file.permissions);
}
FileActions.display(data.context.find('td.filename'), true);
var path = getPathForPreview(file.name);
- lazyLoadPreview(path, file.mime, function(previewpath){
+ lazyLoadPreview(path, file.mime, function(previewpath) {
data.context.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
}
@@ -854,10 +874,10 @@ $(document).ready(function(){
});
$('#notification').hide();
- $('#notification').on('click', '.undo', function(){
+ $('#notification').on('click', '.undo', function() {
if (FileList.deleteFiles) {
- $.each(FileList.deleteFiles,function(index,file){
- $('tr').filterAttr('data-file',file).show();
+ $.each(FileList.deleteFiles,function(index,file) {
+ $('tr[data-file="'+file+'"]').show();
});
FileList.deleteCanceled=true;
FileList.deleteFiles=null;
@@ -867,10 +887,10 @@ $(document).ready(function(){
FileList.deleteCanceled = false;
FileList.deleteFiles = [FileList.replaceOldName];
} else {
- $('tr').filterAttr('data-file', FileList.replaceOldName).show();
+ $('tr[data-file="'+FileList.replaceOldName+'"]').show();
}
- $('tr').filterAttr('data-replace', 'true').remove();
- $('tr').filterAttr('data-file', FileList.replaceNewName).show();
+ $('tr[data-replace="true"').remove();
+ $('tr[data-file="'+FileList.replaceNewName+'"]').show();
FileList.replaceCanceled = true;
FileList.replaceOldName = null;
FileList.replaceNewName = null;
@@ -885,7 +905,7 @@ $(document).ready(function(){
});
});
$('#notification:first-child').on('click', '.suggest', function() {
- $('tr').filterAttr('data-file', $('#notification > span').attr('data-oldName')).show();
+ $('tr[data-file="'+$('#notification > span').attr('data-oldName')+'"]').show();
OC.Notification.hide();
});
$('#notification:first-child').on('click', '.cancel', function() {
@@ -895,67 +915,67 @@ $(document).ready(function(){
}
});
FileList.useUndo=(window.onbeforeunload)?true:false;
- $(window).bind('beforeunload', function (){
+ $(window).bind('beforeunload', function () {
if (FileList.lastAction) {
FileList.lastAction();
}
});
- $(window).unload(function (){
+ $(window).unload(function () {
$(window).trigger('beforeunload');
});
- function decodeQuery(query){
+ function decodeQuery(query) {
return query.replace(/\+/g, ' ');
}
- function parseHashQuery(){
+ function parseHashQuery() {
var hash = window.location.hash,
pos = hash.indexOf('?'),
query;
- if (pos >= 0){
+ if (pos >= 0) {
return hash.substr(pos + 1);
}
return '';
}
- function parseCurrentDirFromUrl(){
+ function parseCurrentDirFromUrl() {
var query = parseHashQuery(),
params,
dir = '/';
// try and parse from URL hash first
- if (query){
+ if (query) {
params = OC.parseQueryString(decodeQuery(query));
}
// else read from query attributes
- if (!params){
+ if (!params) {
params = OC.parseQueryString(decodeQuery(location.search));
}
return (params && params.dir) || '/';
}
// disable ajax/history API for public app (TODO: until it gets ported)
- if (!isPublic){
+ if (!isPublic) {
// fallback to hashchange when no history support
- if (!window.history.pushState){
- $(window).on('hashchange', function(){
+ if (!window.history.pushState) {
+ $(window).on('hashchange', function() {
FileList.changeDirectory(parseCurrentDirFromUrl(), false);
});
}
- window.onpopstate = function(e){
+ window.onpopstate = function(e) {
var targetDir;
- if (e.state && e.state.dir){
+ if (e.state && e.state.dir) {
targetDir = e.state.dir;
}
else{
// read from URL
targetDir = parseCurrentDirFromUrl();
}
- if (targetDir){
+ if (targetDir) {
FileList.changeDirectory(targetDir, false);
}
- }
+ };
- if (parseInt($('#ajaxLoad').val(), 10) === 1){
+ if (parseInt($('#ajaxLoad').val(), 10) === 1) {
// need to initially switch the dir to the one from the hash (IE8)
FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
}