diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
| commit | edd92e4c09151238a89816186914f9382293ab9b (patch) | |
| tree | e25d87cecf45ff2c2189198e5369f7754e01873a /core/js/oc-dialogs.js | |
| parent | 1348330c7d75d2b60d845a43be57dedc6199ea1a (diff) | |
| parent | 12f4494de02457d51004ca6a82c1b2160189819f (diff) | |
| download | nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.tar.gz nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.zip | |
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index b3b1958659f..4092b8d0746 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -123,10 +123,6 @@ var OCdialogs = { text: t('core', 'Choose'), click: functionToCall, defaultButton: true - }, - { - text: t('core', 'Cancel'), - click: function(){self.$filePicker.ocdialog('close'); } }]; self.$filePicker.ocdialog({ |