aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/oc-dialogs.js
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2013-08-19 11:24:17 +0200
committerGeorg Ehrke <developer@georgehrke.com>2013-08-19 11:24:17 +0200
commitf2702ff1ca45d72300eed5dfa58ebc19aa6e9910 (patch)
treeb1424be17877cbd25bf3781600d353efd3dd0759 /core/js/oc-dialogs.js
parent7e4dcd268f6cb6618600718a51c4d882e9027829 (diff)
parent9be836814cb4165ea54a086a0f97526d783bcd37 (diff)
downloadnextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.tar.gz
nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.zip
Merge master into oc_preview
Diffstat (limited to 'core/js/oc-dialogs.js')
-rw-r--r--core/js/oc-dialogs.js4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f4bc174b5eb..5cbc8359d52 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -117,10 +117,6 @@ var OCdialogs = {
text: t('core', 'Choose'),
click: functionToCall,
defaultButton: true
- },
- {
- text: t('core', 'Cancel'),
- click: function(){self.$filePicker.ocdialog('close'); }
}];
self.$filePicker.ocdialog({