Skip to content

Commit f57ee0e

Browse files
infograf768infograf768
authored
Merge branch '4.0-dev' into menu-overview-component-filter
2 parents 43bb5c1 + 496ab29 commit f57ee0e

File tree

10 files changed

+66
-80
lines changed

10 files changed

+66
-80
lines changed

‎administrator/components/com_media/package-lock.json‎

Lines changed: 24 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎administrator/components/com_media/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"file-saver": "^1.3.3",
1414
"vue": "^2.5.17",
15-
"vue-focus": "^2.1.0",
15+
"vue-focus-lock": "^1.3.0",
1616
"vuex": "^2.5.0",
1717
"vuex-persistedstate": "^2.4.2"
1818
},

‎administrator/components/com_media/resources/scripts/components/browser/items/image.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
:aria-label="translate('COM_MEDIA_ACTION_EDIT')" @keyup.enter="editItem()" @keyup.space="editItem()"
5656
@focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
5757
@keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionShare.focus()">
58-
<span class="image-browser-action fa fa-pencil" aria-hidden="true" @click.stop="editItem()"></span>
58+
<span class="image-browser-action fa fa-edit" aria-hidden="true" @click.stop="editItem()"></span>
5959
</button>
6060
</li>
6161
<li>
@@ -114,7 +114,7 @@
114114
/* Opening confirm delete modal */
115115
openConfirmDeleteModal(){
116116
this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
117-
this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
117+
this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
118118
this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
119119
},
120120
/* Rename an item */

‎administrator/components/com_media/resources/scripts/components/browser/items/video.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@
9090
this.$store.commit(types.SHOW_PREVIEW_MODAL);
9191
this.$store.dispatch('getFullContents', this.item);
9292
},
93-
/* Preview an item */
94-
download() {
95-
this.$store.dispatch('download', this.item);
96-
},
93+
/* Preview an item */
94+
download() {
95+
this.$store.dispatch('download', this.item);
96+
},
9797
/* Opening confirm delete modal */
9898
openConfirmDeleteModal(){
99-
this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
100-
this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
101-
this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
99+
this.$store.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
100+
this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
101+
this.$store.commit(types.SHOW_CONFIRM_DELETE_MODAL);
102102
},
103103
/* Rename an item */
104104
openRenameModal() {

‎administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="form-group">
77
<label for="folder">{{ translate('COM_MEDIA_FOLDER_NAME') }}</label>
88
<input id="folder" class="form-control"
9-
v-focus="true" v-model.trim="folder" @input="folder = $event.target.value"
9+
v-model.trim="folder" @input="folder = $event.target.value"
1010
required autocomplete="off">
1111
</div>
1212
</form>
@@ -21,11 +21,9 @@
2121

2222
<script>
2323
import * as types from "./../../store/mutation-types";
24-
import {focus} from 'vue-focus';
2524
2625
export default {
2726
name: 'media-create-folder-modal',
28-
directives: {focus: focus},
2927
data() {
3028
return {
3129
folder: '',

‎administrator/components/com_media/resources/scripts/components/modals/modal.vue‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<template>
22
<div class="media-modal-backdrop" @click="close()">
33
<div class="modal" @click.stop style="display: flex">
4-
<slot name="backdrop-close"></slot>
5-
<div class="modal-dialog" :class="modalClass" role="alertdialog">
6-
<div class="modal-content">
7-
<div class="modal-header">
8-
<slot name="header"></slot>
9-
<button type="button" v-if="showClose" class="close" @click="close()"
10-
aria-label="Close">
11-
<span aria-hidden="true">&times;</span>
12-
</button>
13-
</div>
14-
<div class="modal-body">
15-
<slot name="body"></slot>
16-
</div>
17-
<div class="modal-footer">
18-
<slot name="footer"></slot>
19-
</div>
20-
</div>
21-
</div>
4+
<tab-lock>
5+
<slot name="backdrop-close"></slot>
6+
<div class="modal-dialog" :class="modalClass" role="alertdialog">
7+
<div class="modal-content">
8+
<div class="modal-header">
9+
<slot name="header"></slot>
10+
<button type="button" v-if="showClose" class="close" @click="close()"
11+
aria-label="Close">
12+
<span aria-hidden="true">&times;</span>
13+
</button>
14+
</div>
15+
<div class="modal-body">
16+
<slot name="body"></slot>
17+
</div>
18+
<div class="modal-footer">
19+
<slot name="footer"></slot>
20+
</div>
21+
</div>
22+
</div>
23+
</tab-lock>
2224
</div>
2325
</div>
2426
</template>
2527

2628
<script>
27-
import * as types from "./../../store/mutation-types";
28-
2929
export default {
3030
name: 'media-modal',
3131
props: {
@@ -68,4 +68,4 @@
6868
document.removeEventListener('keydown', this.onKeyDown);
6969
},
7070
}
71-
</script>
71+
</script>

‎administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<label for="name">{{ translate('COM_MEDIA_NAME') }}</label>
88
<div :class="{'input-group': extension.length}">
99
<input id="name" class="form-control" placeholder="Name"
10-
v-focus="true" v-model.trim="name" @input="name = $event.target.value"
10+
v-model.trim="name" @input="name = $event.target.value"
1111
required autocomplete="off">
1212
<span class="input-group-addon" v-if="extension.length">{{extension }}</span>
1313
</div>
@@ -24,11 +24,9 @@
2424

2525
<script>
2626
import * as types from "./../../store/mutation-types";
27-
import {focus} from 'vue-focus';
2827
2928
export default {
3029
name: 'media-rename-modal',
31-
directives: {focus: focus},
3230
data() {
3331
return {
3432
originalName: '',

‎administrator/components/com_media/resources/scripts/mediamanager.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import Infobar from "./components/infobar/infobar.vue";
1919
import Upload from "./components/upload/upload.vue";
2020
import Translate from "./plugins/translate";
2121
import store from './store/store';
22+
import Lock from 'vue-focus-lock';
2223

2324
// Add the plugins
2425
Vue.use(Translate);
@@ -40,6 +41,7 @@ Vue.component('media-share-modal', ShareModal);
4041
Vue.component('media-confirm-delete-modal', ConfirmDeleteModal);
4142
Vue.component('media-infobar', Infobar);
4243
Vue.component('media-upload', Upload);
44+
Vue.component('tab-lock', Lock);
4345

4446
// Register MediaManager namespace
4547
window.MediaManager = window.MediaManager || {};

‎administrator/templates/atum/html/layouts/chromes/well.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<?php if ($canEdit || $canChange) : ?>
4242
<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
4343
<div class="module-actions dropdown">
44-
<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdownMenuButton-<?php echo $id; ?>">
44+
<button type="button" class="btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdownMenuButton-<?php echo $id; ?>">
4545
<span class="fa fa-cog"><span class="sr-only">
4646
<?php echo Text::_('JACTION_EDIT') . ' ' . $module->title; ?>
4747
</span></span>

0 commit comments

Comments
 (0)