Skip to content

Commit

Permalink
Update staticfile.org link and code comments, bump jQuery to 3.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hifocus committed Apr 27, 2024
1 parent 8ba8226 commit d8fc9d5
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion assets/bundles/function.main.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions assets/js/function.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

// Merger - Merge Your Qrcode Together. Even Quicker.
// User docs: https://merger.huangxin.org
// Homepage: https://merger.huangxin.org
// Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
// Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors).
// Copyright reservation is required.

var client;
var selected;
Expand Down Expand Up @@ -248,7 +247,7 @@ document.getElementById("name").innerHTML = finaltitle;
document.getElementById("description").innerHTML = finalsub;

// Copyright console log copied from https://github.com/MoePlayer/APlayer/. Thank you.
console.log(`${'\n'} %c Merger 0.28.4 %c https://github.com/qr-merger/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');
console.log(`${'\n'} %c Merger 0.28.5 %c https://github.com/qr-merger/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');

function showqrcode() {
if (location.href.substr(location.href.lastIndexOf('#') + 1) == "showqrcode" && selected == "yes") document.getElementById('showqrcode').style.display = "flex";
Expand Down
3 changes: 1 addition & 2 deletions assets/styles/style.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*
Merger - Merge Your Qrcode Together. Even Quicker.
User docs: https://merger.huangxin.org
Homepage: https://merger.huangxin.org
Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors).
Copyright reservation is required.
*/

html,
Expand Down
16 changes: 8 additions & 8 deletions merger.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Merger v0.28.4 - Merge Your Qrcodes Together. Even Quicker.
Merger v0.28.5 - Merge Your Qrcodes Together. Even Quicker.
Homepage: https://merger.huangxin.org
Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
Author @hifocus (https://github.com/hifocus) and contributors(https://github.com/qr-merger/merger/graphs/contributors).
Expand All @@ -16,13 +16,13 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<!-- Upgrade HTTP Connections to HTTPS - Default -->
<link rel="preconnect" href="https://cdn.staticfile.org" crossorigin>
<link rel="preconnect" href="https://cdn.staticfile.net" crossorigin>
<link rel="preconnect" href="https://sdn.geekzu.org" crossorigin>
<link rel="shortcut icon" type="image/x-icon" id="favicon"><!-- Page icon will be set automatically -->

<!-- Load style files from local - Default -->
<!-- build:css -->
<link rel="stylesheet" href="https://cdn.staticfile.org/merger/0.28.4/bundles/style.main.css">
<link rel="stylesheet" href="https://cdn.staticfile.net/merger/0.28.5/bundles/style.main.css">
<!-- <link rel="stylesheet" href="/assets/bundles/style.main.css"> -->
<!-- endbuild -->
</head>
Expand Down Expand Up @@ -56,7 +56,7 @@
// Merger supports dynamic page tile, however it's up to you to choose whether you want to brand merger
// If you set branding to true, `| Merger` will be subfixed to the set title
var branding = true; // Set variable to `false` to disable branding
const tracking = true; // Enable qr-merger tracking for the project's analytics
const tracking = true; // Enable qr-merger tracking to analyse project traffic with Microsoft Clarity. Data will be collected anonymously.

// Custom title & subtitle
// Only works with `multilingual` disabled
Expand Down Expand Up @@ -145,16 +145,16 @@ <h2 id="name"></h2>
<!-- Footer Scripts -->
<!-- Please do not swap scripts' order -->

<script src="https://cdn.staticfile.org/jquery/3.7.0/jquery.min.js"></script>
<script src="https://cdn.staticfile.org/lrsjng.jquery-qrcode/0.18.0/jquery-qrcode.min.js"></script>
<script src="https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js"></script>
<script src="https://cdn.staticfile.net/lrsjng.jquery-qrcode/0.18.0/jquery-qrcode.min.js"></script>
<!-- build:js -->
<script src="https://cdn.staticfile.org/merger/0.28.4/bundles/function.main.js"></script>
<script src="https://cdn.staticfile.net/merger/0.28.5/bundles/function.main.js"></script>
<!-- <script src="/assets/bundles/function.main.js"></script> -->
<!-- endbuild -->

<!-- Static files of this project is available on CDNJS and correlating mirror sites
https://cdnjs.com/libraries/merger
https://staticfile.org/
https://staticfile.net/
https://css.loli.net (https://cdnjs.loli.net) -->
</body>

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qr-merger",
"version": "0.28.4",
"version": "0.28.5",
"description": "📲 Merge Your Qrcodes Together. Even Quicker.",
"main": "merger.html",
"scripts": {
Expand All @@ -25,7 +25,7 @@
},
"homepage": "https://merger.huangxin.org",
"dependencies": {
"jquery": "^3.7.0"
"jquery": "^3.7.1"
},
"devDependencies": {
"cross-env": "^7.0.3",
Expand Down

0 comments on commit d8fc9d5

Please sign in to comment.