v2.5.9

- update modal wiki - update readme - update config - add support for files with mime type=application - some fixes for view files - fix cropper js error
ctf0 · Mar 5, 2018 · 6ac9a52 · 6ac9a52
1 parent 35d14b3
commit 6ac9a52
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ npm install vue vue-ls vue-tippy@v1 vue2-filters vue-bounty vue-notif vue-clipbo
     - if you are having issues [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/)
 
 ```js
-require('./../vendor/MediaManager/js/manager')
+require('../vendor/MediaManager/js/manager')
 
 new Vue({
     el: '#app'

diff --git a/src/config/mediaManager.php b/src/config/mediaManager.php
@@ -63,5 +63,5 @@
     /*
      * load image preview when item is clicked
      */
-    'lazy_load_image_on_click' => true,
+    'lazy_load_image_on_click' => false,
 ];
diff --git a/src/resources/assets/js/components/imageEditor/cropper.vue b/src/resources/assets/js/components/imageEditor/cropper.vue
@@ -185,6 +185,8 @@
 
 <script>
 import Camann from './caman.vue'
+import Cropper from 'cropperjs'
+import 'cropperjs/dist/cropper.css'
 
 export default {
     components: {Camann},

diff --git a/src/resources/assets/js/manager.js b/src/resources/assets/js/manager.js
@@ -3,8 +3,6 @@ window.Vue = require('vue')
 window.EventHub = require('vuemit')
 window.keycode = require('keycode')
 window.Dropzone = require('dropzone')
-window.Cropper = require('cropperjs')
-import 'cropperjs/dist/cropper.css'
 
 Vue.use(require('vue2-filters'))
 Vue.use(require('vue-clipboard2'))

diff --git a/src/resources/assets/js/modules/icons.js b/src/resources/assets/js/modules/icons.js
@@ -32,6 +32,7 @@ import 'vue-awesome/icons/circle'
 import 'vue-awesome/icons/link'
 import 'vue-awesome/icons/spinner'
 import 'vue-awesome/icons/key'
+import 'vue-awesome/icons/cogs'
 // cropperjs
 import 'vue-awesome/icons/crop'
 import 'vue-awesome/icons/ban'

diff --git a/src/resources/assets/js/packages/download.min.js b/src/resources/assets/js/packages/download.min.js
diff --git a/src/resources/assets/sass/media.scss b/src/resources/assets/sass/media.scss
@@ -2,6 +2,10 @@
     backface-visibility: hidden;
 }
 
+[v-cloak] {
+    display: none;
+}
+
 @import './extra/vars';
 @import './extra/loaders';
 @import './extra/animation';

diff --git a/src/resources/views/_manager.blade.php b/src/resources/views/_manager.blade.php
@@ -1,6 +1,3 @@
-{{-- styles --}}
-<link rel="stylesheet" href="{{ asset('assets/vendor/MediaManager/style.css') }}"/>
-
 {{-- mobile breadCrumb --}}
 @php
     $alt_breadcrumb = true;
@@ -39,8 +36,8 @@
     <div class="">
 
         {{-- notif-audio --}}
-        <audio ref="alert-audio"><source src="/assets/vendor/MediaManager/audio/alert.mp3" type="audio/mpeg"></audio>
-        <audio ref="success-audio"><source src="/assets/vendor/MediaManager/audio/success.mp3" type="audio/mpeg"></audio>
+        <audio ref="alert-audio"><source src="{{ asset('assets/vendor/MediaManager/audio/alert.mp3') }}" type="audio/mpeg"></audio>
+        <audio ref="success-audio"><source src="{{ asset('assets/vendor/MediaManager/audio/success.mp3') }}" type="audio/mpeg"></audio>
 
         {{-- top toolbar --}}
         <nav class="media-manager__toolbar level" v-show="toolBar">
@@ -468,6 +465,7 @@ class="__box-copy-link icon"
 
                                         <span class="icon is-large" v-else>
                                             <icon v-if="fileTypeIs(file, 'folder')" name="folder" scale="2.6"></icon>
+                                            <icon v-if="fileTypeIs(file, 'application')" name="cogs" scale="2.6"></icon>
                                             <icon v-if="fileTypeIs(file, 'video')" name="film" scale="2.6"></icon>
                                             <icon v-if="fileTypeIs(file, 'audio')" name="music" scale="2.6"></icon>
                                             <icon v-if="fileTypeIs(file, 'pdf')" name="file-pdf-o" scale="2.6"></icon>
@@ -546,13 +544,14 @@ class="link image"
                                 </template>
 
                                 {{-- icons --}}
-                                <icon v-if="selectedFileIs('folder')" name="folder" scale="4"></icon>
-                                <div key="1" v-if="selectedFileIs('pdf')" class="link"
+                                <icon key="1" v-if="selectedFileIs('folder')" name="folder" scale="4"></icon>
+                                <icon key="2" v-if="selectedFileIs('application')" name="cogs" scale="4"></icon>
+                                <div key="3" v-if="selectedFileIs('pdf')" class="link"
                                     v-tippy="{arrow: true, position: 'left'}" title="space"
                                     @click="toggleModal('preview_modal')">
                                     <icon name="file-pdf-o" scale="4"></icon>
                                 </div>
-                                <div key="2" v-if="selectedFileIs('text')" class="link"
+                                <div key="4" v-if="selectedFileIs('text')" class="link"
                                     v-tippy="{arrow: true, position: 'left'}" title="space"
                                     @click="toggleModal('preview_modal')">
                                     <icon name="file-text-o" scale="4"></icon>
@@ -1023,6 +1022,7 @@ class="button is-warning"
                                         <figure class="media-left">
                                             <span class="icon has-text-link">
                                                 <icon v-if="fileTypeIs(one, 'folder')" name="folder" scale="1.2"></icon>
+                                                <icon v-if="fileTypeIs(one, 'application')" name="cogs" scale="1.2"></icon>
                                                 <icon v-if="fileTypeIs(one, 'image')" name="image" scale="1.2"></icon>
                                                 <icon v-if="fileTypeIs(one, 'video')" name="film" scale="1.2"></icon>
                                                 <icon v-if="fileTypeIs(one, 'audio')" name="music" scale="1.2"></icon>
@@ -1069,6 +1069,7 @@ class="button is-warning"
                                         <figure class="media-left">
                                             <span class="icon has-text-link">
                                                 <icon v-if="selectedFileIs('folder')" name="folder" scale="1.8"></icon>
+                                                <icon v-if="selectedFileIs('application')" name="cogs" scale="1.8"></icon>
                                                 <icon v-if="selectedFileIs('image')" name="image" scale="1.8"></icon>
                                                 <icon v-if="selectedFileIs('video')" name="film" scale="1.8"></icon>
                                                 <icon v-if="selectedFileIs('audio')" name="music" scale="1.8"></icon>
@@ -1116,7 +1117,15 @@ class="button is-danger"
     </div>
 </media-manager>
 
+{{-- styles --}}
+@push('styles')
+    <link rel="stylesheet" href="{{ asset('assets/vendor/MediaManager/style.css') }}"/>
+@endpush
+
 {{-- scripts --}}
-<script src="//cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/camanjs/4.1.2/caman.full.min.js"></script>
-<script src="{{ asset('assets/vendor/MediaManager/manager.js') }}"></script>
+@push('scripts')
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/camanjs/4.1.2/caman.full.min.js"></script>
+    <script src="{{ asset('assets/vendor/MediaManager/manager.js') }}"></script>
+@endpush
+
diff --git a/src/resources/views/media.blade.php b/src/resources/views/media.blade.php
@@ -17,7 +17,7 @@
             <my-notification></my-notification>
         </div>
 
-        <div class="container is-fluid is-marginless">
+        <div class="container is-fluid">
             <div class="columns">
                 {{-- media manager --}}
                 <div class="column">
@@ -28,6 +28,8 @@
     </section>
 
     {{-- footer --}}
-    <script src="{{ asset("path/to/app.js") }}"></script>
+    @stack('styles')
+    @stack('scripts')
+    <script src="{{ asset("js/app.js") }}"></script>
 </body>
 </html>