deploy: 5b0a27a

index.html

@@ -18,7 +18,7 @@
       <div class="slides"><section  data-markdown><script type="text/template">
 
 
-# Quarterly Data Carpentry Workshop
+# Quarterly Carpentry (Library) Workshop
 
 ![SI Carpentries](images/si_carpentries.png)
 </script></section><section  data-markdown><script type="text/template">
@@ -76,13 +76,13 @@
 </script></section><section  data-markdown><script type="text/template">
 ## Course website
 
-https://smithsonianworkshops.github.io/2022-autumn-smithsonian/
+https://smithsonian.github.io/2023-01-09-smithsonian-online/
 </script></section><section  data-markdown><script type="text/template">
 ## Course EtherPad
 
 A collaborative document – think of it as a stripped-down version of Google Docs
 
-https://pad.carpentries.org/2022-autumn-smithsonian
+https://pad.carpentries.org/2023-01-09-smithsonian-online
 </script></section><section  data-markdown><script type="text/template">
 ## Your first challenge
 
@@ -94,18 +94,18 @@
 
 We will be teaching you data organization, cleaning, and visualization skills, so that your analyses can be easily understoood and reproduced by your colleagues ... and your future self.
 </script></section><section  data-markdown><script type="text/template">
-## Day One (October 18)
+## Day One (Mon, January 9)
 
-### Version Control with GitHub
+### The Unix Shell
 </script></section><section  data-markdown><script type="text/template">
-## Day Two (October 19)
+## Day Two (Tue, January 10)
 
-### Tidy Data Principles in Spreadsheets
+### Regular Expressions
 ### OpenRefine for Data Cleaning
 </script></section><section  data-markdown><script type="text/template">
-## Day Three and Four (October 25/26)
+## Day Three (Wed, January 11)
 
-### Introduction to R
+### Version Control with GitHub
 
 </script></section><section  data-markdown><script type="text/template">
 > We will be teaching you a lot of valuable skills on a demo dataset, but you won't be able to add these tools to your *toolbag* until you work through how to apply them to your own data.
@@ -142,6 +142,7 @@
         history: true,
         center: true,
         transition: 'default', // none/fade/slide/convex/concave/zoom
