Skip to content

Commit

Permalink
work
Browse files Browse the repository at this point in the history
  • Loading branch information
ronreiter committed Jun 24, 2012
1 parent f41d279 commit 4e51b13
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion js/models/models.js
Expand Up @@ -49,7 +49,7 @@ window.Beer = Backbone.Model.extend({
country: "",
region: "",
description: "",
image: { value : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAACCCAYAAACNbQytAAAAGXRFWHRTb2Z0d2FyZQB" +
image: { value : "iVBORw0KGgoAAAANSUhEUgAAAHgAAACCCAYAAACNbQytAAAAGXRFWHRTb2Z0d2FyZQB" +
"BZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iV" +
"zVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2J" +
"lIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6c" +
Expand Down
7 changes: 4 additions & 3 deletions js/views/beerdetails.js
Expand Up @@ -8,8 +8,8 @@ window.BeerView = Backbone.View.extend({
$(this.el).html(this.template(this.model.toJSON()));

this.image = $(this.el).find(".beer-selector img");
//this.image.attr("src", "data:image;base64," + this.model.get("image").value);
this.image.attr("src", this.model.get("image").value);
this.image.attr("src", "data:image;base64," + this.model.get("image").value);
//this.image.attr("src", this.model.get("image").value);

var myLatlng = new google.maps.LatLng(this.model.get("latitude"),this.model.get("longitude"));
var myOptions = {
Expand Down Expand Up @@ -114,7 +114,8 @@ window.BeerView = Backbone.View.extend({
var reader = new FileReader();
reader.onloadend = _.bind(function () {
this.image.attr('src', reader.result);
this.model.set("image", { value : reader.result });

this.model.set("image", { value : reader.result.split(",")[1] });
}, this);

reader.readAsDataURL(this.pictureFile);
Expand Down
2 changes: 1 addition & 1 deletion js/views/beerlist.js
Expand Up @@ -43,7 +43,7 @@ window.BeerListItemView = Backbone.View.extend({

render: function () {
$(this.el).html(this.template(this.model.toJSON()));
var imageURI = this.model.toJSON().image ? this.model.toJSON().image.value : "/img/beer.png";
var imageURI = this.model.toJSON().image ? "data:image/png;base64," + this.model.toJSON().image.value : "/img/beer.png";

$(this.el).find(".thumbnail-image").attr("src", imageURI);
return this;
Expand Down

0 comments on commit 4e51b13

Please sign in to comment.