From 2afe618414b8798a5af701a24607354a7fae1535 Mon Sep 17 00:00:00 2001
From: spaghetti <ben@oppaiti.me>
Date: Tue, 27 Jun 2017 17:05:30 -0400
Subject: [PATCH] Merge some javascript

- Removed unused JS functions
- Inlined functions not often used
- Minimized some overly verbose functions
---
 design/privateheader.php | 9 ++++-----
 design/publicheader.php  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/design/privateheader.php b/design/privateheader.php
index 5d06917..d7eaaea 100755
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -95,11 +95,10 @@ foreach ($ExtraCSS as $CSS) {
 <?
 }
 
-$Scripts = array_merge(array('jquery', 'script_start', 'ajax.class', 'global', 'jquery.autocomplete', 'autocomplete', 'tooltipster', 'tooltipster_settings'), explode(',', $JSIncludes));
+$Scripts = array_merge(array('jquery', 'global', 'ajax.class', 'jquery.autocomplete', 'autocomplete', 'tooltipster', 'tooltipster_settings'), explode(',', $JSIncludes));
 foreach ($Scripts as $Script) {
-  if (trim($Script) == '') {
-    continue;
-  }
+  if (trim($Script) == '') { continue; }
+  $Async = (in_array($Script, ['jquery','global','ajax.class'])) ? '' : 'async';
   if (($ScriptStats = G::$Cache->get_value("script_stats_$Script")) === false || $ScriptStats['mtime'] != filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js")) {
     $ScriptStats['mtime'] = filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js");
     $ScriptStats['hash'] = base64_encode(hash_file(INTEGRITY_ALGO, SERVER_ROOT.STATIC_SERVER."functions/$Script.js", true));
@@ -107,7 +106,7 @@ foreach ($Scripts as $Script) {
     G::$Cache->cache_value("script_stats_$Script", $ScriptStats);
   }
 ?>
-  <script src="<?=STATIC_SERVER."functions/$Script.js?v=$ScriptStats[mtime]"?>" type="text/javascript" integrity="<?="$ScriptStats[algo]-$ScriptStats[hash]"?>"></script>
+  <script src="<?=STATIC_SERVER."functions/$Script.js?v=$ScriptStats[mtime]"?>" type="text/javascript" integrity="<?="$ScriptStats[algo]-$ScriptStats[hash]"?>" <?=$Async?>></script>
 <?
 }
 
diff --git a/design/publicheader.php b/design/publicheader.php
index 9fbc913..9eb3d59 100755
--- a/design/publicheader.php
+++ b/design/publicheader.php
@@ -11,7 +11,7 @@ define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
   <link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico');?>" />
   <link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css" />
 <?
-  $Scripts = ['jquery', 'script_start', 'ajax.class', 'cookie.class', 'storage.class', 'global', 'public'];
+  $Scripts = ['jquery', 'global', 'ajax.class', 'cookie.class', 'storage.class', 'public'];
   foreach($Scripts as $Script) {
     if (($ScriptStats = G::$Cache->get_value("script_stats_$Script")) === false || $ScriptStats['mtime'] != filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js")) {
       $ScriptStats['mtime'] = filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js");