jekyll-zeta 0.9.2.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb554b963a500d71ca61b1b166906b27e852c6a9d6effba110ec590280509bd
-  data.tar.gz: b6dafaaa3dc9e538d904677121751dabc9705de39243395c8e237f2f032ce8dd
+  metadata.gz: 7f5b7a9cb09e5360ed8f9eccc4b379b66fd3ccb90d72c9e4be56f58713967780
+  data.tar.gz: 071a4840f57b37af0ed8e740930899e1c2ddf5987d239b1d8d5b51ee4045c30d
 SHA512:
-  metadata.gz: f92a18271bc3a4b51a205660eca9f321336157e00740479753baff5ba44c5f6f7862478ae857fb933aae9257bcd7fc665cb15d29f6f47b05643df89bb5643444
-  data.tar.gz: 9146725015ec1cb9c4434b9e7daf8f910da85fea5120868237bbf87e5c6e6bfb0d9489c8b1a3f4a9f98a1389fa92412bd8a70beefb36a7b7f9f237fd4d5ad2ef
+  metadata.gz: 54d558bae02171320c3bc98c0969f38d1353dae74e189be0be26468dfa84bf1fc9a0ad2452ed1d6b8286f3d5ff68b5c73675ac77e5d1e0782975daadf0e06005
+  data.tar.gz: 26ae3613a849a15a4e9079de4183c5df9923394d2f82256773eb6a855ff1f220d20b1517d7dfa26abfe1ea0ece7fdb187093fae135ca7dfc1d20f443240442c0

data/_config.yml

@@ -19,9 +19,9 @@ theme_config:
   appearance: "auto" # can be "light", "dark" or "auto"
   navbarPosition: left # left or top
   date_format: "%m/%d" # customize how date is formatted
-  post_date_format: "%Y/%m/%d"
+  post_date_format: "%Y/%m/%d %a"
   encrypt_title: "Content is Encryped :)"
-  # encrypt_clear_btn: "清空缓存密码"
+  # encrypt_clear_btn: "清空缓存密码"A
   # decrypt_btn: 解密
   # encrypt_btn: 重新加密
   tag_showall: true

data/_includes/heatmap.html

@@ -29,16 +29,13 @@
 
     {%- assign MothStr = site.theme_config.heatMapMonth  -%}
     {%- assign HeatMapShowWeek = site.theme_config.heatMapShowWeek  -%}
-
-    {%- assign HeatMapType = site.theme_config.heatMapType  -%}
-
     {%- assign heatMapLoadCount = site.theme_config.heatMapLoadCount | default: 8  -%}
     
+    const WeeKStartStr = "{{ site.theme_config.heatMapWeekStart | default: 0 }}" ;//  0 sunday 1 monday 2. tuesday ...
 
-    const heatMapLoadCount = {{heatMapLoadCount}}
-    var _HeatMapType = "{{ HeatMapType | default:'1' }}"
-    var _MonthStr =  '{{ MothnStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}'
-    var _showWeek =  '{{ HeatMapShowWeek | default: "Mon Wed Fri" }}';
+    const heatMapLoadCount = {{heatMapLoadCount}};
+    var _MonthStr =  '{{ MothnStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}';
+    var _showWeek =  '{{ HeatMapShowWeek | default: "Sun Mon Tue Wed Thu Fri Sat" }}';
     var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
     {% include heatmap.js  %}
   }

data/_includes/heatmap.js

