summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-09-01 14:36:33 +0200
committerVincent Petry <pvince81@owncloud.com>2013-09-13 19:59:15 +0200
commit611075bf206555cf011b5fb70e117c93040e9027 (patch)
treea9257527ce53fd82a992a1b15b8729c46bc31712 /apps
parent3cf0820d3507349fa2d518c24579d8605db7cd2e (diff)
downloadnextcloud-server-611075bf206555cf011b5fb70e117c93040e9027.tar.gz
nextcloud-server-611075bf206555cf011b5fb70e117c93040e9027.zip
Fixed JS error in trashbin app
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/files.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7aef8ea1d11..c2418cfa751 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -182,6 +182,10 @@ Files={
}
};
$(document).ready(function() {
+ // FIXME: workaround for trashbin app
+ if (window.trashBinApp){
+ return;
+ }
Files.displayEncryptionWarning();
Files.bindKeyboardShortcuts(document, jQuery);