Update to new Yandex.Metrica JavaScript snippetv0.2.1

4 files changed, 25 insertions, 31 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b485e8..fd360a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.2.1 - 2018-12-17
+
+### Changed
+
+- Update to new Yandex.Metrica code snippet
+- Show start and end HTML comments of Yandex.Metrica and Matomo snippet (again)
+
 ## 0.2 - 2018-11-22
 
 ### Added
diff --git a/layouts/partials/analytics/matomo.html b/layouts/partials/analytics/matomo.html
index bb80619..50d0cd5 100644
--- a/layouts/partials/analytics/matomo.html
+++ b/layouts/partials/analytics/matomo.html
@@ -1,4 +1,4 @@
-<!-- Matomo -->
+{{ "<!-- Matomo -->" | safeHTML }}
 <script type="text/javascript">
   var _paq = _paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -13,4 +13,4 @@
   })();
 </script>
 <noscript><p><img src="//{{ replace (replace .Site.Params.Analytics.Matomo.Url "https://" "") "http://" "" }}/piwik.php?idsite={{ .Site.Params.Analytics.Matomo.SiteId }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
-<!-- End Matomo Code -->
+{{ "<!-- End Matomo Code -->" | safeHTML }}
diff --git a/layouts/partials/analytics/yandexmetrica.html b/layouts/partials/analytics/yandexmetrica.html
index f7ea4d3..d404be6 100644
--- a/layouts/partials/analytics/yandexmetrica.html
+++ b/layouts/partials/analytics/yandexmetrica.html
@@ -1,29 +1,16 @@
-<!-- Yandex.Metrika counter -->
+{{ "<!-- Yandex.Metrika counter -->" | safeHTML }}
 <script type="text/javascript" >
-    (function (d, w, c) {
-        (w[c] = w[c] || []).push(function() {
-            try {
-                w.yaCounter{{ safeJS .Site.Params.Analytics.Yandexmetrica.TagNumber }} = new Ya.Metrika2({
-                    id: {{- safeJS .Site.Params.Analytics.Yandexmetrica.TagNumber -}},
-                    clickmap:true,
-                    trackLinks:true,
-                    accurateTrackBounce:true,
-                    webvisor:true
-                });
-            } catch(e) { }
-        });
+   (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+   m[i].l=1*new Date();k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
+   (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
 
-        var n = d.getElementsByTagName("script")[0],
-            s = d.createElement("script"),
-            f = function () { n.parentNode.insertBefore(s, n); };
-        s.type = "text/javascript";
-        s.async = true;
-        s.src = "https://mc.yandex.ru/metrika/tag.js";
-
-        if (w.opera == "[object Opera]") {
-            d.addEventListener("DOMContentLoaded", f, false);
-        } else { f(); }
-    })(document, window, "yandex_metrika_callbacks2");
+   ym({{- safeJS .Site.Params.Analytics.Yandexmetrica.TagNumber -}}, "init", {
+        id:{{- safeJS .Site.Params.Analytics.Yandexmetrica.TagNumber -}},
+        clickmap:true,
+        trackLinks:true,
+        accurateTrackBounce:true,
+        webvisor:true
+   });
 </script>
-<noscript><div><img src="https://mc.yandex.ru/watch/{{ .Site.Params.Analytics.Yandexmetrica.TagNumber }}" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
-<!-- /Yandex.Metrika counter -->
\ No newline at end of file
+<noscript><div><img src="https://mc.yandex.ru/watch/{{- .Site.Params.Analytics.Yandexmetrica.TagNumber -}}" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+{{ "<!-- /Yandex.Metrika counter -->" | safeHTML }}
diff --git a/theme.toml b/theme.toml
index 66299c3..c89860a 100644
--- a/theme.toml
+++ b/theme.toml
@@ -1,10 +1,10 @@
 # Name       : Tikva
-# Version    : 0.2
-# Released   : 2018-09-22
+# Version    : 0.2.1
+# Released   : 2018-12-17
 
 name = "Tikva"
 license = "MIT"
-licenselink = "https://github.com/geschke/hugo-tikva/LICENSE"
+licenselink = "https://github.com/geschke/hugo-tikva/blob/master/LICENSE.md"
 description = "Tikva is a minimalistic Hugo theme, based on Bootstrap 4 framework"
 homepage = "https://github.com/geschke/hugo-tikva/"
 tags = ["theme", "core", "modern", "responsive", "bootstrap", "minimal", "blog", "font awesome", "white", "dark", "light" ]