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

Merge pull request #418 from libasys/Fix-IE8-fileactions-binding 

Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
This commit is contained in:
Thomas Müller 2012-11-23 02:16:21 -08:00
parent 3688376a6f eda9ce4cf8
commit 97ed467224
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,34 +70,43 @@ 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) {
var actionHandler = function (event) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
FileActions.currentFile = parent;
file = FileActions.getCurrentFile(); FileActions.currentFile = event.data.elem;
action(file); var file = FileActions.getCurrentFile();
event.data.actionFunc(file);
}; };
for (name in actions) {
$.each(actions, function (name, action) {
// 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') {
continue; return true;
} }
if ((name === 'Download' || actions[name] !== defaultAction) && name !== 'Delete') {
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name]; var img = FileActions.icons[name];
if (img.call) { if (img.call) {
img = img(file); img = img(file);
} }
var html = '<a href="#" class="action" data-action="'+name+'">'; var html = '<a href="#" class="action" data-action="'+name+'">';
if (img) { if (img) {
html += '<img class ="svg" src="' + img + '"/> '; html += '<img class ="svg" src="' + img + '" /> ';
} }
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(actionHandler.bind(null, parent, actions[name])); //alert(element);
element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
parent.find('a.name>span.fileactions').append(element); parent.find('a.name>span.fileactions').append(element);
} }
}
});
if (actions['Delete']) { if (actions['Delete']) {
var img = FileActions.icons['Delete']; var img = FileActions.icons['Delete'];
if (img.call) { if (img.call) {
@ -114,7 +123,7 @@ var FileActions = {
element.append($('<img class ="svg" src="' + img + '"/>')); element.append($('<img class ="svg" src="' + img + '"/>'));
} }
element.data('action', actions['Delete']); element.data('action', actions['Delete']);
element.click(actionHandler.bind(null, parent, actions['Delete'])); element.on('click',{a:null, elem:parent, actionFunc:actions['Delete']},actionHandler);
parent.parent().children().last().append(element); parent.parent().children().last().append(element);
} }
}, },