Skip to content

Commit de26565

Browse files
alexusmaialexusmai
committed
Merge branch 'release/v2.4.7'
2 parents 1263867 + b3077a4 commit de26565

File tree

33 files changed

+1063
-885
lines changed

33 files changed

+1063
-885
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravel-file-manager",
3-
"version": "2.4.6",
3+
"version": "2.4.7",
44
"description": "File manager for Laravel",
55
"keywords": [
66
"laravel",

‎public/index.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
<meta name="viewport" content="width=device-width,initial-scale=1.0">
77
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
88
<title>new-file-manager</title>
9-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
10-
integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
11-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css"
12-
integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
9+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
1311
</head>
1412
<body>
1513
<noscript>
16-
<strong>We're sorry but file-manager doesn't work properly without JavaScript enabled. Please enable it to
17-
continue.</strong>
14+
<strong>
15+
We're sorry but file-manager doesn't work properly without JavaScript enabled. Please enable it to continue.
16+
</strong>
1817
</noscript>
1918
<div class="container">
2019
<div style="height: 800px;">

‎src/components/blocks/Navbar.vue‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@
7171
<i class="fas fa-paste"></i>
7272
</button>
7373
</div>
74+
<div class="btn-group" role="group">
75+
<button type="button" class="btn btn-secondary"
76+
v-bind:title="lang.btn.hidden"
77+
v-on:click="toggleHidden">
78+
<i class="fas" v-bind:class="[hiddenFiles ? 'fa-eye': 'fa-eye-slash']"></i>
79+
</button>
80+
</div>
7481
</div>
7582
<div class="col-auto text-right">
7683
<div class="btn-group" role="group">
@@ -179,6 +186,14 @@ export default {
179186
fullScreen() {
180187
return this.$store.state.fm.fullScreen;
181188
},
189+
190+
/**
191+
* Show or Hide hidden files
192+
* @returns {boolean}
193+
*/
194+
hiddenFiles() {
195+
return this.$store.state.fm.settings.hiddenFiles;
196+
},
182197
},
183198
methods: {
184199
/**
@@ -230,6 +245,13 @@ export default {
230245
this.$store.dispatch('fm/paste');
231246
},
232247
248+
/**
249+
* Set Hide or Show hidden files
250+
*/
251+
toggleHidden() {
252+
this.$store.commit('fm/settings/toggleHiddenFiles');
253+
},
254+
233255
/**
234256
* Show modal window
235257
* @param modalName

‎src/components/manager/mixins/manager.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ export default {
2424
* @returns {*}
2525
*/
2626
files() {
27-
return this.$store.state.fm[this.manager].files;
27+
return this.$store.getters[`fm/${this.manager}/files`];
2828
},
2929

3030
/**
3131
* Directories list for selected directory
3232
* @returns {*}
3333
*/
3434
directories() {
35-
return this.$store.state.fm[this.manager].directories;
35+
return this.$store.getters[`fm/${this.manager}/directories`];
3636
},
3737

3838
/**

‎src/components/modals/additions/Cropper.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
</button>
123123
</div>
124124
<span class="d-block">
125-
<button v-on:click="$emit('closeCropper')" class="btn btn-default">{{ lang.btn.back }}</button>
125+
<button v-on:click="$emit('closeCropper')" class="btn btn-light">{{ lang.btn.back }}</button>
126126
</span>
127127
</div>
128128
</div>

‎src/components/modals/views/Clipboard.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
v-bind:disabled="!clipboard.type"
6565
v-on:click="resetClipboard">{{ lang.btn.clear }}
6666
</button>
67-
<button class="btn btn-default" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
67+
<button class="btn btn-light" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
6868
</div>
6969
</div>
7070
</template>

‎src/components/modals/views/Delete.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="modal-footer">
1818
<button class="btn btn-danger" v-on:click="deleteItems">{{ lang.modal.delete.title }}
1919
</button>
20-
<button class="btn btn-default" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
20+
<button class="btn btn-light" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
2121
</div>
2222
</div>
2323
</template>

‎src/components/modals/views/NewFile.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
v-bind:disabled="!submitActive"
2525
v-on:click="addFile">{{ lang.btn.submit }}
2626
</button>
27-
<button class="btn btn-default" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
27+
<button class="btn btn-light" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
2828
</div>
2929
</div>
3030
</template>

‎src/components/modals/views/NewFolder.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
v-bind:disabled="!submitActive"
2525
v-on:click="addFolder">{{ lang.btn.submit }}
2626
</button>
27-
<button class="btn btn-default" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
27+
<button class="btn btn-light" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
2828
</div>
2929
</div>
3030
</template>

‎src/components/modals/views/Preview.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</button>
3232
</span>
3333
<span class="d-block">
34-
<button class="btn btn-default" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
34+
<button class="btn btn-light" v-on:click="hideModal">{{ lang.btn.cancel }}</button>
3535
</span>
3636
</div>
3737
</div>

0 commit comments

Comments
 (0)