Merge pull request #245 from owncloud/fileactions

some more reuse for fileactions
This commit is contained in:
Thomas Müller 2012-11-05 05:52:52 -08:00
commit 5c72d28ffd
1 changed files with 10 additions and 16 deletions

View File

@ -70,6 +70,13 @@ var FileActions = {
} }
parent.children('a.name').append('<span class="fileactions" />'); parent.children('a.name').append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions()); var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var actionHandler = function (parent, action, event) {
event.stopPropagation();
event.preventDefault();
FileActions.currentFile = parent;
file = FileActions.getCurrentFile();
action(file);
};
for (name in actions) { for (name in actions) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory // NOTE: Temporary fix to prevent rename action in root of Shared directory
if (name === 'Rename' && $('#dir').val() === '/Shared') { if (name === 'Rename' && $('#dir').val() === '/Shared') {
@ -87,14 +94,7 @@ var FileActions = {
html += t('files', name) + '</a>'; html += t('files', name) + '</a>';
var element = $(html); var element = $(html);
element.data('action', name); element.data('action', name);
element.click(function (event) { element.click(actionHandler.bind(null, parent, actions[name]));
FileActions.currentFile = $(this).parent().parent().parent();
event.stopPropagation();
event.preventDefault();
var action = actions[$(this).data('action')];
var currentFile = FileActions.getCurrentFile();
action(currentFile);
});
parent.find('a.name>span.fileactions').append(element); parent.find('a.name>span.fileactions').append(element);
} }
} }
@ -113,14 +113,8 @@ var FileActions = {
if (img) { if (img) {
element.append($('<img class ="svg" src="' + img + '"/>')); element.append($('<img class ="svg" src="' + img + '"/>'));
} }
element.data('action', 'Delete'); element.data('action', actions['Delete']);
element.click(function (event) { element.click(actionHandler.bind(null, parent, actions['Delete']));
event.stopPropagation();
event.preventDefault();
var action = actions[$(this).data('action')];
var currentFile = FileActions.getCurrentFile();
action(currentFile);
});
parent.parent().children().last().append(element); parent.parent().children().last().append(element);
} }
}, },