Merge branch 'develop' into feature/media-endpoint

changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.3.6 (2017-03-07)
+  - Pull in Piwik’s own piwik.js manually, again for CSP
+
+## Version 0.3.5 (2017-03-07)
+  - Move piwik code into its own js file to allow for CSP
+
+## Version 0.3.4 (2017-03-07)
+  - Remove document.write to allow CSP to work
+
 ## Version 0.3.3 (2017-03-03)
   - Fix issue when accessing /admin
 

public/assets/js/piwik.js

@@ -0,0 +1,8 @@
+// Piwik in its own js file to allow usage with a CSP policy
+
+var _paq = _paq || [];
+// tracker methods like "setCustomDimension" should be called before "trackPageView"
+_paq.push(['trackPageView']);
+_paq.push(['enableLinkTracking']);
+_paq.push(['setTrackerUrl', 'https://analytics.jmb.lv/piwik.php']);
+_paq.push(['setSiteId', '1']);

resources/views/master.blade.php

@@ -47,20 +47,8 @@
 </footer>
 @if (config('app.piwik') === true)
 <!-- Piwik -->
-<script type="text/javascript">
+<script defer src="https://analytics.jmb.lv/piwik.js"></script>
-    var _paq = _paq || [];
+<script src="/assets/js/piwik.js"></script>
-    // tracker methods like "setCustomDimension" should be called before "trackPageView"
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-        var u="https://analytics.jmb.lv/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '1']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-    })();
-</script>
-<!-- End Piwik Code -->
 @endif
 </body>
 </html>

resources/views/micropub/create.blade.php

@@ -28,10 +28,6 @@ New Note «
 @stop
 
 @section('scripts')
-<script>
-    window.Promise || document.write('<script src="https://unpkg.com/promise-polyfill/promise.min.js"><\/script>');
-    window.fetch || document.write('<script src="https://unpkg.com/whatwg-fetch/fetch.js"><\/script>');
-</script>
 <script defer src="/assets/js/newnote.js"></script>
 
 <link rel="stylesheet" href="/assets/frontend/alertify.css">