Merge pull request #483 from Shopify/comment-form

Update article comment form ids

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,

layout/theme.liquid

@@ -382,11 +382,6 @@
     Template-specific js
   {% endcomment %}
   <script>
-    {% if newHash %}
-      $(function() {
-        timber.updateHash('{{ newHash }}');
-      });
-    {% endif %}
     {% if resetPassword %}
       $(function() {
         timber.resetPasswordSuccess();

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">
@@ -127,16 +127,9 @@
 
           {% endif %}
 
-          {% comment %}
-            Comment submission form
-          {% endcomment %}
           <div 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 +155,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>