Skip to content

Commit a125983

Browse files
committed
Merge branch 'release/v2.4.8'
2 parents de26565 + d0c120f commit a125983

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import store from './path-to-your-store/store' // your Vuex store
2929
Vue.use(FileManager, {store})
3030
```
3131

32-
**ELSE** you need create new vuex instance
32+
**ELSE** you need to create a new vuex instance
3333

3434
```
3535
import Vue from 'vue';

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.7",
3+
"version": "2.4.8",
44
"description": "File manager for Laravel",
55
"keywords": [
66
"laravel",

src/components/modals/additions/Cropper.vue

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -244,23 +244,28 @@ export default {
244244
* Save cropped image
245245
*/
246246
cropSave() {
247-
this.cropper.getCroppedCanvas().toBlob((blob) => {
248-
const formData = new FormData();
249-
// add disk name
250-
formData.append('disk', this.$store.getters['fm/selectedDisk']);
251-
// add path
252-
formData.append('path', this.selectedItem.dirname);
253-
// new image
254-
formData.append('file', blob, this.selectedItem.basename);
247+
this.cropper.getCroppedCanvas().toBlob(
248+
(blob) => {
249+
const formData = new FormData();
250+
// add disk name
251+
formData.append('disk', this.$store.getters['fm/selectedDisk']);
252+
// add path
253+
formData.append('path', this.selectedItem.dirname);
254+
// new image
255+
formData.append('file', blob, this.selectedItem.basename);
255256
256-
this.$store.dispatch('fm/updateFile', formData).then((response) => {
257+
this.$store.dispatch('fm/updateFile', formData).then((response) => {
257258
// if file updated successfully
258-
if (response.data.result.status === 'success') {
259+
if (response.data.result.status === 'success') {
259260
// close cropper
260-
this.$emit('closeCropper');
261-
}
262-
});
263-
});
261+
this.$emit('closeCropper');
262+
}
263+
});
264+
},
265+
this.selectedItem.extension !== 'jpg'
266+
? `image/${this.selectedItem.extension}`
267+
: 'image/jpeg',
268+
);
264269
},
265270
},
266271
};

src/store/settings/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default {
2121
acl: null,
2222

2323
// App version
24-
version: '2.4.7',
24+
version: '2.4.8',
2525

2626
// axios headers
2727
headers: {},

0 commit comments

Comments
 (0)