jekyll-zeta 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92e9c3d10127af0ab175e41aa41643467f0a73eac8027ae0f350f06c2ebd67ba
-  data.tar.gz: 3e9fa286e582ad2ed5acbc0a3d7c40baa51a34211789626c208a04afa3ba3b80
+  metadata.gz: 355269c9bb3e0eb724d648b8841875bc45026fa10b6173a17236940fb225e2d0
+  data.tar.gz: 7960a7083bb100e9cb89c4517fa8a26a15f864f8d243a23291b36096034b0a17
 SHA512:
-  metadata.gz: 860c508e7587807af43753eba3de599a51ef42acca73128c0460aa988260b34eb3c1a0b0e2d2fc3a13e73f9c301bd2c3e3b80292a670b5d366fe15e6948bd618
-  data.tar.gz: 9ca90a4536c7c716eb5b43349106475d14d34678cd6bf6db757cfdf3f4d2eb9c7c3864f968b0f95b987eb9fb498a000c481e4217ca16e3af0c7d081d1bed34fd
+  metadata.gz: faa4c3db616777ece4b3b80097f0ea0bddf5d32d9157bb813d6f0f48ebc82db47f7ca651aa60fa4ee6766dde31ef6d730b37f010f646c5f4fbfe05f6a79750cd
+  data.tar.gz: e17428da2bb51de98dd6547c2cc1ff4b283d1dad835f784412f6dbb687136c102f0dbff78a46874d95dae0099958ad7c670da42758d1300db1184c16465a29cd

data/_includes/heatmap.js

@@ -34,8 +34,29 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
     if (yearCfg[preYear]) {
       arr.push(getYearData(preYear ))
     }
-    Promise.all(arr).then(d2=>{
-      updateCell({...d2[0],...d2[1]});
+    Promise.all(arr).then(alldata=>{
+      let combineData = {};
+      let d1 = alldata[0];
+      let d2 = alldata[1];
+      
+      for (const key in d1) {
+        if (Object.prototype.hasOwnProperty.call(d1, key)) {
+          const element = d1[key];
+          let keyNew = 'K1-' + key;
+          combineData[keyNew] = element
+        }
+      }
+
+      for (const key in d2) {
+        if (Object.prototype.hasOwnProperty.call(d2, key)) {
+          const element = d2[key];
+          let keyNew = 'K2-' + key;
+          combineData[keyNew] = element
+        }
+      }
+
+
+      updateCell(combineData);
     })
   })
 
@@ -53,6 +74,8 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
   function updateCell(data){
     if(!data)return
 
+    console.log(data)
+
     let daysEle = document.getElementById(dayEleId)
     let dayCells = daysEle.childNodes
 
@@ -173,7 +196,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
 
 
     function updateMultiDays(){
-      let day = 6;
+      let day = 13;
       while (day -- ) {
         update1Day();
       }
@@ -183,10 +206,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
       }
 
     }
-
-    setTimeout(() => {
-      requestAnimationFrame(updateMultiDays)
-    }, 200);
+    requestAnimationFrame(updateMultiDays)
     
     return
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - vitock