diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index ea3522cb10103a51953b05ae070b2349fb942f69..f4e7b7723f698436496fd6afc0977fef14c1f6c9 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -1,4 +1,4 @@ -FileActions={ +var FileActions={ actions:{}, defaults:{}, icons:{}, @@ -20,20 +20,20 @@ FileActions={ get:function(mime,type,permissions){ var actions={}; if(FileActions.actions.all){ - actions=$.extend( actions, FileActions.actions.all ) + actions=$.extend( actions, FileActions.actions.all ); } if(mime){ if(FileActions.actions[mime]){ - actions=$.extend( actions, FileActions.actions[mime] ) + actions=$.extend( actions, FileActions.actions[mime] ); } var mimePart=mime.substr(0,mime.indexOf('/')); if(FileActions.actions[mimePart]){ - actions=$.extend( actions, FileActions.actions[mimePart] ) + actions=$.extend( actions, FileActions.actions[mimePart] ); } } if(type){//type is 'dir' or 'file' if(FileActions.actions[type]){ - actions=$.extend( actions, FileActions.actions[type] ) + actions=$.extend( actions, FileActions.actions[type] ); } } var filteredActions = {}; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e0cf516411a933713513cdd9bc3f5d6e6148d755..85e5cfb14c2426dfbf44f73c4465fd0096732f20 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1,4 +1,4 @@ -FileList={ +var FileList={ useUndo:true, update:function(fileListHtml) { $('#fileList').empty().html(fileListHtml); @@ -14,7 +14,7 @@ FileList={ var extension=false; } html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />'; - html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '<').replace(/>/, '>')+'/'+name+'"><span class="nametext">'+basename + html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '<').replace(/>/, '>')+'/'+name+'"><span class="nametext">'+basename; if(extension){ html+='<span class="extension">'+extension+'</span>'; } diff --git a/core/js/js.js b/core/js/js.js index 7ce349a2147b78f24d18aa45593b09fab307c5d7..8b9ecd38dc20e875fc44695b0da2d3fa8b56cd39 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -4,6 +4,8 @@ * @param text the string to translate * @return string */ +var OC; + function t(app,text){ if( !( app in t.cache )){ $.ajax(OC.filePath('core','ajax','translations.php'),{