jekyll-zeta 0.9.16 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7a0fa4b377724b6cb054398f996b2ebf76a744db2ab4db6547061f7ded2132
-  data.tar.gz: 9bf5f6b8011161bd31831f0a4e456c3c1c3640d8304087beccc937e4e85184c2
+  metadata.gz: 0ee4f483ad64965afb1fb373b78541bc167b4ca5319d4101c6a3bc9c06aed56d
+  data.tar.gz: 1fe90ad0e2ddc8c22957e12970c025702475253284519b1fc67dbfe66367c6eb
 SHA512:
-  metadata.gz: fec2e0901004e8131b72f9fe0f1e03ce3e43a7abb3fd4c73a01de671124e58524826905a17b94803a4dc15243aa0abaa3bb3539ae6a4bb65d6c815471b1d656c
-  data.tar.gz: 2752c07287bc7eff053a7497fb7ce8ef9a195f73e0413c92331cfcdcf238f770f9800ec7a2acde0dfd70d8c308390bc03b5f7083fcee4ce789063b6735bfab09
+  metadata.gz: 78531f9f930b115082a2747a39cd05a0042bede9e668a4796ce755f5a448c65d89647b258f1668b12671418fa7afd15e77b26711775e33bb38165e5131552baa
+  data.tar.gz: e2cb05b82acb22eee6003d92d5ae66d07fba58fdbdf750ad965410bdcef705f9f7cfade274565008fdfcfff0a2087309ae2969f1ad3daf5bbe24482bc8a0a716

data/_includes/encrypted.html

@@ -199,7 +199,12 @@ function uint8ArrayToHex(uint8Array) {
     
                 document.getElementById("decrypted").style.display = 'block'
                 document.getElementById("decryptContent").innerHTML = plain
-    
+
+                const DECFUN = window['_after_dec_fun']
+                    
+                if (DECFUN && typeof DECFUN == 'function') {
+                    DECFUN()
+                }
                 setTimeout(function(){
                     var loadevent = document.createEvent("Event")
                     loadevent.initEvent("load", true, true)
@@ -210,11 +215,7 @@ function uint8ArrayToHex(uint8Array) {
                     window.dispatchEvent(loadevent)
                     window.dispatchEvent(DOMContentLoaded_event)
 
-                    const DECFUN = window['_after_dec_fun']
                     
-                    if (DECFUN && typeof DECFUN == 'function') {
-                        DECFUN()
-                    }
     
                 }, 100);
             } catch (error) {

data/_includes/getmapdata.js

@@ -19,16 +19,60 @@
     return 0
   }
 
+
+
+  function date2ymd(t) {
+    let m = t.getMonth() + 1;
+    let d = t.getDate();
+    return `${t.getFullYear()}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+  }
   /// 2025-01-01 描述，日期格式yyyy-mm-dd，空格后跟上 描述
   function getDataFromSignleLine(str0,gData) {
+    if(!str0) return null
     let str = str0.trim()
     if (!str) return null
 
-    if(getConfigFromStr(str,gData)) return null
+    if(gData && getConfigFromStr(str,gData)) return null
 
 
     var arr = str.split(" ")
     var date0 = arr[0]
+    date0 = date0.replace('～','~')
+    if (gData && date0.indexOf("~") > 0) {
+      let arrRg = date0.split('~')
+      let beginYmd = arrRg[0]
+      let endYmd = arrRg[1]
+      let dateBegin = new Date(beginYmd)
+      if (!dateBegin || isNaN(dateBegin)) {
+        
+        return
+      }
+      let rangCount = 7
+      if(endYmd){
+         let dend = new Date(endYmd)
+         if (dend && !isNaN(dend)) {
+          rangCount = Math.floor((dend.getTime() - dateBegin.getTime())/ 86400000) + 1
+         }
+         
+      }
+ 
+      const desc = arr.slice(1).join(' ')
+      
+      let resultArr = []
+      for (let i  = 0; i  < rangCount; i ++) {
+        const ymd = date2ymd(new Date(dateBegin.getTime() + i * 86400000))
+        const newStr = ymd + ' ' + desc
+        const newEle = getDataFromSignleLine(newStr)
+        if(newEle){
+          resultArr.push(newEle)
+        }
+      }
+      return resultArr.length ? resultArr : null
+
+    }
+
+
+
     let date = ''
     if (date0) {
       let ymd = date0.split("-")
@@ -114,12 +158,24 @@
     strData.split("\n").forEach(function (str,idx) {
       if(idx == 0) return 
       let item = getDataFromSignleLine(str,dataObj)
-      fillDataObj(dataObj, item)
-      if (item) {
-        if (item.date >= Recent365YMD) {
-          Recent365Count++
+      if (item && Array.isArray(item)) {
+        item.forEach(e=>{
+          fillDataObj(dataObj, e)
+          if (e) {
+            if (e.date >= Recent365YMD) {
+              Recent365Count++
+            }
+          }
+        })
+      }else{
+        fillDataObj(dataObj, item)
+        if (item) {
+          if (item.date >= Recent365YMD) {
+            Recent365Count++
+          }
         }
       }
+      
     })
 
 

data/_includes/heatmap_svg.js

@@ -45,7 +45,6 @@
   const TodayIdx =
     DayCount - Math.floor((endStamp - new Date(date2ymd(new Date))) / (24 * 3600000));
 
-  console.log('xxxxx',Math.floor((endStamp - Date.now()) / (24 * 3600000)));
 
   const beginIdx = !dateBegin ? -1 : DayCount - Math.floor((endStamp - dateBegin.getTime()) / (24 * 3600000));
 
@@ -473,7 +472,7 @@
     const row = dayidx % 7;
     const column = (dayidx - row) / 7;
     const x = dayStartX + column * (dayGap + dayW) + dayW / 2 - width / 2;
-    const y = dayStartY + row * (dayGap + dayH) - height ;
+    const y = dayStartY + row * (dayGap + dayH) - height - dayGap;
 
     tipG.setAttribute("transform", `translate(${x}, ${y})`);
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.19
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-19 00:00:00.000000000 Z
+date: 2025-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll