Skip to content

Commit

Permalink
Functional split view.
Browse files Browse the repository at this point in the history
  • Loading branch information
ranbo committed Feb 22, 2024
1 parent f2df239 commit 1fb3800
Show file tree
Hide file tree
Showing 3 changed files with 323 additions and 81 deletions.
41 changes: 20 additions & 21 deletions gx-util.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,19 @@ function parseDateIntoNumber(date) {
const typeLevelMap = {"Birth" : -2, "Christening" : -1, "Baptism": -1, "Death": 1, "Burial" : 2, "Cremation": 2}

function fixEventOrders(doc) {
if (doc.persons) {
for (let person of doc.persons) {
fixEventOrder(person);
}
}
if (doc.relationships) {
for (let relationship of doc.relationships) {
fixEventOrder(relationship);
}
}
}

function fixEventOrder(factHolder) {
function compareFactInfos(a, b) {
// Sort facts first by type (birth < chr < bap < death < bur < cremation)
// then by date (earlier < later < none)
Expand All @@ -376,7 +389,7 @@ function fixEventOrders(doc) {
if (!diff) {
let dateNumA = a.dateNum ? a.dateNum : 99999999;
let dateNumB = b.dateNum ? b.dateNum : 99999999;
diff = dateNumB - dateNumA;
diff = dateNumA - dateNumB;
if (!diff) {
diff = a.origOrder - b.origOrder;
}
Expand All @@ -403,25 +416,11 @@ function fixEventOrders(doc) {
return factInfos;
}

function fixEventOrder(factHolder) {
if (factHolder.facts && factHolder.facts.length > 1) {
let factInfos = getFactInfos(factHolder);
factInfos.sort(compareFactInfos);
for (let i = 0; i < factHolder.facts.length; i++) {
factHolder.facts[i] = factInfos[i].fact;
}
}
}

// fixEventOrders--------------
if (doc.persons) {
for (let person of doc.persons) {
fixEventOrder(person);
}
}
if (doc.relationships) {
for (let relationship of doc.relationships) {
fixEventOrder(relationship);
if (factHolder.facts && factHolder.facts.length > 1) {
let factInfos = getFactInfos(factHolder);
factInfos.sort(compareFactInfos);
for (let i = 0; i < factHolder.facts.length; i++) {
factHolder.facts[i] = factInfos[i].fact;
}
}
}
Expand All @@ -447,7 +446,7 @@ function getProperty(object, path) {
}

function extractType(url) {
return url ? url.replaceAll(/.*\//g, "").replaceAll(/data:,/g, "").replaceAll("%20", " ") : null;
return url ? url.replaceAll(/.*\//g, "").replaceAll(/data:,/g, "").replaceAll(/%20/g, " ") : null;
}

/**
Expand Down
44 changes: 44 additions & 0 deletions split/time-machine.css
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,51 @@ a:hover {
border-top: 1px solid red;
background-color: #f3f8f3
}
.split-extra {
border: 1px solid #cedace;
background-color: #f4fcfc;
white-space: nowrap;
}

.dir-button {
/*background-color: #f3f8f3;*/
/*border: 1px solid #9ab79a;*/
}
.collapse-button {
margin-left: 10px;
font-family: monospace;
}

.tooltip {
position: relative;
display: inline-block;
width: 100%;
}

.tooltip .tooltiptext {
visibility: hidden;
background-color: lightgrey;
color: #000;
text-align: left;
border-radius: 6px;
padding: 5px;
position: absolute;
z-index: 1;
bottom: 150%;
left: 20px;
}

.tooltip .tooltiptext::after {
content: "";
position: absolute;
top: 100%;
left: 20px;
margin-left: -5px;
border-width: 5px;
border-style: solid;
border-color: lightgrey transparent transparent transparent;
}

.tooltip:hover .tooltiptext {
visibility: visible;
}
Loading

0 comments on commit 1fb3800

Please sign in to comment.