mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-19 00:22:15 +00:00
Merge remote-tracking branch 'origin/folders_upload' into folder_upload_v2
# Conflicts: # composer.lock # config/language-translations.php # public/mix-manifest.json # resources/js/components/FilesView/DesktopToolbar.vue # resources/js/helpers.js # resources/js/store/modules/fileFunctions.js # src/Domain/Files/Actions/UploadFileAction.php # src/Domain/Files/Requests/UploadRequest.php # tests/Domain/Admin/AdminTest.php # tests/Domain/Files/FileTest.php # tests/Domain/Folders/FolderTest.php # tests/Domain/Sharing/VisitorManipulatingTest.php # tests/Domain/Traffic/TrafficTest.php # tests/Domain/Trash/TrashTest.php # tests/Domain/Zip/UserZippingTest.php
This commit is contained in:
@@ -1,23 +1,37 @@
|
||||
<template>
|
||||
<label for="file" class="menu-option group">
|
||||
<label class="menu-option group">
|
||||
<div class="icon-left group-hover-text-theme">
|
||||
<upload-cloud-icon size="17" class="group-hover-text-theme"/>
|
||||
<upload-cloud-icon v-if="type === 'file'" size="17" class="group-hover-text-theme"/>
|
||||
<folder-upload-icon v-if="type === 'folder'" size="17" class="group-hover-text-theme"/>
|
||||
</div>
|
||||
<div class="text-label group-hover-text-theme">
|
||||
{{ title }}
|
||||
<input
|
||||
@change="emmitFiles"
|
||||
v-show="false"
|
||||
id="file"
|
||||
type="file"
|
||||
name="files[]"
|
||||
multiple
|
||||
/>
|
||||
<input
|
||||
v-if="type === 'file'"
|
||||
@change="emmitFiles"
|
||||
v-show="false"
|
||||
id="file"
|
||||
type="file"
|
||||
name="files[]"
|
||||
multiple
|
||||
/>
|
||||
|
||||
<input
|
||||
v-if="type === 'folder'"
|
||||
@change="emmitFiles"
|
||||
v-show="false"
|
||||
id="folder"
|
||||
type="file"
|
||||
name="folders[]"
|
||||
webkitdirectory
|
||||
mozdirectory
|
||||
/>
|
||||
</div>
|
||||
</label>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import FolderUploadIcon from '/resources/js/components/FilesView/Icons/FolderUploadIcon'
|
||||
import {events} from '/resources/js/bus'
|
||||
import {
|
||||
UploadCloudIcon,
|
||||
@@ -26,10 +40,11 @@ import {
|
||||
export default {
|
||||
name: 'Option',
|
||||
props:[
|
||||
'title',
|
||||
'title', 'type'
|
||||
],
|
||||
components: {
|
||||
UploadCloudIcon,
|
||||
FolderUploadIcon,
|
||||
},
|
||||
methods: {
|
||||
emmitFiles(e) {
|
||||
@@ -71,12 +86,20 @@ import {
|
||||
.text-label {
|
||||
@include font-size(16);
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: $light_background;
|
||||
}
|
||||
}
|
||||
|
||||
.dark {
|
||||
|
||||
.menu-option {
|
||||
color: $dark_mode_text_primary;
|
||||
|
||||
&:hover {
|
||||
background: lighten($dark_mode_foreground, 2%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user