Merge pull request #1764 from jhawthorn/handlebars_image_partial

Add image partial to handlebars
solidusio · Mar 15, 2017 · 1412e87 · 1412e87
2 parents 3c1c9e8 + 10508c1
commit 1412e87
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 35 deletions.
diff --git a/backend/app/assets/javascripts/spree/backend/handlebars_extensions.coffee b/backend/app/assets/javascripts/spree/backend/handlebars_extensions.coffee
diff --git a/backend/app/assets/javascripts/spree/backend/handlebars_extensions.js b/backend/app/assets/javascripts/spree/backend/handlebars_extensions.js
@@ -0,0 +1,18 @@
+//= require handlebars
+//= require spree/backend/translation
+
+Handlebars.registerHelper("t", function(key, options) {
+  return Spree.t(key, options.hash);
+});
+
+Handlebars.registerHelper("human_attribute_name", function(model, attr) {
+  return Spree.human_attribute_name(model, attr);
+});
+
+Handlebars.registerHelper("admin_url", function() {
+  return Spree.pathFor("admin")
+});
+
+Handlebars.registerHelper("concat", function() {
+  return Array.prototype.slice.call(arguments, 0, -1).join('');
+});
diff --git a/backend/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee b/backend/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee
@@ -84,7 +84,7 @@ class VariantForm
       variantId: transferItem.variant.id
       variantDisplayAttributes: formatVariantDisplayAttributes(transferItem.variant)
       variantOptions: formatVariantOptionValues(transferItem.variant)
-      variantImageURL: transferItem.variant.images[0]?.small_url
+      variantImage: transferItem.variant.images[0]
 
     if isReceiving
       templateAttributes["receivedQuantity"] = transferItem.received_quantity

diff --git a/backend/app/assets/javascripts/spree/backend/templates/_image.hbs b/backend/app/assets/javascripts/spree/backend/templates/_image.hbs
@@ -0,0 +1,5 @@
+{{#if image }}
+  <img src='{{ lookup image (concat size "_url") }}' alt="{{ alt }}" />
+{{ else }}
+  <span class="image-placeholder {{ size }}"></span>
+{{/if}}
diff --git a/backend/app/assets/javascripts/spree/backend/templates/index.js b/backend/app/assets/javascripts/spree/backend/templates/index.js
@@ -1,3 +1,4 @@
+//= require spree/backend/templates/_image
 //= require spree/backend/templates/orders/customer_details/autocomplete
 //= require spree/backend/templates/orders/details_adjustment_row
 //= require spree/backend/templates/orders/line_item

diff --git a/backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs b/backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs
@@ -4,11 +4,7 @@
   </td>
 {{else}}
   <td class="line-item-image">
-    {{#if image }}
-      <img src="{{ image.mini_url }}">
-    {{else}}
-      <span class="image-placeholder mini"></span>
-    {{/if}}
+    {{> _image image=line_item.variant.images.[0] size="mini" }}
   </td>
   <td class="line-item-name">
     {{ line_item.variant.name }}<br>

diff --git a/backend/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs b/backend/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs
@@ -2,11 +2,7 @@
   <td class="align-center no-padding">
     <div class='variant-container' data-variant-id="{{variantId}}">
       <div class='variant-image'>
-        {{#if variantImageURL }}
-          <img alt="{{variantName}}" src="{{variantImageURL}}">
-        {{ else }}
-          <span class="image-placeholder small"></span>
-        {{/if}}
+        {{> _image image=variantImage size="small" alt=variantName }}
       </div>
       <div class='variant-details'>
         <table class='stock-variant-field-table'>

diff --git a/backend/app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs b/backend/app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs
@@ -1,10 +1,6 @@
 <div class="variant-autocomplete-item media">
   <div class="media-left">
-    {{#if image }}
-      <img class="media-object" src='{{variant.image}}' />
-    {{ else }}
-      <span class="image-placeholder mini"></span>
-    {{/if}}
+    {{> _image image=variant.images.[0] size="mini" }}
   </div>
 
   <div class="media-body">

diff --git a/backend/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee b/backend/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee
@@ -3,10 +3,8 @@
 variantTemplate = HandlebarsTemplates["variants/autocomplete"]
 
 formatVariantResult = (variant) ->
-  image = variant.images[0].mini_url if variant["images"][0] isnt undefined and variant["images"][0].mini_url isnt undefined
   variantTemplate(
     variant: variant
-    image: image
   )
 
 $.fn.variantAutocomplete = (searchOptions = {}) ->

diff --git a/backend/app/assets/javascripts/spree/backend/views/cart/line_item_row.js b/backend/app/assets/javascripts/spree/backend/views/cart/line_item_row.js
@@ -76,11 +76,8 @@ Spree.Views.Cart.LineItemRow = Backbone.View.extend({
   },
 
   render: function() {
-    var line_item = this.model.attributes
-    var image = line_item.variant && line_item.variant.images[0]
     var html = HandlebarsTemplates['orders/line_item']({
-      line_item: line_item,
-      image: image,
+      line_item: this.model.toJSON(),
       editing: this.editing,
       isNew: this.model.isNew(),
       noCancel: this.model.isNew() && this.model.collection.length == 1

diff --git a/backend/app/assets/stylesheets/spree/backend/components/_stock_table.scss b/backend/app/assets/stylesheets/spree/backend/components/_stock_table.scss
@@ -31,8 +31,7 @@
       padding: 0px 5px;
     }
     .variant-image,
-    .variant-details,
-    .variant-container {
+    .variant-details {
       float: left;
     }
     .variant-container {