From 94e1e86628e2f47faab5186dccb7e1314b0dd11b Mon Sep 17 00:00:00 2001
From: Carson Shold <carson@carsonshold.com>
Date: Wed, 4 Nov 2015 16:53:50 -0500
Subject: [PATCH 1/2] Update article comment form ids

---
 assets/timber.js.liquid  |  5 -----
 layout/theme.liquid      |  5 -----
 templates/article.liquid | 27 ++++++---------------------
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/assets/timber.js.liquid b/assets/timber.js.liquid
index 4322de2f2..4af3e3211 100755
--- a/assets/timber.js.liquid
+++ b/assets/timber.js.liquid
@@ -198,11 +198,6 @@ timber.getHash = function () {
   return window.location.hash;
 };
 
-timber.updateHash = function (hash) {
-  window.location.hash = '#' + hash;
-  $('#' + hash).attr('tabindex', -1).focus();
-};
-
 timber.productPage = function (options) {
   var moneyFormat = options.money_format,
       variant = options.variant,
diff --git a/layout/theme.liquid b/layout/theme.liquid
index 0a1fb3bed..3a979b441 100755
--- a/layout/theme.liquid
+++ b/layout/theme.liquid
@@ -382,11 +382,6 @@
     Template-specific js
   {% endcomment %}
   <script>
-    {% if newHash %}
-      $(function() {
-        timber.updateHash('{{ newHash }}');
-      });
-    {% endif %}
     {% if resetPassword %}
       $(function() {
         timber.resetPasswordSuccess();
diff --git a/templates/article.liquid b/templates/article.liquid
index 6cadc8f51..91079c9d1 100755
--- a/templates/article.liquid
+++ b/templates/article.liquid
@@ -77,9 +77,9 @@
       {% endcomment %}
       {% paginate article.comments by 5 %}
         {% comment %}
-          #Comments is required, it is used as an anchor link by Shopify.
+          #comments is required, it is used as an anchor link by Shopify.
         {% endcomment %}
-        <div id="Comments">
+        <div id="comments">
 
           {% if comment and comment.created_at %}
             <p class="note form-success">
@@ -128,15 +128,12 @@
           {% endif %}
 
           {% comment %}
-            Comment submission form
+            #comment-form is required, it is used as an anchor link by Shopify
+            when an error occurs during submission.
           {% endcomment %}
-          <div class="form-vertical">
+          <div id="comment-form" class="form-vertical">
             {% form 'new_comment', article %}
-
-              {% comment %}
-                #AddCommentTitle is used simply as an anchor link
-              {% endcomment %}
-              <h3 id="AddCommentTitle">{{ 'blogs.comments.title' | t }}</h3>
+              <h3>{{ 'blogs.comments.title' | t }}</h3>
 
               {{ form.errors | default_errors }}
 
@@ -162,18 +159,6 @@
               {% endif %}
 
               <input type="submit" class="btn" value="{{ 'blogs.comments.post' | t }}">
-
-              {% comment %}
-                Assign variable to be used after timber.init() is run in theme.liquid
-              {% endcomment %}
-              {% if form.errors %}
-                {% assign newHash = 'AddCommentTitle' %}
-              {% endif %}
-
-              {% if form.posted_successfully? %}
-                {% assign newHash = 'Comments' %}
-              {% endif %}
-
             {% endform %}
           </div>
 

From ab7d2d753d19223243fa581325fd3e2e94adfb8a Mon Sep 17 00:00:00 2001
From: Carson Shold <carson@carsonshold.com>
Date: Thu, 5 Nov 2015 09:14:51 -0500
Subject: [PATCH 2/2] No need for ID on form. It gets auto added

---
 templates/article.liquid | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/article.liquid b/templates/article.liquid
index 91079c9d1..9c0b85bd6 100755
--- a/templates/article.liquid
+++ b/templates/article.liquid
@@ -127,11 +127,7 @@
 
           {% endif %}
 
-          {% comment %}
-            #comment-form is required, it is used as an anchor link by Shopify
-            when an error occurs during submission.
-          {% endcomment %}
-          <div id="comment-form" class="form-vertical">
+          <div class="form-vertical">
             {% form 'new_comment', article %}
               <h3>{{ 'blogs.comments.title' | t }}</h3>