Skip to content

Commit

Permalink
v3.8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ctf0 committed Feb 10, 2021
1 parent 8485d0c commit c8f512a
Show file tree
Hide file tree
Showing 14 changed files with 324 additions and 321 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
- [install dependencies](https://github.com/ctf0/Laravel-Media-Manager/wiki/Packages-In-Use)

```bash
yarn add vue vue-ls vue-infinite-loading vue-image-compare2 vue-tippy@v2 vue2-filters vue-input-autowidth vue-notif vue-clipboard2 vue-awesome@v2 vue-touch@next vue-focuspoint-component axios dropzone cropperjs keycode lottie-web plyr fuse.js music-metadata-browser idb-keyval annyang
yarn add vue vue-ls vue-infinite-loading vue-image-compare2 vue-tippy@v2 vue2-filters vue-input-autowidth vue-notif vue-clipboard2 vue-awesome vue-touch@next vue-focuspoint-component axios dropzone cropperjs keycode lottie-web plyr fuse.js music-metadata-browser idb-keyval annyang
yarn add buffer process --dev
```

Expand Down
6 changes: 0 additions & 6 deletions logs/v3.8.0.txt

This file was deleted.

1 change: 1 addition & 0 deletions logs/v3.8.5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- update vue-awesome to v4, make sure to update it in your package.json
22 changes: 11 additions & 11 deletions src/resources/assets/js/components/globalSearch/button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@click.stop="done ? showSearchPanel() : init()">
<span class="icon">
<icon :spin="loading"
name="globe"/>
name="globe-americas"/>
</span>
</button>
</template>
Expand All @@ -16,8 +16,8 @@ export default {
props: ['route', 'isLoading', 'trans', 'showNotif'],
data() {
return {
loading: false,
done: false
loading : false,
done : false
}
},
mounted() {
Expand All @@ -30,15 +30,15 @@ export default {
this.loading = true
axios.get(this.route)
.then(({data}) => {
this.loading = false
this.done = true
EventHub.fire('global-search-index', data)
this.showNotif(this.trans('glbl_search_avail'))
.then(({data}) => {
this.loading = false
this.done = true
EventHub.fire('global-search-index', data)
this.showNotif(this.trans('glbl_search_avail'))
}).catch((err) => {
console.error(err)
})
}).catch((err) => {
console.error(err)
})
},
showSearchPanel() {
EventHub.fire('toggle-global-search', true)
Expand Down
40 changes: 20 additions & 20 deletions src/resources/assets/js/components/globalSearch/panel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
:title="trans('go_to_folder')">{{ item.dir_path }}</span>
</p>
<time>
<span class="icon"><icon name="clock-o"/></span>
<span class="icon"><icon name="regular/clock"/></span>
<span>{{ item.last_modified_formated }}</span>
</time>
<p class="subtitle is-marginless link"
Expand Down Expand Up @@ -107,9 +107,9 @@
<style scoped lang="scss" src="../../../sass/modules/global-search.scss"></style>

<script>
import debounce from 'lodash/debounce'
import debounce from 'lodash/debounce'
import VueInputAutowidth from 'vue-input-autowidth'
import panels from '../../mixins/panels'
import panels from '../../mixins/panels'
export default {
components: {
Expand All @@ -118,8 +118,8 @@ export default {
directives: {
VueInputAutowidth
},
mixins: [panels],
props: [
mixins : [panels],
props : [
'trans',
'fileTypeIs',
'noScroll',
Expand All @@ -129,20 +129,20 @@ export default {
],
data() {
return {
filesIndex: [],
filterdFilesList: [],
search: '',
noData: false,
linkCopied: false,
firstRun: false,
showPanel: false
filesIndex : [],
filterdFilesList : [],
search : '',
noData : false,
linkCopied : false,
firstRun : false,
showPanel : false
}
},
computed: {
fuseLib() {
return new Fuse(this.filesIndex, {
keys: ['name'],
threshold: 0.4
keys : ['name'],
threshold : 0.4
})
},
listCount() {
Expand Down Expand Up @@ -181,19 +181,19 @@ export default {
EventHub.fire('global-search-delete-item', item)
},
closePanel() {
this.search = ''
this.search = ''
this.showPanel = false
EventHub.fire('toggle-global-search', false)
},
goToFolder(dir, name) {
EventHub.fire('global-search-go-to-folder', {
dir: dir,
name: name
dir : dir,
name : name
})
this.closePanel()
},
getList: debounce(function () {
getList: debounce(function() {
let search = this.search
if (search) {
Expand All @@ -205,7 +205,7 @@ export default {
this.filterdFilesList = []
}, 500),
ontransitionend() {
this.noData = this.search && !this.listCount ? true : false
this.noData = this.search && !this.listCount ? true : false
this.firstRun = true
}
},
Expand All @@ -217,7 +217,7 @@ export default {
this.$nextTick(() => this.$refs.search.focus())
} else {
this.$nextTick(() => {
this.noData = false
this.noData = false
this.firstRun = false
})
}
Expand Down
64 changes: 32 additions & 32 deletions src/resources/assets/js/components/image/editor/controls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,52 +28,52 @@ export default {
return {
controlsList: [
{
trans: 'move',
op : 'move',
mode : 'move',
icon : 'arrows'
trans : 'move',
op : 'move',
mode : 'move',
icon : 'arrows-alt'
},
{
trans: 'crop',
op : 'crop',
mode : 'crop',
icon : 'crop'
trans : 'crop',
op : 'crop',
mode : 'crop',
icon : 'crop'
},
{
trans: 'crop_zoom_in',
op : 'zoom-in',
mode : null,
icon : 'search-plus'
trans : 'crop_zoom_in',
op : 'zoom-in',
mode : null,
icon : 'search-plus'
},
{
trans: 'crop_zoom_out',
op : 'zoom-out',
mode : null,
icon : 'search-minus'
trans : 'crop_zoom_out',
op : 'zoom-out',
mode : null,
icon : 'search-minus'
},
{
trans: 'crop_rotate_left',
op : 'rotate-left',
mode : null,
icon : 'rotate-left'
trans : 'crop_rotate_left',
op : 'undo',
mode : null,
icon : 'undo'
},
{
trans: 'crop_rotate_right',
op : 'rotate-right',
mode : null,
icon : 'rotate-right'
trans : 'crop_rotate_right',
op : 'redo',
mode : null,
icon : 'redo'
},
{
trans: 'crop_flip_horizontal',
op : 'flip-horizontal',
mode : null,
icon : 'arrows-h'
trans : 'crop_flip_horizontal',
op : 'flip-horizontal',
mode : null,
icon : 'arrows-alt-h'
},
{
trans: 'crop_flip_vertical',
op : 'flip-vertical',
mode : null,
icon : 'arrows-v'
trans : 'crop_flip_vertical',
op : 'flip-vertical',
mode : null,
icon : 'arrows-alt-v'
}
]
}
Expand Down
Loading

0 comments on commit c8f512a

Please sign in to comment.