Merge pull request #18 from tsawler/Development

Development

Author: tsawler

README.md

@@ -16,7 +16,6 @@ This package is written specifically for Laravel 5, and will integrate seamlessl
 
 1. This package only supports Laravel 5.x
 1. Requires `"intervention/image": "2.*"`
-1. Requires `"francodacosta/phmagick": "0.4.*@dev"`
 1. Requires PHP 5.5 or later
 
 ## Installation

composer.json

@@ -11,8 +11,7 @@
   "require": {
     "php": ">=5.5.0",
     "illuminate/support": "5.0.*",
-    "intervention/image": "2.*",
-    "francodacosta/phmagick": "0.4.*@dev"
+    "intervention/image": "2.*"
   },
   "autoload": {
     "psr-4": {

src/views/index.blade.php

@@ -118,7 +118,7 @@ class="fa fa-list"></i> List</a>
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                             aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="fileLabel">View Fiile</h4>
+                <h4 class="modal-title" id="fileLabel">View File</h4>
             </div>
             <div class="modal-body" id="fileview_body">
 
@@ -426,11 +426,22 @@ function resizeImage(x) {
     });
 
     function fileView(x){
+        var rnd = makeRandom();
         $('#fileview_body').html(
-                "<img class='img img-responsive center-block' src='{!! Config::get('lfm.images_url') !!}" + $("#working_dir").val() + "/" + x + "'>"
+                "<img class='img img-responsive center-block' src='{!! Config::get('lfm.images_url') !!}" + $("#working_dir").val() + "/" + x + "?id=" + rnd + "'>"
         );
         $('#fileViewModal').modal();
     }
+
+    function makeRandom()
+    {
+        var text = "";
+        var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+        for( var i=0; i < 20; i++ )
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        return text;
+    }
 </script>
 </body>
 </html>