Skip to content

Commit

Permalink
Merge pull request #22 from williamtroup/1.6.1
Browse files Browse the repository at this point in the history 
1.6.1
  • Loading branch information
William Troup authored Jan 28, 2024
2 parents aa50edf + 7ade871 commit af07bca
Show file tree
Hide file tree
Showing 27 changed files with 330 additions and 211 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
Heat.js

[![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Heat.js%2C%20a%20free%20JavaScript%heat%20map&url=https://github.com/williamtroup/Heat.js&hashtags=javascript,heat,map)
[![npm](https://img.shields.io/badge/npmjs-v1.6.0-blue)](https://www.npmjs.com/package/jheat.js)
[![nuget](https://img.shields.io/badge/nuget-v1.6.0-purple)](https://www.nuget.org/packages/jHeat.js/)
[![npm](https://img.shields.io/badge/npmjs-v1.6.1-blue)](https://www.npmjs.com/package/jheat.js)
[![nuget](https://img.shields.io/badge/nuget-v1.6.1-purple)](https://www.nuget.org/packages/jHeat.js/)
[![license](https://img.shields.io/badge/license-MIT-green)](https://github.com/williamtroup/Heat.js/blob/main/LICENSE.txt)
[![discussions Welcome](https://img.shields.io/badge/discussions-Welcome-red)](https://github.com/williamtroup/Heat.js/discussions)
[![coded by William Troup](https://img.shields.io/badge/coded_by-William_Troup-yellow)](https://william-troup.com/)
</h1>

> <p align="center">🌞 A lightweight JavaScript library that generates customizable heat maps and charts to visualize date-based activity and trends.</p>
> <p align="center">v1.6.0</p>
> <p align="center">v1.6.1</p>
<br />
![Heat.js](docs/images/main.png)
Expand Down
6 changes: 3 additions & 3 deletions README_NUGET.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Heat.js v1.6.0
# Heat.js v1.6.1

[![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Heat.js%2C%20a%20free%20JavaScript%heat%20map&url=https://github.com/williamtroup/Heat.js&hashtags=javascript,heat,map)
[![npm](https://img.shields.io/badge/npmjs-v1.6.0-blue)](https://www.npmjs.com/package/jheat.js)
[![nuget](https://img.shields.io/badge/nuget-v1.6.0-purple)](https://www.nuget.org/packages/jHeat.js/)
[![npm](https://img.shields.io/badge/npmjs-v1.6.1-blue)](https://www.npmjs.com/package/jheat.js)
[![nuget](https://img.shields.io/badge/nuget-v1.6.1-purple)](https://www.nuget.org/packages/jHeat.js/)
[![license](https://img.shields.io/badge/license-MIT-green)](https://github.com/williamtroup/Heat.js/blob/main/LICENSE.txt)
[![discussions Welcome](https://img.shields.io/badge/discussions-Welcome-red)](https://github.com/williamtroup/Heat.js/discussions)
[![coded by William Troup](https://img.shields.io/badge/coded_by-William_Troup-yellow)](https://william-troup.com/)
Expand Down
115 changes: 59 additions & 56 deletions dist/heat.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Heat.js v1.6.0 | (c) Bunoon 2024 | MIT License */
/*! Heat.js v1.6.1 | (c) Bunoon 2024 | MIT License */
(function() {
function render() {
var tagTypes = _configuration.domElementTypes;
Expand Down Expand Up @@ -195,7 +195,7 @@
fireCustomTrigger(bindingOptions.onNextYear, bindingOptions.currentView.year);
};
} else {
optionMap.className += _string.space + "title-active";
addClass(optionMap, "title-active");
}
if (bindingOptions.currentView.view !== _elements_View_Chart) {
optionChart.onclick = function() {
Expand All @@ -204,7 +204,7 @@
fireCustomTrigger(bindingOptions.onNextYear, bindingOptions.currentView.year);
};
} else {
optionChart.className += _string.space + "title-active";
addClass(optionChart, "title-active");
}
if (bindingOptions.showExportButton) {
var exportData = createElementWithHTML(titleBar, "button", "export", _configuration.exportButtonText);
Expand Down Expand Up @@ -256,7 +256,7 @@
fireCustomTrigger(bindingOptions.onNextYear, bindingOptions.currentView.year);
};
} else {
year.className += _string.space + "year-active";
addClass(year, "year-active");
}
}
function renderControlMap(bindingOptions) {
Expand All @@ -269,7 +269,7 @@
if (bindingOptions.showDayNames) {
var days = createElement(map, "div", "days");
if (!bindingOptions.showMonthNames || bindingOptions.placeMonthNamesOnTheBottom) {
days.style.paddingTop = "0px";
days.className = "days-months-bottom";
}
var dayNameIndex = 0;
for (; dayNameIndex < 7; dayNameIndex++) {
Expand Down Expand Up @@ -357,11 +357,11 @@
fireCustomTrigger(bindingOptions.onDayClick, date, dateCount);
};
} else {
day.className += _string.space + "no-click";
addClass(day, "no-hover");
}
var useMapRangeColor = getMapRangeColor(mapRangeColors, dateCount);
if (isDefined(useMapRangeColor) && isHeatMapColorVisible(bindingOptions, useMapRangeColor.id)) {
day.className += _string.space + useMapRangeColor.cssClassName;
addClass(day, useMapRangeColor.cssClassName);
}
return day;
}
Expand Down Expand Up @@ -454,11 +454,11 @@
fireCustomTrigger(bindingOptions.onDayClick, date, dateCount);
};
} else {
dayLine.className += _string.space + "no-click";
addClass(dayLine, "no-hover");
}
var useMapRangeColor = getMapRangeColor(mapRangeColors, dateCount);
if (isDefined(useMapRangeColor) && isHeatMapColorVisible(bindingOptions, useMapRangeColor.id)) {
dayLine.className += _string.space + useMapRangeColor.cssClassName;
addClass(dayLine, useMapRangeColor.cssClassName);
}
}
function renderControlViewGuide(bindingOptions) {
Expand Down Expand Up @@ -491,7 +491,7 @@
updateMapRangeColorToggles(bindingOptions, false);
};
} else {
lessText.className += _string.space + "no-click";
addClass(lessText, "no-click");
}
var days = createElement(mapToggles, "div", "days");
var mapRangeColors = bindingOptions.mapRangeColors.sort(function(a, b) {
Expand All @@ -508,14 +508,14 @@
updateMapRangeColorToggles(bindingOptions, true);
};
} else {
moreText.className += _string.space + "no-click";
addClass(moreText, "no-click");
}
}
}
function renderControlViewGuideTypeButton(bindingOptions, mapTypes, type) {
var typeButton = createElementWithHTML(mapTypes, "button", "type", type);
if (bindingOptions.currentView.type === type) {
typeButton.className += _string.space + "active";
addClass(typeButton, "active");
}
typeButton.onclick = function() {
if (bindingOptions.currentView.type !== type) {
Expand Down Expand Up @@ -547,7 +547,7 @@
renderControlContainer(bindingOptions);
};
} else {
day.className += _string.space + "no-click";
addClass(day, "no-hover");
}
}
function exportAllData(bindingOptions) {
Expand Down Expand Up @@ -600,13 +600,13 @@
}
function getCsvFilename(bindingOptions) {
var date = new Date();
var datePart = padNumber(date.getDate()) + "-" + padNumber(date.getMonth() + 1) + "-" + date.getFullYear();
var timePart = padNumber(date.getHours()) + "-" + padNumber(date.getMinutes());
var datePart = padNumber(date.getDate()) + _string.dash + padNumber(date.getMonth() + 1) + _string.dash + date.getFullYear();
var timePart = padNumber(date.getHours()) + _string.dash + padNumber(date.getMinutes());
var filenameStart = _string.empty;
if (bindingOptions.currentView.type !== _elements_DateCounts_DefaultType) {
filenameStart = bindingOptions.currentView.type.toLowerCase().replace(_string.space, "_") + "_";
filenameStart = bindingOptions.currentView.type.toLowerCase().replace(_string.space, _string.underscore) + _string.underscore;
}
return filenameStart + datePart + "_" + timePart + ".csv";
return filenameStart + datePart + _string.underscore + timePart + ".csv";
}
function getCsvValue(text) {
text = text.toString().replace(/(\r\n|\n|\r)/gm, _string.empty).replace(/(\s\s)/gm, _string.space);
Expand Down Expand Up @@ -767,6 +767,43 @@
}
return value;
}
function addClass(element, className) {
element.className += _string.space + className;
}
function cancelBubble(e) {
e.preventDefault();
e.cancelBubble = true;
}
function getScrollPosition() {
var doc = _parameter_Document.documentElement;
var left = (_parameter_Window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
var top = (_parameter_Window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
return {left:left, top:top};
}
function showElementAtMousePosition(e, element) {
var left = e.pageX;
var top = e.pageY;
var scrollPosition = getScrollPosition();
element.style.display = "block";
if (left + element.offsetWidth > _parameter_Window.innerWidth) {
left = left - element.offsetWidth;
} else {
left++;
}
if (top + element.offsetHeight > _parameter_Window.innerHeight) {
top = top - element.offsetHeight;
} else {
top++;
}
if (left < scrollPosition.left) {
left = e.pageX + 1;
}
if (top < scrollPosition.top) {
top = e.pageY + 1;
}
element.style.left = left + "px";
element.style.top = top + "px";
}
function fireCustomTrigger(triggerFunction) {
var result = null;
if (isDefinedFunction(triggerFunction)) {
Expand Down Expand Up @@ -823,46 +860,12 @@
}
return {parsed:parsed, result:result};
}
function cancelBubble(e) {
e.preventDefault();
e.cancelBubble = true;
}
function getScrollPosition() {
var doc = _parameter_Document.documentElement;
var left = (_parameter_Window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
var top = (_parameter_Window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
return {left:left, top:top};
}
function showElementAtMousePosition(e, element) {
var left = e.pageX;
var top = e.pageY;
var scrollPosition = getScrollPosition();
element.style.display = "block";
if (left + element.offsetWidth > _parameter_Window.innerWidth) {
left = left - element.offsetWidth;
} else {
left++;
}
if (top + element.offsetHeight > _parameter_Window.innerHeight) {
top = top - element.offsetHeight;
} else {
top++;
}
if (left < scrollPosition.left) {
left = e.pageX + 1;
}
if (top < scrollPosition.top) {
top = e.pageY + 1;
}
element.style.left = left + "px";
element.style.top = top + "px";
}
function newGuid() {
var result = [];
var charIndex = 0;
for (; charIndex < 32; charIndex++) {
if (charIndex === 8 || charIndex === 12 || charIndex === 16 || charIndex === 20) {
result.push("-");
result.push(_string.dash);
}
var character = Math.floor(Math.random() * 16).toString(16);
result.push(character);
Expand All @@ -874,10 +877,10 @@
return numberString.length === 1 ? "0" + numberString : numberString;
}
function toStorageDate(date) {
return date.getFullYear() + "-" + padNumber(date.getMonth() + 1) + "-" + padNumber(date.getDate());
return date.getFullYear() + _string.dash + padNumber(date.getMonth() + 1) + _string.dash + padNumber(date.getDate());
}
function getStorageDateYear(data) {
return data.split("-")[0];
return data.split(_string.dash)[0];
}
function buildDefaultConfiguration() {
_configuration.safeMode = getDefaultBoolean(_configuration.safeMode, true);
Expand Down Expand Up @@ -916,7 +919,7 @@
var _parameter_Document = null;
var _parameter_Window = null;
var _configuration = {};
var _string = {empty:"", space:" ", newLine:"\n"};
var _string = {empty:"", space:" ", newLine:"\n", dash:"-", underscore:"_"};
var _elements_Type = {};
var _elements_Day_Width = null;
var _elements_DateCounts = {};
Expand Down Expand Up @@ -1123,7 +1126,7 @@
return this;
};
this.getVersion = function() {
return "1.6.0";
return "1.6.1";
};
(function(documentObject, windowObject) {
_parameter_Document = documentObject;
Expand Down
36 changes: 21 additions & 15 deletions dist/heat.js.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Heat.js Library v1.6.0
* Heat.js Library v1.6.1
*
* Copyright 2024 Bunoon
* Released under the MIT License
Expand Down Expand Up @@ -284,7 +284,8 @@ div.heat-js div.map-contents div.map {
display: inline-flex;
flex-direction: row;
}
div.heat-js div.map-contents div.map div.days {
div.heat-js div.map-contents div.map div.days,
div.heat-js div.map-contents div.map div.days-months-bottom {
background-color: var(--heat-js-container-background-color);
padding-right: calc(var(--heat-js-spacing) * 3);
padding-top: calc(var(--heat-js-spacing-font-size) + var(--heat-js-spacing) + 1px);
Expand All @@ -294,11 +295,13 @@ div.heat-js div.map-contents div.map div.days {
z-index: 50;
}
@media (min-width: 768px) {
div.heat-js div.map-contents div.map div.days {
div.heat-js div.map-contents div.map div.days,
div.heat-js div.map-contents div.map div.days-months-bottom {
display: block;
}
}
div.heat-js div.map-contents div.map div.days div.day-name {
div.heat-js div.map-contents div.map div.days div.day-name,
div.heat-js div.map-contents div.map div.days-months-bottom div.day-name {
font-weight: var(--heat-js-text-bold-weight);
text-align: left !important;
height: var(--heat-js-day-size);
Expand All @@ -307,6 +310,9 @@ div.heat-js div.map-contents div.map div.days div.day-name {
justify-content: center;
flex-direction: column;
}
div.heat-js div.map-contents div.map div.days-months-bottom {
padding-top: 0 !important;
}
div.heat-js div.map-contents div.map div.months {
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -357,7 +363,7 @@ div.heat-js div.map-contents div.map div.months div.month div.day-columns div.da
border: var(--heat-js-border-size) solid var(--heat-js-day-border-color);
transition: var(--heat-js-transition);
}
div.heat-js div.map-contents div.map div.months div.month div.day-columns div.day-column div.day:hover {
div.heat-js div.map-contents div.map div.months div.month div.day-columns div.day-column div.day:not(.no-hover):hover {
cursor: pointer;
background: var(--heat-js-day-background-color-hover);
}
Expand Down Expand Up @@ -444,7 +450,7 @@ div.heat-js div.chart-contents div.chart div.day-lines div.day-line:first-child
div.heat-js div.chart-contents div.chart div.day-lines div.day-line:last-child {
margin-right: 0;
}
div.heat-js div.chart-contents div.chart div.day-lines div.day-line:hover {
div.heat-js div.chart-contents div.chart div.day-lines div.day-line:not(.no-hover):hover {
cursor: pointer;
background: var(--heat-js-day-background-color-hover);
}
Expand Down Expand Up @@ -572,7 +578,6 @@ div.heat-js div.guide div.map-toggles div.days div.day {
width: var(--heat-js-day-size);
height: var(--heat-js-day-size);
margin-right: var(--heat-js-day-spacing);
cursor: pointer;
transition: var(--heat-js-transition);
}
div.heat-js div.guide div.map-toggles div.days div.day:last-child {
Expand All @@ -584,16 +589,17 @@ div.heat-js div.guide div.map-toggles div.days div.day:last-child {
Heat.js - Colors
-------------------------------------------------------------------------
*/
div.heat-js div.day-color-1:active,
div.heat-js div.day-color-2:active,
div.heat-js div.day-color-3:active,
div.heat-js div.day-color-4:active {
div.heat-js div.day-color-1:not(.no-hover):active,
div.heat-js div.day-color-2:not(.no-hover):active,
div.heat-js div.day-color-3:not(.no-hover):active,
div.heat-js div.day-color-4:not(.no-hover):active {
opacity: var(--heat-js-day-opacity-active) !important;
}
div.heat-js div.day-color-1:hover,
div.heat-js div.day-color-2:hover,
div.heat-js div.day-color-3:hover,
div.heat-js div.day-color-4:hover {
div.heat-js div.day-color-1:not(.no-hover):hover,
div.heat-js div.day-color-2:not(.no-hover):hover,
div.heat-js div.day-color-3:not(.no-hover):hover,
div.heat-js div.day-color-4:not(.no-hover):hover {
cursor: pointer;
opacity: var(--heat-js-day-opacity-hover);
}
div.heat-js div.day-color-1 {
Expand Down
Loading

0 comments on commit af07bca

Please sign in to comment.