diff --git a/assets/bundles/function.main.js b/assets/bundles/function.main.js index e649fca..a76b089 100644 --- a/assets/bundles/function.main.js +++ b/assets/bundles/function.main.js @@ -1 +1 @@ -var client,selected,scale=window.devicePixelRatio;$("#favicon").attr("href",profile_url);var userLang=navigator.language||navigator.userLanguage;if(!1!==multilingual)if(/zh-CN|zh-cn|zh-Hans|zh-hans|cn/i.test(userLang)){if("string"==typeof myname_hans)var myname=myname_hans}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if("string"==typeof myname_hant)myname=myname_hant}else if("string"==typeof myname_eng)myname=myname_eng;var firstchar=myname.charAt(0),lastchar=myname.charAt(myname.length-1),english=/^[A-Za-z0-9]*$/;if(english.test(firstchar)||english.test(lastchar))var finalname=" "+myname+" ",finalsub=subtitle.replace(myname,finalname),spacing=!0;else finalname=myname;var finalname_eng=" "+myname;if(null==usage||""===usage||"payment"!==usage&&"donate"!==usage){var usage="payment";console.log("%c The usage variable is not defined correctly","color: red")}if("undefined"==typeof branding||null===branding||""===branding||!0!==branding&&"true"!==branding)var aftertitle="";else if(!0===branding||"true"===branding)aftertitle=" | Merger";if(!1===multilingual)var finaltitle=title,wechatscan="微信扫一扫 向"+finalname+"支付",alipayscan="支付宝扫一扫 向"+finalname+"支付",payto="",presshold="长按识别二维码 向"+finalname+"支付",notavail="🚫 目前没有可用的支付方式",myname_hant=myname,myname_hans=myname,myname_eng=myname;else if(/zh-CN|zh-cn|zh-Hans|zh-hans|cn/i.test(userLang)){if(document.write(""),"payment"===usage)var method="付款";if("donate"===usage)method="捐赠";document.title="向"+finalname+method+aftertitle;var trans_wx="微信";finaltitle="向"+finalname+method,finalsub="从下方选择"+method+"方式",presshold="长按识别二维码",payto=" 向"+finalname+method,notavail="🚫 目前没有可用的"+method+"方式",wechatscan=(trans_wx="微信")+(scan="扫一扫"),alipayscan=(trans_ali="支付宝")+scan}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if(document.write(""),"payment"===usage)method="付款";if("donate"===usage)method="捐贈";document.title="向"+finalname+method+aftertitle;finaltitle="向"+finalname+method,finalsub="從下方選擇"+method+"方式",notavail="🚫 目前沒有可用的"+method+"方式",wechatscan=(trans_wx="WeChat ")+(scan="掃一掃"),alipayscan=(trans_ali="支付寶")+scan,presshold="長按識別二維碼",payto=" 向"+finalname+method}else{if("payment"===usage){method="Pay";var method_t="Payment"}if("donate"===usage)method="Donate",method_t="Donation";var method_lc=method.charAt(0).toLowerCase();document.title=method+" to"+finalname_eng+aftertitle,document.write("");trans_wx="WeChat";var trans_ali="AliPay",scanhint=(finaltitle=method+" to"+finalname_eng,finalsub="Select a "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method from below","Scan the QR Code to "+method+finalname_eng),scan=(presshold=method.replace(method.charAt(5),"")+method.charAt(5).replace("e","")+"ing to"+finalname_eng+":
Press and hold to recognise the QR Code","Scan the QR Code with ");payto="",notavail="🚫 Currently no "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method available",wechatscan=scan+trans_wx,alipayscan=scan+trans_ali}var error_num=0;if("undefined"==typeof wechat||null===wechat||""===wechat){document.getElementById("depends").removeChild(document.getElementById("toclick")),error_num+=1;var nowechat=!0}if("undefined"==typeof alipay||null===alipay||""===alipay){document.getElementById("depends").removeChild(document.getElementById("alipaybtn")),error_num+=1;var noalipay=!0}if("undefined"==typeof paypal||null===paypal||""===paypal)document.getElementById("depends").removeChild(document.getElementById("paypalbtn")),error_num+=1;else function openbox(){function e(e,t,n){var a=null!=window.screenLeft?window.screenLeft:window.screenX,o=null!=window.screenTop?window.screenTop:window.screenY,i=window.innerWidth?window.innerWidth:document.documentElement.clientWidth?document.documentElement.clientWidth:screen.width,l=window.innerHeight?window.innerHeight:document.documentElement.clientHeight?document.documentElement.clientHeight:screen.height,d=i/window.screen.availWidth,c=(i-t)/2/d+a,r=(l-n)/2/d+o,s=window.open(e,"_blank","width="+t/d+", height="+n/d+", top="+r+", left="+c);window.focus&&s.focus()}selected="yes",window.innerHeight',function(e){var t,n=(t=(t=document.getElementsByTagName("script"))[t.length-1]).getAttribute("data-injectcss");if(!(t=t.getAttribute("data-disable-injectsvg"))){var a,o,i,l,d;if(n&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}a=function(){var t,n=document.createElement("div");n.innerHTML=e._iconfont_svg_string_974919,(n=n.getElementsByTagName("svg")[0])&&(n.setAttribute("aria-hidden","true"),n.style.position="absolute",n.style.width=0,n.style.height=0,n.style.overflow="hidden",(t=document.body).firstChild?function(e,t){t.parentNode.insertBefore(e,t)}(n,t.firstChild):t.appendChild(n))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),a()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=a,l=e.document,d=!1,function e(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(e,50)}c()}(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,c())})}function c(){d||(d=!0,i())}}(window); \ No newline at end of file +var client,selected,scale=window.devicePixelRatio;$("#favicon").attr("href",profile_url);var userLang=navigator.language||navigator.userLanguage;if(!1!==multilingual)if(/zh-CN|zh-cn|zh-Hans|zh-hans|cn/i.test(userLang)){if("string"==typeof myname_hans)var myname=myname_hans}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if("string"==typeof myname_hant)myname=myname_hant}else if("string"==typeof myname_eng)myname=myname_eng;var firstchar=myname.charAt(0),lastchar=myname.charAt(myname.length-1),english=/^[A-Za-z0-9]*$/;if(english.test(firstchar)||english.test(lastchar))var finalname=" "+myname+" ",finalsub=subtitle.replace(myname,finalname),spacing=!0;else finalname=myname;var finalname_eng=" "+myname;if(null==usage||""===usage||"payment"!==usage&&"donate"!==usage){var usage="payment";console.log("%c The usage variable is not defined correctly","color: red")}if("undefined"==typeof branding||null===branding||""===branding||!0!==branding&&"true"!==branding)var aftertitle="";else if(!0===branding||"true"===branding)aftertitle=" | Merger";if(!1===multilingual)var finaltitle=title,wechatscan="微信扫一扫 向"+finalname+"支付",alipayscan="支付宝扫一扫 向"+finalname+"支付",payto="",presshold="长按识别二维码 向"+finalname+"支付",notavail="🚫 目前没有可用的支付方式",myname_hant=myname,myname_hans=myname,myname_eng=myname;else if(/zh-CN|zh-cn|zh-Hans|zh-hans|cn/i.test(userLang)){if(document.write(""),"payment"===usage)var method="付款";if("donate"===usage)method="捐赠";document.title="向"+finalname+method+aftertitle;var trans_wx="微信";finaltitle="向"+finalname+method,finalsub="从下方选择"+method+"方式",presshold="长按识别二维码",payto=" 向"+finalname+method,notavail="🚫 目前没有可用的"+method+"方式",wechatscan=(trans_wx="微信")+(scan="扫一扫"),alipayscan=(trans_ali="支付宝")+scan}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if(document.write(""),"payment"===usage)method="付款";if("donate"===usage)method="捐贈";document.title="向"+finalname+method+aftertitle;finaltitle="向"+finalname+method,finalsub="從下方選擇"+method+"方式",notavail="🚫 目前沒有可用的"+method+"方式",wechatscan=(trans_wx="WeChat ")+(scan="掃一掃"),alipayscan=(trans_ali="支付寶")+scan,presshold="長按識別二維碼",payto=" 向"+finalname+method}else{if("payment"===usage){method="Pay";var method_t="Payment"}if("donate"===usage)method="Donate",method_t="Donation";var method_lc=method.charAt(0).toLowerCase();document.title=method+" to"+finalname_eng+aftertitle,document.write("");trans_wx="WeChat";var trans_ali="AliPay",scanhint=(finaltitle=method+" to"+finalname_eng,finalsub="Select a "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method from below","Scan the QR Code to "+method+finalname_eng),scan=(presshold=method.replace(method.charAt(5),"")+method.charAt(5).replace("e","")+"ing to"+finalname_eng+":
Press and hold to recognise the QR Code","Scan the QR Code with ");payto="",notavail="🚫 Currently no "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method available",wechatscan=scan+trans_wx,alipayscan=scan+trans_ali}var error_num=0;if("undefined"==typeof wechat||null===wechat||""===wechat){document.getElementById("depends").removeChild(document.getElementById("toclick")),error_num+=1;var nowechat=!0}if("undefined"==typeof alipay||null===alipay||""===alipay){document.getElementById("depends").removeChild(document.getElementById("alipaybtn")),error_num+=1;var noalipay=!0}if("undefined"==typeof paypal||null===paypal||""===paypal)document.getElementById("depends").removeChild(document.getElementById("paypalbtn")),error_num+=1;else function openbox(){function e(e,t,n){var a=null!=window.screenLeft?window.screenLeft:window.screenX,o=null!=window.screenTop?window.screenTop:window.screenY,i=window.innerWidth?window.innerWidth:document.documentElement.clientWidth?document.documentElement.clientWidth:screen.width,l=window.innerHeight?window.innerHeight:document.documentElement.clientHeight?document.documentElement.clientHeight:screen.height,d=i/window.screen.availWidth,c=(i-t)/2/d+a,r=(l-n)/2/d+o,s=window.open(e,"_blank","width="+t/d+", height="+n/d+", top="+r+", left="+c);window.focus&&s.focus()}selected="yes",window.innerHeight',function(e){var t,n=(t=(t=document.getElementsByTagName("script"))[t.length-1]).getAttribute("data-injectcss");if(!(t=t.getAttribute("data-disable-injectsvg"))){var a,o,i,l,d;if(n&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}a=function(){var t,n=document.createElement("div");n.innerHTML=e._iconfont_svg_string_974919,(n=n.getElementsByTagName("svg")[0])&&(n.setAttribute("aria-hidden","true"),n.style.position="absolute",n.style.width=0,n.style.height=0,n.style.overflow="hidden",(t=document.body).firstChild?function(e,t){t.parentNode.insertBefore(e,t)}(n,t.firstChild):t.appendChild(n))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),a()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=a,l=e.document,d=!1,function e(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(e,50)}c()}(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,c())})}function c(){d||(d=!0,i())}}(window); \ No newline at end of file diff --git a/assets/js/function.js b/assets/js/function.js index a07d266..30d4065 100644 --- a/assets/js/function.js +++ b/assets/js/function.js @@ -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; @@ -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"; diff --git a/assets/styles/style.css b/assets/styles/style.css index 6808f6b..d06d6c3 100644 --- a/assets/styles/style.css +++ b/assets/styles/style.css @@ -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, diff --git a/merger.html b/merger.html index 7604e9d..005f942 100644 --- a/merger.html +++ b/merger.html @@ -1,5 +1,5 @@ - + - + @@ -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 @@ -145,16 +145,16 @@

- - + + - + diff --git a/package-lock.json b/package-lock.json index 36af6e8..baad30b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "qr-merger", - "version": "0.28.4", + "version": "0.28.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "qr-merger", - "version": "0.28.4", + "version": "0.28.5", "license": "GPL-3.0-or-later", "dependencies": { "jquery": "^3.7.0" diff --git a/package.json b/package.json index cac0bf5..3d7e250 100644 --- a/package.json +++ b/package.json @@ -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": { @@ -25,7 +25,7 @@ }, "homepage": "https://merger.huangxin.org", "dependencies": { - "jquery": "^3.7.0" + "jquery": "^3.7.1" }, "devDependencies": { "cross-env": "^7.0.3",