Skip to content

Make possible to pick both files and folders #10936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 4 commits into from
Aug 30, 2018
Merged

Make possible to pick both files and folders #10936

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4508a12
Prevent default action from being executed when the button is disabled
danxuliu Aug 30, 2018
66f2b15
Fix empty mime type filter
danxuliu Aug 30, 2018
f080fa5
Store the mime type filter always as an array
danxuliu Aug 30, 2018
c14c6e5
Make possible to pick both files and folders
danxuliu Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Store the mime type filter always as an array 
This will make easier to check if both directories and files should be
pickable.

This also removes an unused assignment to the mime type.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Aug 30, 2018
commit f080fa55ac606b498e3e1144a5fb58513e7ad1a3
17 changes: 11 additions & 6 deletions core/js/oc-dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,14 @@ var OCdialogs = {
if(self.$filePicker) {
self.$filePicker.ocdialog('close');
}

if (mimetypeFilter === undefined || mimetypeFilter === null) {
mimetypeFilter = [];
}
if (typeof(mimetypeFilter) === "string") {
mimetypeFilter = [mimetypeFilter];
}

self.$filePicker = $tmpl.octemplate({
dialog_name: dialogName,
title: title,
Expand All @@ -218,9 +226,6 @@ var OCdialogs = {
if (multiselect === undefined) {
multiselect = false;
}
if (mimetypeFilter === undefined) {
mimetypeFilter = '';
}

$('body').append(self.$filePicker);

Expand Down Expand Up @@ -315,7 +320,7 @@ var OCdialogs = {
// Hence this is one of the approach to get the choose button.
var getOcDialog = self.$filePicker.closest('.oc-dialog');
var buttonEnableDisable = getOcDialog.find('.primary');
if (self.$filePicker.data('mimetype') === "httpd/unix-directory") {
if (self.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1) {
buttonEnableDisable.prop("disabled", false);
} else {
buttonEnableDisable.prop("disabled", true);
Expand Down Expand Up @@ -939,7 +944,7 @@ var OCdialogs = {
var getOcDialog = (event.target).closest('.oc-dialog');
var buttonEnableDisable = $('.primary', getOcDialog);
this._changeButtonsText(type, dir.split(/[/]+/).pop());
if (this.$filePicker.data('mimetype') === "httpd/unix-directory") {
if (this.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1) {
buttonEnableDisable.prop("disabled", false);
} else {
buttonEnableDisable.prop("disabled", true);
Expand All @@ -960,7 +965,7 @@ var OCdialogs = {
} else if ( $element.data('type') === 'dir' ) {
this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'));
this._changeButtonsText(type, $element.data('entryname'));
if (this.$filePicker.data('mimetype') === "httpd/unix-directory") {
if (this.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1) {
buttonEnableDisable.prop("disabled", false);
} else {
buttonEnableDisable.prop("disabled", true);
Expand Down