Merge pull request #1626 from owncloud/share-indicator-position

Files: always show share action at the right
This commit is contained in:
Jan-Christoph Borchardt 2013-02-11 07:43:04 -08:00
commit 130f1006c1
1 changed files with 18 additions and 9 deletions

View File

@ -81,7 +81,7 @@ var FileActions = {
event.data.actionFunc(file);
};
$.each(actions, function (name, action) {
var addAction = function (name, action) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory
if (name === 'Rename' && $('#dir').val() === '/Shared') {
return true;
@ -92,7 +92,7 @@ var FileActions = {
if (img.call) {
img = img(file);
}
var html = '<a href="#" class="action" data-action="'+name+'">';
var html = '<a href="#" class="action" data-action="' + name + '">';
if (img) {
html += '<img class ="svg" src="' + img + '" /> ';
}
@ -101,11 +101,20 @@ var FileActions = {
var element = $(html);
element.data('action', name);
//alert(element);
element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
element.on('click', {a: null, elem: parent, actionFunc: actions[name]}, actionHandler);
parent.find('a.name>span.fileactions').append(element);
}
};
$.each(actions, function (name, action) {
if (name !== 'Share') {
addAction(name, action);
}
});
if(actions.Share){
addAction('Share', actions.Share);
}
if (actions['Delete']) {
var img = FileActions.icons['Delete'];
@ -122,7 +131,7 @@ var FileActions = {
element.append($('<img class ="svg" src="' + img + '"/>'));
}
element.data('action', actions['Delete']);
element.on('click',{a:null, elem:parent, actionFunc:actions['Delete']},actionHandler);
element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler);
parent.parent().children().last().append(element);
}
},
@ -155,7 +164,7 @@ $(document).ready(function () {
});
}
$('#fileList tr').each(function(){
$('#fileList tr').each(function () {
FileActions.display($(this).children('td.filename'));
});