summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-01-14 11:24:02 -0800
committerLukas Reschke <lukas@statuscode.ch>2013-01-14 11:24:02 -0800
commit9eb16e06f70011d93d02e3b80e786cbd4a3dffef (patch)
treecc54b7e10bbc3d789cea6b4fd55103caa42d82e0
parentfa78fbe0c3e281c91468bee92c871be7b1e48c79 (diff)
parent780fb37758ac16fc8d9eacee99dda8a80c88921f (diff)
downloadnextcloud-server-9eb16e06f70011d93d02e3b80e786cbd4a3dffef.tar.gz
nextcloud-server-9eb16e06f70011d93d02e3b80e786cbd4a3dffef.zip
Merge pull request #1135 from owncloud/allow_default_click_behaviour
allow default click behaviour
-rw-r--r--apps/files/js/files.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index bb298431e84..a4260c43285 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -87,8 +87,8 @@ $(document).ready(function() {
// Sets the file link behaviour :
$('td.filename a').live('click',function(event) {
- event.preventDefault();
if (event.ctrlKey || event.shiftKey) {
+ event.preventDefault();
if (event.shiftKey) {
var last = $(lastChecked).parent().parent().prevAll().length;
var first = $(this).parent().parent().prevAll().length;
@@ -130,6 +130,7 @@ $(document).ready(function() {
var permissions = $(this).parent().parent().data('permissions');
var action=FileActions.getDefault(mime,type, permissions);
if(action){
+ event.preventDefault();
action(filename);
}
}