Merge pull request #1522 from sacr3dc0w/master

Clean up share.html conditional logic
bigcommerce · Jun 13, 2019 · 81205d3 · 81205d3
2 parents 12d2d4a + d175589
commit 81205d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Draft
+- Fix conditional logic in share.html [#1522](https://github.com/bigcommerce/cornerstone/pull/1522)
 - Fix conditional logic in returns-list.html [#1512](https://github.com/bigcommerce/cornerstone/pull/1512)
 
 ## 3.5.0 (2019-06-06)

diff --git a/templates/components/common/share.html b/templates/components/common/share.html
@@ -7,51 +7,35 @@
                     <a class="addthis_button_{{service}} icon icon--{{service}}" {{{annotation}}}>
                         {{#if service '===' 'google_plusone'}}
                             <!-- No custom icons allowed with g+ -->
-                        {{/if}}
-
-                        {{#if service '===' 'facebook'}}
+                        {{else if service '===' 'facebook'}}
                             <svg>
                                 <use xlink:href="#icon-facebook"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'email'}}
+                        {{else if service '===' 'email'}}
                             <svg>
                                 <use xlink:href="#icon-envelope"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'print'}}
+                        {{else if service '===' 'print'}}
                             <svg>
                                 <use xlink:href="#icon-print"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'twitter'}}
+                        {{else if service '===' 'twitter'}}
                             <svg>
                                 <use xlink:href="#icon-twitter"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'linkedin'}}
+                        {{else if service '===' 'linkedin'}}
                             <svg>
                                 <use xlink:href="#icon-linkedin"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'google'}}
+                        {{else if service '===' 'google'}}
                             <svg>
                                 <use xlink:href="#icon-google"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'pinterest'}}
+                        {{else if service '===' 'pinterest'}}
                             <svg>
                                 <use xlink:href="#icon-pinterest"/>
                             </svg>
-                        {{/if}}
-
-                        {{#if service '===' 'facebook_like'}}
+                        {{else if service '===' 'facebook_like'}}
                             <svg>
                                 <use xlink:href="#icon-facebook_like"/>
                             </svg>