Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions resources/js/bootstrap/components.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Vue from 'vue'
import vSelect from 'vue-select'
import AssetManager from '../components/assets/AssetManager.vue';
import AssetEditor from '../components/assets/Editor/Editor.vue';
import Browser from '../components/assets/Browser/Browser.vue';
import UpdatesBadge from '../components/UpdatesBadge.vue';
import Container from '../components/publish/Container.vue';
Expand Down Expand Up @@ -71,6 +72,7 @@ Vue.component('v-select', vSelect)
// Core
Vue.component('asset-manager', AssetManager);
Vue.component('asset-browser', Browser);
Vue.component('asset-editor', AssetEditor);
Vue.component('updates-badge', UpdatesBadge);

// Publish
Expand Down
2 changes: 0 additions & 2 deletions resources/js/components/assets/Browser/Browser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@

<script>
import AssetThumbnail from './Thumbnail.vue';
import AssetEditor from '../Editor/Editor.vue';
import Breadcrumbs from './Breadcrumbs.vue';
import CreateFolder from './CreateFolder.vue';
import HasPagination from '../../data-list/HasPagination';
Expand All @@ -300,7 +299,6 @@ export default {

components: {
AssetThumbnail,
AssetEditor,
Breadcrumbs,
Uploader,
Uploads,
Expand Down
6 changes: 0 additions & 6 deletions resources/js/components/fieldtypes/assets/Asset.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import AssetEditor from '../../assets/Editor/Editor.vue';

export default {

components: {
AssetEditor
},

props: {
asset: Object,
readOnly: Boolean,
Expand Down
15 changes: 12 additions & 3 deletions resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
append-to="body"
>
<div class="asset-grid-listing border dark:border-dark-900 rounded overflow-hidden" :class="{ 'rounded-t-none': !isReadOnly && (showPicker || uploads.length) }" ref="assets">
<asset-tile
<asset-tile :is="assetTileComponent"
v-for="asset in assets"
:key="asset.id"
:asset="asset"
Expand All @@ -96,7 +96,7 @@
</div>
</sortable-list>

<div class="asset-table-listing" v-if="displayMode === 'list'">
<div class="asset-table-listing" v-else-if="displayMode === 'list'">
<table class="table-fixed">
<sortable-list
v-model="assets"
Expand All @@ -108,7 +108,7 @@
:mirror="false"
>
<tbody ref="assets">
<tr is="assetRow"
<tr :is="assetRowComponent"
class="asset-row"
v-for="asset in assets"
:key="asset.id"
Expand All @@ -124,6 +124,9 @@
</sortable-list>
</table>
</div>

<slot :name="displayMode" v-else v-bind="{ assets, showSetAlt, assetUpdated, assetRemoved, idChanged }" />

</template>
</div>
</uploader>
Expand Down Expand Up @@ -192,6 +195,12 @@ export default {
mixins: [Fieldtype],


props: {
assetTileComponent: { type: [String, Object], default: 'asset-tile' },
assetRowComponent: { type: [String, Object], default: 'asset-row' },
},


data() {
return {
assets: [],
Expand Down
Loading