Merge pull request #947 from acceptbitcoincash/small-perf-and-tweaks

small tweaks to gain some smaller file sizes
acceptbitcoincash · May 11, 2018 · 2acd511 · 2acd511
2 parents 043a8bc + bea1e30
commit 2acd511
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 82 deletions.
diff --git a/_includes/_sass/abci.scss b/_includes/_sass/abci.scss
@@ -21,19 +21,6 @@
     }
   }
 
-  #abci-coin-toggle {
-    width: 320px;
-    height: 200px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    margin: 0;
-    padding: 0;
-    cursor: pointer;
-    z-index: 10;
-    opacity: 0;
-  }
-
   #abci-main-coin {
     position: relative;
     width: 150px;

diff --git a/_includes/_sass/bitcoinsvg.scss b/_includes/_sass/bitcoinsvg.scss
@@ -58,19 +58,6 @@
     }
   }
 
-  #coin-toggle {
-    width: 320px;
-    height: 200px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    margin: 0;
-    padding: 0;
-    cursor: pointer;
-    z-index: 10;
-    opacity: 0;
-  }
-
   #main-coin {
     position: relative;
     width: 200px;

diff --git a/_includes/js/cookie.js b/_includes/js/cookie.js
@@ -0,0 +1,27 @@
+// Set a cookie to store prefs
+function createCookie(name,value,days) {
+  var expires = "";
+  if (days) {
+      var date = new Date();
+      date.setTime(date.getTime() + (days*24*60*60*1000));
+      expires = "; expires=" + date.toUTCString();
+  }
+  document.cookie = name + "=" + value + expires + "; path=/";
+}
+
+// Get a cookie to read prefs
+function readCookie(name) {
+  var nameEQ = name + "=";
+  var ca = document.cookie.split(';');
+  for(var i=0;i < ca.length;i++) {
+      var c = ca[i];
+      while (c.charAt(0)==' ') c = c.substring(1,c.length);
+      if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+  }
+  return null;
+}
+
+// Clean up the cookie crumbs
+function eraseCookie(name) {
+  createCookie(name,"",-1);
+}
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -13,11 +13,11 @@
 
 {% if page.id == "adult-listings" %}
 <!-- Adult section warning modal -->
