From ac849fe0628443dcee46932742a6a9da9cf748b3 Mon Sep 17 00:00:00 2001 From: Alberto Romeu Date: Mon, 25 Nov 2019 14:05:14 +0100 Subject: [PATCH 1/6] cartoframes cross reference docs --- grunt-tasks/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt-tasks/config.js b/grunt-tasks/config.js index 30cada33c..eae9b67cd 100644 --- a/grunt-tasks/config.js +++ b/grunt-tasks/config.js @@ -40,7 +40,7 @@ module.exports = { data: '/_data', path: '/cartoframes', tag: 'v1.0b5', - branch: '', + branch: 'enrichment_cross_reference', releases: ['v1.0b5', 'v0.10.1'], version: '' // empty if current }, From c042db7a3d0458211f1efded505ed10bd5dc319b Mon Sep 17 00:00:00 2001 From: Alberto Romeu Date: Tue, 26 Nov 2019 08:24:27 +0100 Subject: [PATCH 2/6] test branch --- grunt-tasks/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt-tasks/config.js b/grunt-tasks/config.js index eae9b67cd..04c64b8c5 100644 --- a/grunt-tasks/config.js +++ b/grunt-tasks/config.js @@ -40,7 +40,7 @@ module.exports = { data: '/_data', path: '/cartoframes', tag: 'v1.0b5', - branch: 'enrichment_cross_reference', + branch: '1183_catalog_reference', releases: ['v1.0b5', 'v0.10.1'], version: '' // empty if current }, From 25d0a36758738695dad03574d43e3c6a876761fa Mon Sep 17 00:00:00 2001 From: Alberto Romeu Date: Wed, 27 Nov 2019 09:03:57 +0100 Subject: [PATCH 3/6] new branch to test --- grunt-tasks/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt-tasks/config.js b/grunt-tasks/config.js index 04c64b8c5..6a6faaeac 100644 --- a/grunt-tasks/config.js +++ b/grunt-tasks/config.js @@ -40,7 +40,7 @@ module.exports = { data: '/_data', path: '/cartoframes', tag: 'v1.0b5', - branch: '1183_catalog_reference', + branch: '996_discover_data', releases: ['v1.0b5', 'v0.10.1'], version: '' // empty if current }, From 17fff56c212da330255574b10a55e3faefac6b1b Mon Sep 17 00:00:00 2001 From: Alberto Romeu Date: Wed, 27 Nov 2019 19:57:27 +0100 Subject: [PATCH 4/6] vertical scroll for div wrappers --- _app/_js/utils/sidebar.js | 135 +++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 68 deletions(-) diff --git a/_app/_js/utils/sidebar.js b/_app/_js/utils/sidebar.js index d2d736fe3..530200188 100644 --- a/_app/_js/utils/sidebar.js +++ b/_app/_js/utils/sidebar.js @@ -1,45 +1,45 @@ //Guides sidebar -function isGuide(){ +function isGuide() { var guideElement = document.getElementsByClassName("docs-guide"); return (guideElement.length > 0); } -function isSupport(){ +function isSupport() { var supportElement = document.getElementsByClassName("docs-support"); return (supportElement.length > 0); } -function isReference(){ +function isReference() { var referenceElement = document.getElementsByClassName("docs-reference"); return (referenceElement.length > 0); } -function isOverview(){ +function isOverview() { var overviewElement = document.getElementsByClassName("docs-overview"); return (overviewElement.length > 0); } -function isReferenceImported(){ +function isReferenceImported() { var referenceElement = document.getElementsByClassName("content-reference-imported"); return (referenceElement.length > 0); } -function getSidebar(){ +function getSidebar() { var sidebar = document.getElementsByClassName("js-sidebar"); return sidebar[0]; } -function getSidebarInner(){ +function getSidebarInner() { var sidebar = document.getElementsByClassName("js-sidebar-inner"); return sidebar[0]; } -function getSelectedElement(){ +function getSelectedElement() { var selectedElement = getSidebar().getElementsByClassName("js-selectedElement"); return selectedElement[0]; } -function createLinkElement(classes, linkURL, text){ +function createLinkElement(classes, linkURL, text) { var element = document.createElement("A"); element.className = classes; element.href = linkURL; @@ -49,17 +49,17 @@ function createLinkElement(classes, linkURL, text){ return element; } -function createListElement(child){ +function createListElement(child) { var element = document.createElement("LI"); element.classList.add("one-line--ellipsis") element.appendChild(child); return element; } -function generateSubtitles(tag){ +function generateSubtitles(tag) { var subtitles = document.getElementsByTagName(tag); var ulSubtitles = document.createElement("UL"); - for(i=0; i < subtitles.length; i++){ + for (i = 0; i < subtitles.length; i++) { var link = createLinkElement("text is-small is-txtBaseGrey u-lspace--16 js-listElement", "#" + subtitles[i].id, subtitles[i].textContent); var listElement = createListElement(link); ulSubtitles.appendChild(listElement); @@ -67,26 +67,26 @@ function generateSubtitles(tag){ return ulSubtitles; } -function addSubelementsSideBar(){ +function addSubelementsSideBar() { var subtitlesList = generateSubtitles("h3"); var list = getSelectedElement().parentElement; list.appendChild(subtitlesList); } -function removeClassFromElements(elements, className){ - for(i = 0; i < elements.length; i++){ +function removeClassFromElements(elements, className) { + for (i = 0; i < elements.length; i++) { elements[i].classList.remove(className); } } -function currentSection(selectors){ +function currentSection(selectors) { var subtitles = getSubtitles(selectors); var elem = null; - for(i = 0; i < subtitles.length; i++){ + for (i = 0; i < subtitles.length; i++) { elem = subtitles[i]; - if(subtitles[i].getBoundingClientRect().top > 200){ - if(i > 0) - elem = subtitles[i-1]; + if (subtitles[i].getBoundingClientRect().top > 200) { + if (i > 0) + elem = subtitles[i - 1]; else elem = subtitles[0]; break; @@ -95,14 +95,14 @@ function currentSection(selectors){ return elem; } -function selectElement(selectors){ +function selectElement(selectors) { var section = currentSection(selectors); - if(!section) + if (!section) return null; var elemToBold = document.querySelectorAll("a[href='#" + section.id + "']"); - if(!elemToBold[0]) + if (!elemToBold[0]) return null; - if(!elemToBold[0].classList.contains("is-semibold-selected")){ + if (!elemToBold[0].classList.contains("is-semibold-selected")) { elements = document.getElementsByClassName("js-listElement"); removeClassFromElements(elements, "is-semibold-selected"); } @@ -111,38 +111,38 @@ function selectElement(selectors){ function getSubtitles(selectors) { var subtitles = []; - for(i = 0; i < selectors.length; i++){ + for (i = 0; i < selectors.length; i++) { subtitles.push(getArrayFromSelector(selectors[i])) } return [].concat.apply([], subtitles) } function getArrayFromSelector(selector) { - //get the NodeList and transform it into an array - return Array.prototype.slice.call(document.querySelectorAll(selector)); + //get the NodeList and transform it into an array + return Array.prototype.slice.call(document.querySelectorAll(selector)); } function syncronizeSidebarScroll(element) { if (element) { - var topPos = element.offsetTop - 200 ; - var sidebarInner$ = getSidebarInner(); - - if (sidebarInner$) { - sidebarInner$.scrollTop = topPos; - } + var topPos = element.offsetTop - 200; + var sidebarInner$ = getSidebarInner(); + + if (sidebarInner$) { + sidebarInner$.scrollTop = topPos; + } } } // Open collapsed block when hash or when clicking sidebar item function openReferenceBlock(hash) { - var selectedBlock = document.getElementById(hash.replace('#','')); - elements = document.getElementsByClassName("wrap-block"); - removeClassFromElements(elements, "is-active"); - selectedBlock.closest('.wrap-block').classList.add("is-active") + var selectedBlock = document.getElementById(hash.replace('#', '')); + elements = document.getElementsByClassName("wrap-block"); + removeClassFromElements(elements, "is-active"); + selectedBlock.closest('.wrap-block').classList.add("is-active") } //Fixed Sidebar -if (isGuide() || isSupport() || isReference()){ +if (isGuide() ||  isSupport() || isReference()) { window.addEventListener('scroll', function(e) { var sidebar = getSidebar(); if (isReference() && !isReferenceImported()) { @@ -151,14 +151,13 @@ if (isGuide() || isSupport() || isReference()){ selectElement(["h3"]); } - if(sidebar) { - if(sidebar.getBoundingClientRect().top < 0) { + if (sidebar) { + if (sidebar.getBoundingClientRect().top < 0) { sidebar.firstElementChild.classList.add('fixed-top'); - sidebar.firstElementChild.style.top = (sidebar.getBoundingClientRect().bottom < window.innerHeight + 64) - ? (sidebar.getBoundingClientRect().bottom - window.innerHeight) + 'px' - : ''; - } - else { + sidebar.firstElementChild.style.top = (sidebar.getBoundingClientRect().bottom < window.innerHeight + 64) ? + (sidebar.getBoundingClientRect().bottom - window.innerHeight) + 'px' : + ''; + } else { sidebar.firstElementChild.classList.remove('fixed-top'); } } @@ -176,9 +175,9 @@ if (isReference() && !isReferenceImported()) { //Open collapsed block when clicking sidebar item var listElements = document.getElementsByClassName('js-listElement'); - for(var i =0; i < listElements.length; i++) { - listElements[i].onclick = function() { - openReferenceBlock(this.getAttribute('href')); + for (var i = 0; i < listElements.length; i++) { + listElements[i].onclick = function() { + openReferenceBlock(this.getAttribute('href')); }; } //Open collapsed block when hash @@ -190,48 +189,48 @@ if (isReference() && !isReferenceImported()) { } //Add tip classes -function getStrongElementsByText(text){ +function getStrongElementsByText(text) { var strong = document.getElementsByTagName("strong"); var tipStrong = []; - for(i = 0; i < strong.length; i++){ - if(strong[i].textContent == text){ + for (i = 0; i < strong.length; i++) { + if (strong[i].textContent == text) { tipStrong.push(strong[i]); } } return tipStrong; } -function addTipClass(strongElement, classToAdd){ +function addTipClass(strongElement, classToAdd) { strongElement.parentElement.classList.add(classToAdd); strongElement.parentElement.removeChild(strongElement); } -function addClassByText(textToFind, classToAdd){ +function addClassByText(textToFind, classToAdd) { var tips = getStrongElementsByText(textToFind); - for(i = 0; i < tips.length; i++){ + for (i = 0; i < tips.length; i++) { addTipClass(tips[i], classToAdd); } } -if(isGuide() || isSupport() || isOverview()){ +if (isGuide() || isSupport() || isOverview()) { addClassByText("Tip:", "Content-tip"); addClassByText("Note:", "Content-note"); addClassByText("Warning:", "Content-warning"); addClassByText("Warning:", "Content-alert"); - if(!isOverview()) { + if (!isOverview()) { addSubelementsSideBar(); } } //Examples selected item -function putActiveElement(){ +function putActiveElement() { var selectedElement = document.querySelectorAll(".js-exampletab[href='" + window.location.hash + "']"); - if(selectedElement.length > 0) + if (selectedElement.length > 0) selectedElement[0].classList.add("is-semibold"); } -window.addEventListener("hashchange", function(e){ +window.addEventListener("hashchange", function(e) { var elements = document.getElementsByClassName("js-exampletab"); removeClassFromElements(elements, "is-semibold"); putActiveElement() @@ -241,16 +240,16 @@ putActiveElement() //Fixes tables -function addDivChildsWrapper(element){ +function addDivChildsWrapper(element) { var kids = element.innerHTML; var wrapper = '
' + kids + "
"; element.innerHTML = wrapper; } -function wrapElementInDiv(element){ +function wrapElementInDiv(element) { var parent = element.parentElement; var newDiv = document.createElement("div"); - newDiv.classList.add("u-horizontal-scroll"); + newDiv.classList.add("u-horizontal-scroll", "u-vertical-scroll"); var clone = element.cloneNode(true); newDiv.appendChild(clone); parent.insertBefore(newDiv, element); @@ -259,17 +258,17 @@ function wrapElementInDiv(element){ var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; -if(isFirefox && isGuide()){ +if (isFirefox && isGuide()) { var td = document.getElementsByTagName("td"); - for(i=0; i 0) + for (i = 0; i < td.length; i++) { + if (td[i].getElementsByTagName("code").length > 0) addDivChildsWrapper(td[i]); } } -if(isGuide()){ +if (isGuide()) { var tables = document.getElementsByTagName("table"); - for(i=0; i Date: Thu, 28 Nov 2019 20:33:59 +0100 Subject: [PATCH 5/6] update branch --- grunt-tasks/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt-tasks/config.js b/grunt-tasks/config.js index 6a6faaeac..448526829 100644 --- a/grunt-tasks/config.js +++ b/grunt-tasks/config.js @@ -40,7 +40,7 @@ module.exports = { data: '/_data', path: '/cartoframes', tag: 'v1.0b5', - branch: '996_discover_data', + branch: 'discovery_financial_data', releases: ['v1.0b5', 'v0.10.1'], version: '' // empty if current }, From c79e4f728b8ac6c9f103ac5803ea56124f2e069d Mon Sep 17 00:00:00 2001 From: Alberto Romeu Date: Thu, 28 Nov 2019 20:55:59 +0100 Subject: [PATCH 6/6] update branch --- grunt-tasks/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt-tasks/config.js b/grunt-tasks/config.js index 448526829..295fc5ae1 100644 --- a/grunt-tasks/config.js +++ b/grunt-tasks/config.js @@ -40,7 +40,7 @@ module.exports = { data: '/_data', path: '/cartoframes', tag: 'v1.0b5', - branch: 'discovery_financial_data', + branch: 'discovery_financial', releases: ['v1.0b5', 'v0.10.1'], version: '' // empty if current },