pressing p again will stop the preshow

schacon · Jun 24, 2010 · ab84bab · ab84bab
1 parent 9e982b2
commit ab84bab
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/public/js/showoff.js b/public/js/showoff.js
@@ -470,24 +470,27 @@ var preshow_imagesTotal = 0;
 var preshow_des;
 
 function runPreShow() {
-	if(preshow_running) { return false }
-	var minutes = prompt("Minutes from now to start")
-	preshow_secondsLeft = parseFloat(minutes) * 60
-	toggleFooter()
-	$.getJSON("preshow_files", false, function(data) {
-		$('#preso').after("<div id='preshow'></div><div id='tips'></div><div id='preshow_timer'></div>")
-		$.each(data, function(i, n) {
-			if(n == "preshow.json") {
-				// has a descriptions file
-				$.getJSON("/file/_preshow/preshow.json", false, function(data) {
-					preshow_des = data
-				})
-			} else {
-				$('#preshow').append('<img ref="' + n + '" src="/file/_preshow/' + n + '"/>')				
-			}
+	if(preshow_running) { 
+		stopPreShow() 
+	} else {
+		var minutes = prompt("Minutes from now to start")
+		preshow_secondsLeft = parseFloat(minutes) * 60
+		toggleFooter()
+		$.getJSON("preshow_files", false, function(data) {
+			$('#preso').after("<div id='preshow'></div><div id='tips'></div><div id='preshow_timer'></div>")
+			$.each(data, function(i, n) {
+				if(n == "preshow.json") {
+					// has a descriptions file
+					$.getJSON("/file/_preshow/preshow.json", false, function(data) {
+						preshow_des = data
+					})
+				} else {
+					$('#preshow').append('<img ref="' + n + '" src="/file/_preshow/' + n + '"/>')				
+				}
+			})
+			startPreShow()
 		})
-		startPreShow()
-	})
+	}
 }
 
 function startPreShow() {