-  <script>
+<script>
     $(document).ready(function () {
 
       $('#adult-warning-checkbox').click(function(){
-        if($(this).prop('checked')) {
+        if( $(this).prop('checked') ) {
           createCookie('hideAdultWarning')
         } else {
           eraseCookie('hideAdultWarning')
@@ -29,7 +29,7 @@
           .modal('setting','closable', false)
           .modal('show');
       }
-
     });
-  </script>
+    {% include js/cookie.js %}
+</script>
 {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -28,12 +28,19 @@
 	<link rel="preconnect" href="https://syndication.twitter.com" crossorigin>
 	<link rel="preconnect" href="https://pbs.twimg.com" crossorigin>
 	<link rel="preconnect" href="https://abs.twimg.com" crossorigin>
+	<link rel="prefetch" href="/img/coin-bch.png" as="image">
+	<link rel="prefetch" href="/img/pcb-subtle-green.png" as="image">
+	<link rel="prefetch" href="/img/placeholder.png" as="image">
+	<link rel="preload" href="https://fonts.googleapis.com/css?family=Ubuntu:300,300i,400,400i,500,500i,700" as="stylesheet">
+   <link rel="preload" href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic&subset=latin" as="stylesheet">
+   <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.1/semantic.min.css" as="stylesheet"
+		integrity="sha384-vQPhfJdJkfTCHP7ouiqoAojjcDFuU346yP8z/pRpSn0xsWOfkMd+DkNmxns9jy4l" crossorigin="anonymous">
 
 	<!-- Google Fonts should not use SRI hashes as the CSS served dynamically changes depending on browser -->
 	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:300,300i,400,400i,500,500i,700" crossorigin>
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.1/semantic.min.css"
 		integrity="sha384-vQPhfJdJkfTCHP7ouiqoAojjcDFuU346yP8z/pRpSn0xsWOfkMd+DkNmxns9jy4l" crossorigin="anonymous">
- 
+		
   {%- if page.has_search -%}
 	<link rel="stylesheet" href="/css/search-style.css">
   {%- else -%}

diff --git a/js/app.js b/js/app.js
@@ -38,11 +38,6 @@ $(document).ready(function () {
     openCategory(window.location.hash.substring(1));
   }
 
-  // Some frilly animations on click of the main Bitcoin Cash logo
-  $('#coin-toggle').click(function (){
-    coinEffect();
-  });
-
   // Stick the BCH-only filter to the top on scroll
   $('.ui.sticky.bch-only').sticky({
 		onStick: function(){
@@ -143,9 +138,6 @@ $(document).ready(function () {
     label: 'percent',
     showActivity: false
   });
-
-  // Retrieve latest production version
-  //getLatestRelease();
 });
 
 /**
@@ -170,41 +162,6 @@ function coinEffect() {
   , 1);
 }
 
-function getLatestRelease() {
-  var githubfeed = $.getJSON("https://api.github.com/repos/acceptbitcoincash/acceptbitcoincash/releases/latest", function(data){
-    $("span.version").html('Current Release: <a href="https://github.com/acceptbitcoincash/acceptbitcoincash/releases/latest" target="_blank" data-tooltip="Read the ' + data.tag_name + ' release notes" data-position="top center" data-inverted=""><i class="tag icon"></i><b>' + data.tag_name + '</b></a> &nbsp;&bull;&nbsp; <a href="https://github.com/acceptbitcoincash/acceptbitcoincash/compare/' + data.tag_name + '...master" target="_blank" data-tooltip="View a list of approved commits that have not yet been deployed to this site" data-position="top center" data-inverted="">Upcoming changes <i class="sign in icon"></i></a>');
-  });
-}
-
-
-// Set a cookie to store prefs
-function createCookie(name,value,days) {
-  var expires = "";
-  if (days) {
-      var date = new Date();
-      date.setTime(date.getTime() + (days*24*60*60*1000));
-      expires = "; expires=" + date.toUTCString();
-  }
-  document.cookie = name + "=" + value + expires + "; path=/";
-}
-
-// Get a cookie to read prefs
-function readCookie(name) {
-  var nameEQ = name + "=";
-  var ca = document.cookie.split(';');
-  for(var i=0;i < ca.length;i++) {
-      var c = ca[i];
-      while (c.charAt(0)==' ') c = c.substring(1,c.length);
-      if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
-  }
-  return null;
-}
-
-// Clean up the cookie crumbs
-function eraseCookie(name) {
-  createCookie(name,"",-1);
-}
-
 /**
  * Create an event that is called 500ms after the browser
  * window is re-sized and has finished being re-sized.
@@ -249,13 +206,12 @@ if(document.getElementById('bch-merchant-search') instanceof Object){
 		  $('.category').hide();
 		  table.css('display', 'block');
 		  content.parent().show();
-		  var l = content.length;
-		  for(var i = 0; i < l; i++) {
-			var section = content[i];
+		  for(var i = 0; i < content.length; i++) {
+			var section = $(content[i]);
 			// Hide table when all rows within are hidden by Jets
-			if ($(section).children(':hidden').length === $(section).children().length) {
-			  if (platform == 'mobile') $(section).parent().hide();
-			  else $(section).parent().parent().hide();
+			if (section.children(':hidden').length === section.children().length) {
+			  if (platform == 'mobile') section.parent().hide();
+			  else section.parent().parent().hide();
 			}
 		  }
 
@@ -311,15 +267,14 @@ function BCHfilter() {
     $('.bch-only-none-found').css('display', 'table-row');
     $('.bch-only-none-found-mobile').css('display', 'block');
     $('.bch-only-hidden').css('opacity', '0.4');
-    if (isSearching) jets.options.didSearch( $('#bch-merchant-search').val() );
   } else {
     $('.website-table:visible img').trigger('unveil');
     $('.bch-only-none-found, .bch-only-none-found-mobile').css('display', 'none');
     $('.bch-only-hidden').css('opacity', '1');
     $('.mobile-table .no-bch').css('display', 'block');
     $('.desktop-table .no-bch').css('display', 'table-row');
-    if (isSearching) jets.options.didSearch( $('#bch-merchant-search').val() );
   }
+  if (isSearching) jets.options.didSearch( $('#bch-merchant-search').val() );
 }
 
 /**