Merge pull request #20 from Shopify/v1.1.1

V1.1.1

Author: cshold

assets/ajaxify.js

@@ -135,9 +135,9 @@ Shopify.updateCartNote = function(note, callback) {
 Shopify.onError = function(XMLHttpRequest, textStatus) {
   var data = eval('(' + XMLHttpRequest.responseText + ')');
   if (!!data.message) {
-    // alert(data.message + '(' + data.status  + '): ' + data.description);
+    alert(data.message + '(' + data.status  + '): ' + data.description);
   } else {
-    // alert('Error : ' + Shopify.fullMessagesFromErrors(data).join('; ') + '.');
+    alert('Error : ' + Shopify.fullMessagesFromErrors(data).join('; ') + '.');
   }
 };
 
@@ -547,12 +547,16 @@ var ajaxifyShopify = (function(module, $) {
     Shopify.getCart(cartUpdateCallback);
   };
 
-  itemErrorCallback = function (error) {
+  itemErrorCallback = function (XMLHttpRequest, textStatus) {
     switch (settings.method) {
       case 'flip':
         $flipContainer.removeClass('flip--is-loading');
         break;
     }
+
+    // This is where you handle errors of products being added to the cart.
+    // Default to alert message for errors.
+    Shopify.onError(XMLHttpRequest, textStatus);
   };
 
   cartUpdateCallback = function (cart) {

assets/timber.scss.liquid

@@ -651,7 +651,9 @@ body {
 }
 
 .main-content {
-  padding: $gutter*2 $gutter;
+  display: block;
+  padding-top: $gutter*2;
+  padding-bottom: $gutter*2;
 }
 
 .left { float: left; }
@@ -1023,12 +1025,18 @@ label.error {
 .input-group-field,
 .input-group-btn {
   display: table-cell;
-  vertical-align: top;
+  vertical-align: middle;
   margin: 0;
 }
 
-.input-group-field {
+.input-group .btn,
+.input-group .input-group-field {
+  height: 37px;
+}
+
+.input-group .input-group-field {
   width: 100%;
+  margin-bottom: 0;
 }
 
 .input-group-btn {

config-sample.yml

@@ -1,6 +1,6 @@
 ---
 # THEME GEM USAGE - visit https://github.com/Shopify/shopify_theme
-# Get your api_key and password at your-url.myshopify.com/apps/private
+# Get your api_key and password at your-url.myshopify.com/admin/apps/private
 
 # example code
 :api_key: 52ba03f2e17a1d24dafe1002b2bcddea