diff options
| author | Christopher <kondou@ts.unde.re> | 2013-09-02 19:36:03 -0700 |
|---|---|---|
| committer | Christopher <kondou@ts.unde.re> | 2013-09-02 19:36:03 -0700 |
| commit | a7de0e965298822f071c3137ca925d1920c03a27 (patch) | |
| tree | 12ee5d5f9036b6af45be214ce8d3c048675ec1da /core | |
| parent | 431cf06e996dad7af99b4c65678e5793bd682850 (diff) | |
| parent | 53a7f80ac3e5cf07db6ca01b048f2a25a526eb83 (diff) | |
| download | nextcloud-server-a7de0e965298822f071c3137ca925d1920c03a27.tar.gz nextcloud-server-a7de0e965298822f071c3137ca925d1920c03a27.zip | |
Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/oc-dialogs.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 4092b8d0746..6b768641586 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -77,7 +77,7 @@ var OCdialogs = { self.$filePicker = $tmpl.octemplate({ dialog_name: dialog_name, title: title - }).data('path', ''); + }).data('path', '').data('multiselect', multiselect).data('mimetype', mimetype_filter); if (modal === undefined) { modal = false; @@ -100,7 +100,7 @@ var OCdialogs = { self._handlePickerClick(event, $(this)); }); self._fillFilePicker(''); - }).data('multiselect', multiselect).data('mimetype',mimetype_filter); + }); // build buttons var functionToCall = function() { |