@internetstiftelsen/styleguide 2.24.1 → 2.24.2

package/dist/assets/js/youtube.js

@@ -47,11 +47,8 @@ function setupYoutubePlayer(el) {
 		el.youtube.destroy();
 		el.youtube = null;
 		el.removeAttribute('data-youtube-ready');
-<<<<<<< HEAD
-=======
 		el.getElementsByTagName('img')[0].style.zIndex = null;
 		el.getElementsByTagName('button')[0].style.display = null;
->>>>>>> feature/open-timelineitem
 	}
 
 	playerEl = document.createElement('div');

package/dist/components.js

@@ -50,4 +50,10 @@ require('./molecules/glider/glider-hero');
 
 require('./molecules/context-menu/context-menu');
 
-require('./molecules/alert/alert');
+require('./molecules/alert/alert');
+
+require('./molecules/continue-video-guide/continue-video-guide');
+
+require('./organisms/video-guide/video-guide');
+
+require('./organisms/timeline/timeline');

package/dist/organisms/timeline/timeline.js

@@ -136,60 +136,6 @@ if (progressBar) {
 }
 
 // DUMMY TIMELINE ITEM OPEN/CLOSE
-<<<<<<< HEAD
-/*
-function wrap(el, wrapper) {
-	el.parentNode.insertBefore(wrapper, el);
-	wrapper.classList.add('wrapper');
-	wrapper.appendChild(el);
-}
-
-const timeLineItems = document.querySelectorAll('.js-timeline-item');
-let timeLineItemScrollPosition = 0;
-
-[].forEach.call(timeLineItems, (timeLineItem) => {
-	const timeLineItemLink = timeLineItem.querySelector('a');
-	const timeLineItemClose = timeLineItem.querySelector('.js-timeline-item-close');
-	const timeLineItemBottomClose = timeLineItem.querySelector('.js-timeline-item-bottom-close');
-
-	timeLineItemLink.addEventListener('click', () => {
-		timeLineItemScrollPosition = window.pageYOffset;
-		sessionStorage.setItem('scroll-position', timeLineItemScrollPosition);
-
-		if (!timeLineItem.classList.contains('is-open')) {
-			timeLineItem.classList.add('is-open');
-			timeLineItem.closest('.row').classList.add('row-has-open-child');
-
-			// Wrap open timeline item
-			wrap(timeLineItem.querySelector('.wp-block-iis-timeline-post'),
-				document.createElement('div'));
-		}
-	});
-
-	timeLineItemClose.addEventListener('click', () => {
-		timeLineItem.classList.remove('is-open');
-		timeLineItem.closest('.row').classList.remove('row-has-open-child');
-
-		// Destroy generated wrapper
-		const wrapper = timeLineItemClose.nextElementSibling;
-		wrapper.replaceWith(...wrapper.childNodes);
-
-		const top = sessionStorage.getItem('scroll-position');
-		if (top !== null) {
-			window.scrollTo(0, parseInt(top, 10));
-		}
-		sessionStorage.removeItem('scroll-position');
-
-		// Trigger scroll event to reveal timeline items not yet parallaxed into view
-		window.dispatchEvent(new CustomEvent('scroll'));
-	});
-
-	timeLineItemBottomClose.addEventListener('click', () => {
-		timeLineItemClose.click();
-	});
-});
-*/
-=======
 // function wrap(el, wrapper) {
 // 	el.parentNode.insertBefore(wrapper, el);
 // 	wrapper.classList.add('wrapper');
@@ -239,5 +185,4 @@ let timeLineItemScrollPosition = 0;
 // 	timeLineItemBottomClose.addEventListener('click', () => {
 // 		timeLineItemClose.click();
 // 	});
-// });
->>>>>>> feature/open-timelineitem
+// });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@internetstiftelsen/styleguide",
-	"version": "2.24.1",
+	"version": "2.24.2",
 	"main": "dist/components.js",
 	"ports": {
 		"fractal": "3000"