quietly, quietly

chee · Aug 17, 2013 · 814cb8f · 814cb8f
1 parent e381c8f
commit 814cb8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/index.html b/app/index.html
@@ -4,7 +4,7 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<title>Recently</title>
-		<meta name="description" content="">
+		<meta name="description" content="Instant crowd-sourced slideshows ( music &&& pictures !!! )">
 		<meta name="viewport" content="width=device-width">
 		<!-- build:css(.tmp) styles/css.css -->
 		<link rel="stylesheet" href="styles/normalize.css">

diff --git a/app/scripts/ui/pictures.js b/app/scripts/ui/pictures.js
@@ -7,7 +7,7 @@ define([
 
 	function slide () {
 		var body = $( "body" );
-		var sfw, delay, playing, first;
+		var sfw, delay, playing, first, timeout;
 
 		this.after( "initialize", function () {
 			this.on( document, "dataPicture", this.picture );
@@ -18,7 +18,8 @@ define([
 
 		this.getStarted = function ( event, data ) {
 			// filth mode
-			sfw = !event.shiftKey;
+			//sfw = data.swf;
+			sfw = true;
 		}
 
 		this.picture = function ( event, data ) {
@@ -37,7 +38,7 @@ define([
 			}
 
 			if ( playing ) {
-				setTimeout(function () {
+				timeout = setTimeout(function () {
 					fly.trigger( document, "uiNeedsPicture", { sfw: sfw } );
 				}, delay);
 			}
@@ -58,6 +59,7 @@ define([
 
 		this.soundOver = function () {
 			playing = false;
+			window.clearTimeout( timeout );
 		}
 	}
 })