Skip to content

Commit

Permalink
Merge pull request #7 from varvet/feature/update-refile
Browse files Browse the repository at this point in the history
Bump refile version and fix preview data issue
  • Loading branch information
Johan Halse committed Feb 5, 2015
2 parents 788d553 + 0148029 commit e7d3c34
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 0.9.2 - 2015-02-05
Features
- Refile version 0.5.3

### 0.9.1 - 2015-01-12
Features
- Godmin version 0.9.7
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/godmin-uploads/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
var $urlParts = getFileUrlParts($el);

$el.find(".godmin-upload-preview").attr(
"src", $urlParts[0] + "/fill/150/150/" + $urlParts[1] + "/foobar"
"src", $urlParts[0] + "/fill/150/150/" + $urlParts[1].id + "/foobar"
);
};

var setDownloadUrl = function($el) {
var $urlParts = getFileUrlParts($el);

$el.find(".godmin-upload-download-link").attr(
"href", $urlParts[0] + "/" + $urlParts[1] + "/foobar"
"href", $urlParts[0] + "/" + $urlParts[1].id + "/foobar"
);
};

var getFileUrlParts = function($el) {
var $file = $el.find(".godmin-upload-file-field");

return [
$file.data("url"), $file.prev().val()
$file.data("url"), JSON.parse($file.prev().val())
];
};

Expand Down
2 changes: 1 addition & 1 deletion godmin-uploads.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]

gem.add_dependency "godmin", "~> 0.9.7"
gem.add_dependency "refile", "~> 0.4.2"
gem.add_dependency "refile", "~> 0.5.3"
gem.add_dependency "mini_magick", "~> 4.0.1"

gem.add_development_dependency "bundler", "~> 1.7"
Expand Down
2 changes: 1 addition & 1 deletion lib/godmin/uploads/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Godmin
module Uploads
VERSION = "0.9.1"
VERSION = "0.9.2"
end
end

0 comments on commit e7d3c34

Please sign in to comment.