From fcfda13a73787fb73b7717e9a2de8fd973936d47 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:10:28 +1000
Subject: [PATCH] Patching a couple of minor regressions

---
 app/assets/javascripts/darkswarm/all.js.coffee                  | 2 +-
 .../controllers/products/product_node_controller.js.coffee      | 1 -
 app/views/modals/_producer.html.haml                            | 2 +-
 spec/javascripts/application_spec.js                            | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 3a039394ca..2c07d069c4 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -5,8 +5,8 @@
 #
 #= require angular
 #= require angular-cookies
-#= require angular-resource
 #= require angular-sanitize
+#= require angular-resource
 #= require ../shared/mm-foundation-tpls-0.2.0-SNAPSHOT
 #= require ../shared/bindonce.min.js
 #= require ../shared/ng-infinite-scroll.min.js
diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index fa0daababc..ca29b01449 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -8,7 +8,6 @@ Darkswarm.controller "ProductNodeCtrl", ($scope, $sce) ->
       $scope.product.price
 
   $scope.producer = $scope.product.supplier
-  $scope.producer.twitterific = true
   $scope.hasVariants = $scope.product.variants.length > 0
 
 Darkswarm.filter "unsafe", ($sce) ->
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 37250176f6..13f8026195 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -7,7 +7,7 @@
   .row  
     .columns.small-12.large-6{"ng-bind-html" => "producer.long_description"}
     .columns.small-12.large-6
-      %img.producer-logo{"ng-src" => "{{producer.logo}}"} 
+      %img.producer-logo{"ng-src" => "{{producer.logo}}", "ng-if" => "producer.logo"} 
       %h4 Stay in touch with {{ producer.name }}
       %ul.small-block-grid-1{bindonce: true}
         %li{"ng-if" => "producer.website"}
diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js
index 9e821754de..df629c1c81 100644
--- a/spec/javascripts/application_spec.js
+++ b/spec/javascripts/application_spec.js
@@ -1,6 +1,7 @@
 //= require angular
 //= require angular-resource
 //= require angular-animate
+//= require angular-sanitize
 //= require angular-mocks
 //= require angular-cookies
 //= require angular-backstretch.js