Merge pull request #15 from varvet/fix/use-real-filename-in-preview

Fixes preview of newly uploaded files in IE
varvet · Apr 30, 2016 · 3809a54 · 3809a54
2 parents 9b2a742 + 0b3603d
commit 3809a54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### 0.10.2 - 2015-04-30
+Bug fixes:
+- Fixes preview of newly uploaded files in IE
+
+### 0.10.1 - 2015-02-05
+Bug fixes:
+- Fixes bundler errors on recent versions of godmin
+
 ### 0.10.0 - 2015-06-25
 Features
 - New look

diff --git a/app/assets/javascripts/godmin-uploads/index.js b/app/assets/javascripts/godmin-uploads/index.js
@@ -88,12 +88,13 @@
 
   var setUploadPreview = function($el, fileObject) {
     $el.find(".godmin-uploads__preview__image").attr(
-      "src", fileObject.url + "/fill/0/400/" + fileObject.id + "/image");
+      "src", fileObject.url + "/fill/0/400/" + fileObject.id + "/" + fileObject.filename);
   };
 
   var setDownloadUrl = function($el, fileObject) {
+    ext = fileObject.filename.split(".").pop().toLowerCase();
     $el.find(".godmin-uploads__preview__download__link").attr(
-      "href", fileObject.url + "/" + fileObject.id + "/image");
+      "href", fileObject.url + "/" + fileObject.id + "/" + fileObject.filename);
   };
 
   var getFileObject = function($el) {

diff --git a/lib/godmin/uploads/version.rb b/lib/godmin/uploads/version.rb
@@ -1,5 +1,5 @@
 module Godmin
   module Uploads
-    VERSION = "0.10.1"
+    VERSION = "0.10.2"
   end
 end