Skip to content

Commit 17ba7f9

Browse files
alexusmaialexusmai
committed
Merge tag 'v2.5.0' into develop
2 parents c29c6e8 + bf8573d commit 17ba7f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2249
-3752
lines changed

‎.eslintrc.js‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,27 @@ module.exports = {
1111
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1212
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1313
'no-param-reassign': [
14-
"error",
14+
'error',
1515
{
16-
"props": true,
17-
"ignorePropertyModificationsFor": [
18-
"state",
19-
"acc",
20-
"e",
21-
"ctx",
22-
"req",
23-
"request",
24-
"res",
25-
"response",
26-
"$scope"
27-
]
28-
}
16+
'props': true,
17+
'ignorePropertyModificationsFor': [
18+
'state',
19+
'acc',
20+
'e',
21+
'ctx',
22+
'req',
23+
'request',
24+
'res',
25+
'response',
26+
'$scope',
27+
],
28+
},
2929
],
3030
'max-len': 'off',
31+
'vue/no-use-v-if-with-v-for': [
32+
'error', {
33+
'allowUsingIterationVar': true,
34+
}],
3135
},
3236
parserOptions: {
3337
parser: 'babel-eslint',

‎README.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,4 @@ MIX_LFM_BASE_URL=http://my-url.loc/file-manager/
142142
MIX_LFM_CSRF_TOKEN=OFF
143143
```
144144

145-
Warning! Package use axios (Promise) - use babel-polyfill for ie11
146-
147-
## Contributors
148-
149-
[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/0)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/0)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/1)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/1)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/2)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/2)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/3)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/3)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/4)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/4)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/5)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/5)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/6)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/6)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/7)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/7)
145+
Warning! Package use axios (Promise) - use babel-polyfill for ie11

‎babel.config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module.exports = {
22
presets: [
3-
[ '@vue/app', {
4-
useBuiltIns: 'entry'
5-
}]
3+
'@vue/cli-plugin-babel/preset',
64
],
75
};

‎package.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravel-file-manager",
3-
"version": "2.4.14",
3+
"version": "2.5.0",
44
"description": "File manager for Laravel",
55
"keywords": [
66
"laravel",
@@ -18,26 +18,27 @@
1818
"test:unit": "vue-cli-service test:unit"
1919
},
2020
"dependencies": {
21-
"axios": "^0.18.0",
22-
"codemirror": "^5.41.0",
21+
"axios": "^0.19.2",
22+
"codemirror": "^5.55.0",
23+
"core-js": "^3.6.5",
2324
"cropperjs": "^1.4.3",
24-
"plyr": "^3.4.7",
25-
"vue": "^2.5.17",
26-
"vue-codemirror": "^4.0.5",
27-
"vuex": "^3.0.1"
25+
"plyr": "^3.4.8",
26+
"vue": "^2.6.11",
27+
"vue-codemirror": "^4.0.6",
28+
"vuex": "^3.4.0"
2829
},
2930
"devDependencies": {
30-
"@vue/cli-plugin-babel": "^3.0.5",
31-
"@vue/cli-plugin-eslint": "^3.0.5",
32-
"@vue/cli-plugin-unit-jest": "^3.0.5",
33-
"@vue/cli-service": "^3.0.5",
34-
"@vue/eslint-config-airbnb": "^3.0.5",
35-
"@vue/test-utils": "^1.0.0-beta.20",
36-
"babel-core": "7.0.0-bridge.0",
37-
"babel-jest": "^23.0.1",
38-
"babel-polyfill": "^6.26.0",
39-
"node-sass": "^4.9.0",
40-
"sass-loader": "^7.0.1",
41-
"vue-template-compiler": "^2.5.17"
31+
"@vue/cli-plugin-babel": "~4.4.6",
32+
"@vue/cli-plugin-eslint": "~4.4.6",
33+
"@vue/cli-plugin-vuex": "~4.4.6",
34+
"@vue/cli-service": "~4.4.6",
35+
"@vue/eslint-config-airbnb": "^5.0.2",
36+
"babel-eslint": "^10.1.0",
37+
"eslint": "^6.8.0",
38+
"eslint-plugin-import": "^2.22.0",
39+
"eslint-plugin-vue": "^6.2.2",
40+
"node-sass": "^4.14.1",
41+
"sass-loader": "^8.0.2",
42+
"vue-template-compiler": "^2.6.11"
4243
}
4344
}

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</strong>
1717
</noscript>
1818
<div class="container">
19-
<div style="height: 400px;">
19+
<div style="height: 600px;">
2020
<div id="fm"></div>
2121
</div>
2222
</div>

‎src/FileManager.vue‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<template>
22
<div class="fm d-flex flex-column"
33
v-bind:class="{ 'fm-full-screen': fullScreen }">
4-
<navbar></navbar>
4+
<navbar/>
55
<div class="fm-body">
6-
<notification></notification>
7-
<context-menu></context-menu>
8-
<modal v-if="showModal"></modal>
6+
<notification/>
7+
<context-menu/>
8+
<modal v-if="showModal"/>
99
<template v-if="windowsConfig === 1">
10-
<left-manager class="col" manager="left"></left-manager>
10+
<left-manager class="col" manager="left"/>
1111
</template>
1212
<template v-else-if="windowsConfig === 2">
13-
<folder-tree class="col-4 col-md-3"></folder-tree>
14-
<left-manager class="col-8 col-md-9" manager="left"></left-manager>
13+
<folder-tree class="col-4 col-md-3"/>
14+
<left-manager class="col-8 col-md-9" manager="left"/>
1515
</template>
1616
<template v-else-if="windowsConfig === 3">
1717
<left-manager class="col-12 col-sm-6"
@@ -26,7 +26,7 @@
2626
</right-manager>
2727
</template>
2828
</div>
29-
<info-block></info-block>
29+
<info-block/>
3030
</div>
3131
</template>
3232

@@ -105,10 +105,10 @@ export default {
105105
},
106106
computed: {
107107
...mapState('fm', {
108-
windowsConfig: state => state.settings.windowsConfig,
109-
activeManager: state => state.settings.activeManager,
110-
showModal: state => state.modal.showModal,
111-
fullScreen: state => state.settings.fullScreen,
108+
windowsConfig: (state) => state.settings.windowsConfig,
109+
activeManager: (state) => state.settings.activeManager,
110+
showModal: (state) => state.modal.showModal,
111+
fullScreen: (state) => state.settings.fullScreen,
112112
}),
113113
},
114114
methods: {
@@ -297,4 +297,3 @@ export default {
297297
padding-bottom: 0;
298298
}
299299
</style>
300-

‎src/components/blocks/ContextMenu.vue‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
v-bind:key="`i-${index}`"
1313
v-if="showMenuItem(item.name)"
1414
v-on:click="menuAction(item.name)">
15-
<i class="fa-fw" v-bind:class="item.icon"></i>
15+
<i class="fa-fw" v-bind:class="item.icon"/>
1616
{{ lang.contextMenu[item.name] }}
1717
</li>
1818
</ul>
@@ -21,7 +21,7 @@
2121

2222
<script>
2323
/* eslint-disable no-param-reassign */
24-
import EventBus from './../../eventBus';
24+
import EventBus from '../../eventBus';
2525
import translate from '../../mixins/translate';
2626
import contextMenu from './mixins/contextMenu';
2727
import contextMenuRules from './mixins/contextMenuRules';
@@ -44,7 +44,7 @@ export default {
4444
* Listen events
4545
* 'contextMenu'
4646
*/
47-
EventBus.$on('contextMenu', event => this.showMenu(event));
47+
EventBus.$on('contextMenu', (event) => this.showMenu(event));
4848
},
4949
computed: {
5050
/**
@@ -148,6 +148,10 @@ export default {
148148
box-shadow: 3px 2px 5px gray;
149149
border-radius: 5px;
150150
151+
&:focus {
152+
outline: none;
153+
}
154+
151155
.list-unstyled {
152156
margin-bottom: 0;
153157
border-bottom: 1px solid rgba(0,0,0,.125);

‎src/components/blocks/InfoBlock.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@
2525
</div>
2626
<div class="col-auto text-right">
2727
<span v-show="loadingSpinner">
28-
<i class="fas fa-spinner fa-pulse"></i>
28+
<i class="fas fa-spinner fa-pulse"/>
2929
</span>
3030
<span v-show="clipboardType"
3131
v-on:click="showModal('Clipboard')"
3232
v-bind:title="[ lang.clipboard.title + ' - ' + lang.clipboard[clipboardType] ]">
33-
<i class="far fa-clipboard"></i>
33+
<i class="far fa-clipboard"/>
3434
</span>
3535
<span v-on:click="showModal('Status')"
3636
v-bind:class="[hasErrors ? 'text-danger' : 'text-success']"
3737
v-bind:title="lang.modal.status.title">
38-
<i class="fas fa-info-circle"></i>
38+
<i class="fas fa-info-circle"/>
3939
</span>
4040
</div>
4141
</div>
4242
</template>
4343

4444
<script>
45-
import translate from './../../mixins/translate';
46-
import helper from './../../mixins/helper';
45+
import translate from '../../mixins/translate';
46+
import helper from '../../mixins/helper';
4747
4848
export default {
4949
name: 'InfoBlock',

0 commit comments

Comments
 (0)