Merged in feature/MAPG-188-pagespeed-improvements (pull request #164)
MAPG-188 get rid of inline js
This commit is contained in:
		
						commit
						71b1e28aa9
					
				@ -244,4 +244,23 @@ var MapGuesser = {
 | 
			
		||||
    document.getElementById('cover').onclick = function () {
 | 
			
		||||
        MapGuesser.hideModal();
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    if (COOKIES_CONSENT) {
 | 
			
		||||
        MapGuesser.initGoogleAnalitics();
 | 
			
		||||
    } else {
 | 
			
		||||
        // we don't want user to agree cookies when clicking on the notice itself
 | 
			
		||||
        document.getElementById('cookiesNotice').onclick = function (e) {
 | 
			
		||||
            e.stopPropagation();
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        document.getElementById('agreeCookiesButton').onclick = function () {
 | 
			
		||||
            MapGuesser.agreeCookies();
 | 
			
		||||
 | 
			
		||||
            document.getElementById('cookiesNotice').style.display = 'none';
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        window.onclick = function () {
 | 
			
		||||
            MapGuesser.agreeCookies();
 | 
			
		||||
        };
 | 
			
		||||
    }
 | 
			
		||||
})();
 | 
			
		||||
 | 
			
		||||
@ -42,38 +42,11 @@
 | 
			
		||||
        <?php if (!empty($_ENV['GOOGLE_ANALITICS_ID'])): ?>
 | 
			
		||||
            const GOOGLE_ANALITICS_ID = '<?= $_ENV['GOOGLE_ANALITICS_ID'] ?>';
 | 
			
		||||
        <?php endif; ?>
 | 
			
		||||
        const COOKIES_CONSENT = <?= isset($_COOKIE['COOKIES_CONSENT']) ? 'true' : 'false' ?>;
 | 
			
		||||
    </script>
 | 
			
		||||
    @yields('pageScript')
 | 
			
		||||
    <script src="<?= $_ENV['STATIC_ROOT'] ?>/js/mapguesser.js?rev=<?= REVISION ?>"></script>
 | 
			
		||||
    @yields('externalJs')
 | 
			
		||||
    @yields('inlineJs')
 | 
			
		||||
    <?php if (!isset($_COOKIE['COOKIES_CONSENT'])): ?>
 | 
			
		||||
        <script>
 | 
			
		||||
            (function () {
 | 
			
		||||
                // we don't want user to agree cookies when clicking on the notice itself
 | 
			
		||||
                document.getElementById('cookiesNotice').onclick = function (e) {
 | 
			
		||||
                    e.stopPropagation();
 | 
			
		||||
                };
 | 
			
		||||
 | 
			
		||||
                document.getElementById('agreeCookiesButton').onclick = function () {
 | 
			
		||||
                    MapGuesser.agreeCookies();
 | 
			
		||||
 | 
			
		||||
                    document.getElementById('cookiesNotice').style.display = 'none';
 | 
			
		||||
                };
 | 
			
		||||
 | 
			
		||||
                window.onclick = function () {
 | 
			
		||||
                    MapGuesser.agreeCookies();
 | 
			
		||||
                };
 | 
			
		||||
            })();
 | 
			
		||||
        </script>
 | 
			
		||||
    <?php else: ?>
 | 
			
		||||
        <?php if (!empty($_ENV['GOOGLE_ANALITICS_ID'])): ?>
 | 
			
		||||
            <script>
 | 
			
		||||
                (function () {
 | 
			
		||||
                    MapGuesser.initGoogleAnalitics();
 | 
			
		||||
                })();
 | 
			
		||||
            </script>
 | 
			
		||||
        <?php endif; ?>
 | 
			
		||||
    <?php endif; ?>
 | 
			
		||||
</body>
 | 
			
		||||
</html>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user