Remove dns-prefetch; Update code comments; Provide the option to load…

… both js and css files from local
qr-merger · Apr 2, 2019 · 2f611cf · 2f611cf
1 parent 44070b1
commit 2f611cf
Show file tree

Hide file tree

Showing 12 changed files with 16,417 additions and 15 deletions.
diff --git a/elements/function.original.js → assets/js/dev-files/function.original.js b/elements/function.original.js → assets/js/dev-files/function.original.js
diff --git a/elements/function.js → assets/js/function.js b/elements/function.js → assets/js/function.js
diff --git a/elements/function.min.js → assets/js/function.min.js b/elements/function.min.js → assets/js/function.min.js
diff --git a/assets/js/jQuery/jquery.js b/assets/js/jQuery/jquery.js
diff --git a/assets/js/jQuery/jquery.min.js b/assets/js/jQuery/jquery.min.js
diff --git a/assets/js/jquery-qrcode/jquery-qrcode.js b/assets/js/jquery-qrcode/jquery-qrcode.js
diff --git a/assets/js/jquery-qrcode/jquery-qrcode.min.js b/assets/js/jquery-qrcode/jquery-qrcode.min.js
diff --git a/assets/styles/spectre.css/spectre.css b/assets/styles/spectre.css/spectre.css
diff --git a/assets/styles/spectre.css/spectre.min.css b/assets/styles/spectre.css/spectre.min.css
diff --git a/elements/style.css → assets/styles/style.css b/elements/style.css → assets/styles/style.css
@@ -1,4 +1,4 @@
-/* HTML Template Merger - Merge your qrcode quicker.
+/*  Merger - Merge your qrcode together. Even quicker.
 Released under GNU General Public License v3.0. Opensourced. (https://github.com/hifocus/merger)
 Author @hifocus (https://github.com/hifocus), @LF112 (https://github.com/lf112)
 Copyright reservation is required. */

diff --git a/elements/style.min.css → assets/styles/style.min.css b/elements/style.min.css → assets/styles/style.min.css
diff --git a/merger.html b/merger.html
@@ -15,21 +15,22 @@
  <html lang="zh">
 
  <head>
-     <title>Merger Demo - merge your qrcode quicker</title>
+     <title>Merger - merge your qrcode together. Even quicker.</title>
      <meta charset="utf-8">
      <meta name="author" content="Huangxin, LF112" />
      <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-     <meta http-equiv="x-dns-prefetch-control" content="on">
-     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"><!-- Upgrade HTTP Connections to HTTPS - Default -->
      <meta name="Keywords" content="Merger,open source,hxco,hifocus,merge qrcode,qrcode" />
      <meta name="Description" content="Merger is the most simple way to merge your qrcode together." />
      <link rel="shortcut icon" type="image/x-icon" href="https://ae01.alicdn.com/kf/UTB8aAOLnXPJXKJkSahV760yzFXav.png">
-     <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/picturepan2/[email protected]/dist/spectre.min.css" integrity="sha256-eBag0DNksOEjebVrDSBxOYWaIsRA5RBzz/PWQtkgmvM=" crossorigin="anonymous"> -->
-     <!-- <link rel="stylesheet" href="elements/style.min.css"> -->
-     <link rel="stylesheet" href="https://cdn.jsdelivr.net/combine/gh/picturepan2/[email protected]/dist/spectre.min.css,gh/hifocus/[email protected]/elements/style.min.css">
-     <link rel="dns-prefetch" href="https://cdn.jsdelivr.net">
-     <link rel="dns-prefetch" href="https://www.zhihu.com">
-     <link rel="dns-prefetch" href="https://ae01.alicdn.com">
+
+     <!-- Load style files from local -->
+     <!-- <link rel="stylesheet" href="assets/styles/style.min.css">
+     <link rel="stylesheet" href="assets/styles/spectre.css/spectre.min.css"> -->
+
+     <!-- Load style files from jsDelivr - Default -->
+     <link rel="stylesheet" href="https://cdn.jsdelivr.net/combine/gh/picturepan2/[email protected]/dist/spectre.min.css,gh/hifocus/[email protected]/assets/styles/style.min.css">
+
  </head>
 
  <body>
@@ -57,7 +58,7 @@
          var debugmode = "true";
          // QQ Mobile wouldn't decode qrcode from `data:image`, so for qq mobile only speical qrcode that generate from qrcode api is required.
          var qrcodeapi = "https://www.zhihu.com/qrcode?url=";
-         // var qrcodeapi = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chld=L|1&choe=UTF-8&chl="; // Not accessible in China. Backup use only.
+         // var qrcodeapi = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chld=L|1&choe=UTF-8&chl="; // Inaccessible in China. Backup use only.
 
      </script>
 
@@ -97,11 +98,17 @@ <h2 id="name"></h2>
              <!-- Modal Part Ends -->
 
      <!-- Footer Scripts --> <!-- Please do not swap orders -->
+     <!-- Load Javascript files from jsDelivr - Default -->
      <script src="https://cdn.jsdelivr.net/combine/npm/[email protected],gh/lrsjng/[email protected]/dist/jquery-qrcode.min.js"></script>
-     <!-- <script src="elements/function.original.js"></script> -->
-     <script src="https://cdn.jsdelivr.net/gh/hifocus/[email protected]/elements/function.min.js"></script> <!-- SRI disabled due to development reason. Enable manually at https://srihash.org -->
-     <script src="https://at.alicdn.com/t/font_974919_xgtacm93vxp.js"></script>
+     <script src="https://cdn.jsdelivr.net/gh/hifocus/[email protected]/assets/js/function.min.js"></script>
+
+     <!-- Load Javascript files from local -->
+     <!-- <script src="assets/js/jQuery/jquery.min.js"></script>
+     <script src="assets/js/jquery-qrcode/jquery-qrcode.min.js"></script>
+     <script src="assets/js/function.min.js"></script> -->
 
+     <!-- Web icons from iconfont.cn - not an option -->
+     <script src="https://at.alicdn.com/t/font_974919_xgtacm93vxp.js"></script>
 
      </body>