Merge pull request #13 from yizeng/hotfix/#12/fix-disqus-protocols

Fix Disqus scripts protocols
yizeng · Sep 29, 2017 · a191234 · a191234
2 parents dc115df + 1d73636
commit a191234
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/_config.yml b/_config.yml
@@ -56,10 +56,10 @@ blog:
   footer_content: A gem-based responsive simple texture styled <a href="http://jekyllrb.com/">Jekyll</a> theme.
 
 disqus:
-  shortname:
-  public_key:
-google_analytics:
-addthis_public_id: # AddThis sharing plugin. See http://www.addthis.com/
+  shortname: # e.g. yizeng
+  public_key: # e.g. ULZ0b9TFefCUJHKQd4JCKv2v3u27YoG7YG8zXPewkWrT333Z0Se9YnxLzoV6VM8W
+google_analytics: # e.g. 'UA-42456515-5'
+addthis_public_id: # AddThis sharing plugin. See http://www.addthis.com/. E.g. ra-53329e27694534j5 
 
 paths:
   home: /

diff --git a/_includes/blog/scripts.html b/_includes/blog/scripts.html
@@ -26,7 +26,6 @@
     });
 
     $('footer .back-to-top, .gotop').on('click', function (event) {
-        sendGaEvent('Blog', 'Back to Top', event.currentTarget);
         event.preventDefault();
         $('html, body').animate({
             scrollTop: 0
@@ -35,7 +34,6 @@
     });
 
     $('.show-hidden').on('click', function () {
-        sendGaEvent('Post', 'Show Hidden', event.currentTarget);
         $(this).parent().next().toggleClass("hidden");
         $(this).toggleClass("hidden");
     });
@@ -45,6 +43,12 @@
 <!-- Google Analytics Event tracking -->
 {% if site.google_analytics %}
 <script>
+$(document).on('click', 'footer .back-to-top, .gotop', function (event) {
+    sendGaEvent('Blog', 'Back to Top', event.currentTarget);
+});
+$(document).on('click', '.show-hidden', function (event) {
+    sendGaEvent('Post', 'Show Hidden', event.currentTarget);
+});
 $(document).on('click', 'a.internal', function(event) {
     sendGaEvent('Blog', 'Navigate', event.currentTarget);
 });

diff --git a/_includes/common/disqus.html b/_includes/common/disqus.html
@@ -6,7 +6,7 @@
 
         $.ajax({
             type: 'GET',
-            url: 'https://disqus.com/api/3.0/threads/set.jsonp',
+            url: '//disqus.com/api/3.0/threads/set.jsonp',
             data: {
                 api_key: disqusPublicKey,
                 forum: disqusShortname,
@@ -24,7 +24,7 @@
 
         $('.comments .show-hidden').on('click', function () {
             $.ajaxSetup({cache: true});
-            $.getScript('http://' + disqusShortname + '.disqus.com/embed.js');
+            $.getScript('//' + disqusShortname + '.disqus.com/embed.js');
             $.ajaxSetup({cache: false});
             $(this).remove();
         });

diff --git a/jekyll-theme-simple-texture.gemspec b/jekyll-theme-simple-texture.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-simple-texture"
-  spec.version       = "0.2.1"
+  spec.version       = "0.2.2"
   spec.authors       = ["Yi Zeng"]
   spec.email         = ["[email protected]"]
 

diff --git a/starter-kit/_config.yml b/starter-kit/_config.yml
@@ -57,10 +57,10 @@ blog:
   footer_content: A gem-based responsive simple texture styled <a href="http://jekyllrb.com/">Jekyll</a> theme.
 
 disqus:
-  shortname:
-  public_key:
-google_analytics:
-addthis_public_id: # AddThis sharing plugin. See http://www.addthis.com/
+  shortname: # e.g. yizeng
+  public_key: # e.g. ULZ0b9TFefCUJHKQd4JCKv2v3u27YoG7YG8zXPewkWrT333Z0Se9YnxLzoV6VM8W
+google_analytics: # e.g. 'UA-42456515-5'
+addthis_public_id: # AddThis sharing plugin. See http://www.addthis.com/. E.g. ra-53329e27694534j5 
 
 paths:
   home: /