+        slideNumber: true,
         plugins: [
           RevealMarkdown,
           RevealHighlight,

intro_slides.html

@@ -18,7 +18,7 @@
       <div class="slides"><section  data-markdown><script type="text/template">
 
 
-# Quarterly Data Carpentry Workshop
+# Quarterly Carpentry (Library) Workshop
 
 ![SI Carpentries](images/si_carpentries.png)
 </script></section><section  data-markdown><script type="text/template">
@@ -76,13 +76,13 @@
 </script></section><section  data-markdown><script type="text/template">
 ## Course website
 
-https://smithsonianworkshops.github.io/2022-autumn-smithsonian/
+https://smithsonian.github.io/2023-01-09-smithsonian-online/
 </script></section><section  data-markdown><script type="text/template">
 ## Course EtherPad
 
 A collaborative document – think of it as a stripped-down version of Google Docs
 
-https://pad.carpentries.org/2022-autumn-smithsonian
+https://pad.carpentries.org/2023-01-09-smithsonian-online
 </script></section><section  data-markdown><script type="text/template">
 ## Your first challenge
 
@@ -94,18 +94,18 @@
 
 We will be teaching you data organization, cleaning, and visualization skills, so that your analyses can be easily understoood and reproduced by your colleagues ... and your future self.
 </script></section><section  data-markdown><script type="text/template">
-## Day One (October 18)
+## Day One (Mon, January 9)
 
-### Version Control with GitHub
+### The Unix Shell
 </script></section><section  data-markdown><script type="text/template">
-## Day Two (October 19)
+## Day Two (Tue, January 10)
 
-### Tidy Data Principles in Spreadsheets
+### Regular Expressions
 ### OpenRefine for Data Cleaning
 </script></section><section  data-markdown><script type="text/template">
-## Day Three and Four (October 25/26)
+## Day Three (Wed, January 11)
 
-### Introduction to R
+### Version Control with GitHub
 
 </script></section><section  data-markdown><script type="text/template">
 > We will be teaching you a lot of valuable skills on a demo dataset, but you won't be able to add these tools to your *toolbag* until you work through how to apply them to your own data.
@@ -142,6 +142,7 @@
         history: true,
         center: true,
         transition: 'default', // none/fade/slide/convex/concave/zoom
+        slideNumber: true,
         plugins: [
           RevealMarkdown,
           RevealHighlight,

plugin/highlight/plugin.js

@@ -19,7 +19,7 @@ const Plugin = {
 	hljs,
 
 	/**
-	 * Highlights code blocks withing the given deck.
+	 * Highlights code blocks within the given deck.
 	 *
 	 * Note that this can be called multiple times if
 	 * there are multiple presentations on one page.

plugin/notes/plugin.js

@@ -1,4 +1,4 @@
-import speakerViewHTML from './speaker-view.html';
+import speakerViewHTML from './speaker-view.html'
 
 import { marked } from 'marked';
 
@@ -108,7 +108,7 @@ const Plugin = () => {
 	function post( event ) {
 
 		let slideElement = deck.getCurrentSlide(),
-			notesElement = slideElement.querySelector( 'aside.notes' ),
+			notesElements = slideElement.querySelectorAll( 'aside.notes' ),
 			fragmentElement = slideElement.querySelector( '.current-fragment' );
 
 		let messageData = {
@@ -130,36 +130,61 @@ const Plugin = () => {
 		if( fragmentElement ) {
 			let fragmentNotes = fragmentElement.querySelector( 'aside.notes' );
 			if( fragmentNotes ) {
-				notesElement = fragmentNotes;
+				messageData.notes = fragmentNotes.innerHTML;
+				messageData.markdown = typeof fragmentNotes.getAttribute( 'data-markdown' ) === 'string';
+
+				// Ignore other slide notes
+				notesElements = null;
 			}
 			else if( fragmentElement.hasAttribute( 'data-notes' ) ) {
 				messageData.notes = fragmentElement.getAttribute( 'data-notes' );
 				messageData.whitespace = 'pre-wrap';
 
 				// In case there are slide notes
-				notesElement = null;
+				notesElements = null;
 			}
 		}
 
 		// Look for notes defined in an aside element
-		if( notesElement ) {
-			messageData.notes = notesElement.innerHTML;
-			messageData.markdown = typeof notesElement.getAttribute( 'data-markdown' ) === 'string';
+		if( notesElements ) {
+			messageData.notes = Array.from(notesElements).map( notesElement => notesElement.innerHTML ).join( '\n' );
+			messageData.markdown = notesElements[0] && typeof notesElements[0].getAttribute( 'data-markdown' ) === 'string';
 		}
 
 		speakerWindow.postMessage( JSON.stringify( messageData ), '*' );
 
 	}
 
-	function onPostMessage( event ) {
+	/**
+	 * Check if the given event is from the same origin as the
+	 * current window.
+	 */
+	function isSameOriginEvent( event ) {
 
-		let data = JSON.parse( event.data );
-		if( data && data.namespace === 'reveal-notes' && data.type === 'connected' ) {
-			clearInterval( connectInterval );
-			onConnected();
+		try {
+			return window.location.origin === event.source.location.origin;
+		}
+		catch ( error ) {
+			return false;
 		}
-		else if( data && data.namespace === 'reveal-notes' && data.type === 'call' ) {
-			callRevealApi( data.methodName, data.arguments, data.callId );
+
+	}
+
+	function onPostMessage( event ) {
+
+		// Only allow same-origin messages
+		// (added 12/5/22 as a XSS safeguard)
+		if( isSameOriginEvent( event ) ) {
+
+			let data = JSON.parse( event.data );
+			if( data && data.namespace === 'reveal-notes' && data.type === 'connected' ) {
+				clearInterval( connectInterval );
+				onConnected();
+			}
+			else if( data && data.namespace === 'reveal-notes' && data.type === 'call' ) {
+				callRevealApi( data.methodName, data.arguments, data.callId );
+			}
+
 		}
 
 	}

plugin/notes/speaker-view.html

@@ -350,8 +350,9 @@ <h4 class="label">Notes</h4>
 					layoutDropdown,
 					pendingCalls = {},
 					lastRevealApiCallId = 0,
-					connected = false,
-					whitelistedWindows = [window.opener];
+					connected = false
+
+				var connectionStatus = document.querySelector( '#connection-status' );
 
 				var SPEAKER_LAYOUTS = {
 					'default': 'Default',
@@ -362,17 +363,25 @@ <h4 class="label">Notes</h4>
 
 				setupLayout();
 
-				var connectionStatus = document.querySelector( '#connection-status' );
+				let openerOrigin;
+
+				try {
+					openerOrigin = window.opener.location.origin;
+				}
+				catch ( error ) { console.warn( error ) }
+
+				// In order to prevent XSS, the speaker view will only run if its
+				// opener has the same origin as itself
+				if( window.location.origin !== openerOrigin ) {
+					connectionStatus.innerHTML = 'Cross origin error.<br>The speaker window can only be opened from the same origin.';
+					return;
+				}
+
 				var connectionTimeout = setTimeout( function() {
 					connectionStatus.innerHTML = 'Error connecting to main window.<br>Please try closing and reopening the speaker view.';
 				}, 5000 );
-;
-				window.addEventListener( 'message', function( event ) {
 
-					// Validate the origin of this message to prevent XSS
-					if( window.location.origin !== event.origin && whitelistedWindows.indexOf( event.source ) === -1 ) {
-						return;
-					}
+				window.addEventListener( 'message', function( event ) {
 
 					clearTimeout( connectionTimeout );
 					connectionStatus.style.display = 'none';
@@ -539,8 +548,6 @@ <h4 class="label">Notes</h4>
 					upcomingSlide.setAttribute( 'src', upcomingURL );
 					document.querySelector( '#upcoming-slide' ).appendChild( upcomingSlide );
 
-					whitelistedWindows.push( currentSlide.contentWindow, upcomingSlide.contentWindow );
-
 				}
 
 				/**