From b3294c81606f81f1c87a2b2e5fcd1c5f41dd358c Mon Sep 17 00:00:00 2001 From: ruibaby Date: Wed, 19 Dec 2018 21:33:30 +0800 Subject: [PATCH] :bookmark: 0.2.0 --- .../java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java | 2 +- .../static/halo-backend/plugins/quicklink/quicklink.js | 1 - src/main/resources/templates/admin/module/_footer.ftl | 2 +- src/main/resources/templates/admin/module/_macro.ftl | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/static/halo-backend/plugins/quicklink/quicklink.js diff --git a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java index 899a549df..10c5a0924 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java @@ -129,7 +129,7 @@ public class AttachmentServiceImpl implements AttachmentService { Map resultMap; String attachLoc = HaloConst.OPTIONS.get(BlogPropertiesEnum.ATTACH_LOC.getProp()); if (StrUtil.isEmpty(attachLoc)) { - return null; + attachLoc = "server"; } switch (attachLoc) { case "server": diff --git a/src/main/resources/static/halo-backend/plugins/quicklink/quicklink.js b/src/main/resources/static/halo-backend/plugins/quicklink/quicklink.js deleted file mode 100644 index e8a7b4ea5..000000000 --- a/src/main/resources/static/halo-backend/plugins/quicklink/quicklink.js +++ /dev/null @@ -1 +0,0 @@ -!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.quicklink=n()}(this,function(){var e={};function n(e){return new Promise(function(n,t){var r=new XMLHttpRequest;r.open("GET",e,r.withCredentials=!0),r.onload=function(){200===r.status?n():t()},r.send()})}var t,r,i=(t="prefetch",((r=document.createElement("link")).relList||{}).supports&&r.relList.supports(t)?function(e){return new Promise(function(n,t){var r=document.createElement("link");r.rel="prefetch",r.href=e,r.onload=n,r.onerror=t,document.head.appendChild(r)})}:n);function o(t,r,o){if(!(e[t]||(o=navigator.connection)&&((o.effectiveType||"").includes("2g")||o.saveData)))return(r?function(e){return null==self.fetch?n(e):fetch(e,{credentials:"include"})}:i)(t).then(function(){e[t]=!0})}var u=u||function(e){var n=Date.now();return setTimeout(function(){e({didTimeout:!1,timeRemaining:function(){return Math.max(0,50-(Date.now()-n))}})},1)},c=new Set,f=new IntersectionObserver(function(e){e.forEach(function(e){if(e.isIntersecting){var n=e.target.href;c.has(n)&&a(n)}})});function a(e){c.delete(e),o(new URL(e,location.href).toString(),f.priority)}return function(e){e=Object.assign({timeout:2e3,priority:!1,timeoutFn:u,el:document},e),f.priority=e.priority;var n=e.origins||[location.hostname],t=e.ignores||[];e.timeoutFn(function(){e.urls?e.urls.forEach(a):Array.from(e.el.querySelectorAll("a"),function(e){f.observe(e),n.length&&!n.includes(e.hostname)||function e(n,t){return Array.isArray(t)?t.some(function(t){return e(n,t)}):(t.test||t).call(t,n.href,n)}(e,t)||c.add(e.href)})},{timeout:e.timeout})}}); diff --git a/src/main/resources/templates/admin/module/_footer.ftl b/src/main/resources/templates/admin/module/_footer.ftl index c3964802b..cd80670ee 100755 --- a/src/main/resources/templates/admin/module/_footer.ftl +++ b/src/main/resources/templates/admin/module/_footer.ftl @@ -1,5 +1,5 @@
<#-- 虽然Halo使用了宽松的GPL协议,但开发不易,希望您可以保留一下版权声明。笔芯~ --> - + Thanks for using Halo.
diff --git a/src/main/resources/templates/admin/module/_macro.ftl b/src/main/resources/templates/admin/module/_macro.ftl index 8cc8b892f..9b0a223fd 100644 --- a/src/main/resources/templates/admin/module/_macro.ftl +++ b/src/main/resources/templates/admin/module/_macro.ftl @@ -49,7 +49,6 @@ <#if (options.blog_locale!'zh_CN') == 'zh_CN'> - <@compress single_line=true>