Merge branch 'fixes' into develop

scripts/src/export-button.js

@@ -10,6 +10,7 @@ define(
 		var download_file_name;
 		var file_suffix = '.png';
 		var file_suffix_regex = /(\.)(jpg|jpeg|png|gif|bmp)/ig;
+		var parameters;
 
 		function init( shared )
 		{
@@ -24,6 +25,8 @@ define(
 			png_link.addEventListener( 'click', hidePNGLink, false );
 
 			signals['load-file'].add( updateFileName );
+			signals['load-file'].add( updateDownloadFileName );
+			signals['control-updated'].add( updateParameters );
 			signals['control-updated'].add( updateDownloadFileName );
 		}
 
@@ -45,9 +48,14 @@ define(
 			}
 		}
 
-		function updateDownloadFileName( options )
+		function updateParameters( new_parameters )
 		{
-			download_file_name = file_name + '-glitched-' + objToString( options ) + file_suffix;
+			parameters = new_parameters || parameters;
+		}
+
+		function updateDownloadFileName()
+		{
+			download_file_name = file_name + '-glitched-' + objToString( parameters ) + file_suffix;
 		}
 
 		function updatePNGLinkAddress( data_url )

scripts/src/intro.js

@@ -33,6 +33,7 @@ define(
 		{
 			button.classList.add( 'is-active' );
 			element.classList.add( 'is-active' );
+			element.style.top = '0';
 			is_open = true;
 		}
 
@@ -40,9 +41,15 @@ define(
 		{
 			button.classList.remove( 'is-active' );
 			element.classList.remove( 'is-active' );
+			element.style.top = -getHeight() + 'px';
 			is_open = false;
 		}
 
+		function getHeight()
+		{
+			return element.clientHeight;
+		}
+
 		return { init: init };
 	}
 );

styles/main.css

@@ -106,8 +106,8 @@ a:hover {
 	top: -100%;
 	background-color: #fff;
 	background-color: rgba(255,255,255, 0.9);
-	-webkit-transition: all 0.5s ease-in;
-	transition: all 0.5s ease-in;
+	-webkit-transition: all 0.3s ease-out;
+	transition: all 0.3s ease-out;
 }
 
 .intro.is-active {