@@ -1,4 +1,7 @@
 ;!(function () {
+  
+  const WeeKStart = parseInt(WeeKStartStr)
+
 
   var GDATA = window._G_DATA;
   if (!GDATA) {
@@ -13,8 +16,10 @@
     return `${t.getFullYear()}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
   }
 
+  const strictMod =  endYear && endYear.length == 4;
+  const maxDateYmd = `${endYear}-12-31`
   const dateEnd =
-    endYear && endYear.length == 4 ? new Date(`${endYear}-12-31`) : new Date();
+    endYear && endYear.length == 4 ? new Date(maxDateYmd) : new Date();
 
   const endStamp = dateEnd.getTime();
   const dayEleId = Math.random().toString(16).substring(2);
@@ -22,9 +27,10 @@
   arr.pop();
   const jsonUrlBase = arr.join("/");
 
+  const nLastColumnCount = (dateEnd.getDay() -  WeeKStart + 7) % 7 + 1
   const ColumnsCount = 53;
   const RowCount = 7;
-  const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
+  const DayCount = (ColumnsCount - 1) * RowCount + nLastColumnCount;
 
   let queue  = window._y_queue || []
   window._y_queue = queue;
@@ -173,6 +179,7 @@
 
       shuffle(SEQ);
 
+      const minYmd = `${endYear - 1}${maxDateYmd.substring(4)}`
       function update1Day() {
         if (G_idxOfDay < 0) {
           return;
@@ -180,8 +187,19 @@
         const idxOfDay = SEQ[G_idxOfDay--];
         let dateKeyYmd = idx2Ymd(idxOfDay);
         let arrPostInOneDay = Map[dateKeyYmd];
+
+        let hideblock = false
+        if (strictMod) {
+          hideblock = dateKeyYmd <= minYmd;
+          
+        }
+
         const dayCell = dayCells[idxOfDay];
-        const nobg =
+        if (hideblock) {
+          dayCell.classList = 'heatmap-day-cell hm-check-notyet'
+        }else{
+          
+          const nobg =
           parseInt(dateKeyYmd.substring(5, 7)) % 2 == 1
             ? "hm-check-no-b"
             : "hm-check-no-a";
@@ -223,6 +241,9 @@
           });
           dayCell.appendChild(tip);
         }
+        }
+
+        
       }
 
       function updateMultiDays() {
@@ -301,7 +322,7 @@
     const monthStr = _MonthStr.split(" ");
 
     let nowM = dateEnd.getMonth();
-    let nowWeek = dateEnd.getDay();
+    let nowWeekIdx = nLastColumnCount - 1;
 
     for (let i = 0; i < monthStr.length; i++) {
       let m = document.createElement("span");
@@ -315,9 +336,10 @@
     const WeekStr = _showWeek.split(" ");
 
     for (let i = 0; i < WeekStr.length; i++) {
+      const idx = (i + WeeKStart) % 7
       let m = document.createElement("div");
       m.className = "heatmap-week-cell";
-      m.innerHTML = `<span>${WeekStr[i]}</span>`;
+      m.innerHTML = i % 2  ?  `<span>${WeekStr[idx]}</span>` : ''
       weekEle.appendChild(m);
     }
 
@@ -328,13 +350,11 @@
     dayEle.className = "heatmap-day";
     dayEle.id = dayEleId;
 
-    let firstDateDayDiff = (ColumnsCount - 1) * RowCount + nowWeek;
-
-    // console.log(nowWeek, firstDateDayDiff);
+    // console.log(nowWeekIdx, firstDateDayDiff);
 
     for (let c = 0; c < ColumnsCount; c++) {
       for (let r = 0; r < RowCount; r++) {
-        if (r > nowWeek && c == ColumnsCount - 1) {
+        if (r > nowWeekIdx && c == ColumnsCount - 1) {
           break;
         }
 

data/_sass/heatmap.scss

@@ -65,7 +65,9 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   justify-content: center;
   padding-right: 0.2em;
   font-size: 0.8rem;
-  font-family:  $heatFont
+  font-family:  $heatFont;
+  line-height: $hmbloksizeH;
+  height: $hmbloksizeH;
 }
 
 .heatmap-day{
@@ -118,6 +120,10 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   background-color: #edebf0aa;
 }
 
+.hm-check-notyet{
+  visibility: hidden;
+}
+
 .heatmap-day-cell:hover{
   transform: scale(1.3);
   z-index: 999;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.2.2
+  version: 0.9.4
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2024-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll