Stopwatch Window

BoisterousCoder · BoisterousCoder · commit 7edd87d474b1 · 2017-02-22T10:44:52.000-07:00
diff --git a/JS/MainLoop.js b/JS/MainLoop.js
@@ -89,7 +89,7 @@ function reflectParticle(particle, translation, i, particlesLeft, particlesRight
 	//right side
 	if (particle.x + particle.radius >= 100 + translation) {
 		if (translation == 0 && allowCrossOver) {
-			particle.x += 11;
+			particle.x += 1;
 			particlesRight.push(particle);
 			particlesLeft.splice(i, 1);
 		} else {
@@ -104,7 +104,7 @@ function reflectParticle(particle, translation, i, particlesLeft, particlesRight
 	//left side
 	if (particle.x - particle.radius <= 0 + translation) {
 		if (translation != 0 && allowCrossOver) {
-			particle.x -= 11;
+			particle.x -= 1;
 			particlesLeft.push(particle);
 			particlesRight.splice(i, 1);
 		} else {
diff --git a/JS/Start.js b/JS/Start.js
@@ -144,11 +144,11 @@ function printInputs() {
 		target.parent().children('p').html(target.val())
 	});
 	//Clock is http://flipclockjs.com/
-	let clock = $('.your-clock').FlipClock({});
-	clock.stop()
-	$('#startClock').click(function(){clock.start()});
-	$('#stopClock').click(function(){clock.stop()});
-	$('#resetClock').click(function(){clock.reset()});
+	
+}
+
+function openStopwatch(){
+	window.open('stopwatch.html', '_blank', 'channelmode=yes');
 }
 
 function refreshSize() {
diff --git a/index.html b/index.html
@@ -26,17 +26,9 @@
 	</div>
 	<div id='settings'>
 		<format class='center block'>
-			<span class='setting' alias='Remove Barrier' type='checkbox' var='allowCrossOver'></span>
+			<span class='setting' alias='Remove Barrier' type='checkbox' var='allowCrossOver'></span><br/>
 			<button onclick="resetLoop()">Reset Tanks</button>
-		</format>
-		
-		<format class='block center'>
-			<div class="your-clock"></div>
-			<format class='block collumns3'>
-				<button class='block' id='startClock'>Start</button>
-				<button class='block' id='stopClock'>Stop</button>
-				<button class='block' id='resetClock'>reset</button>
-			</format>
+			<button onclick="openStopwatch()">Open Stopwatch</button>
 		</format>
 		
 		<hr/>
@@ -50,7 +42,7 @@
 
 			<format class='block'>
 				<format class='center block'>Right Tank Settings</format>
-				<span class='setting block' alias='Initial Temperatures' type='range' var='initTempRight' max='30' min='1'></span>
+				<span class='setting block' alias='Initial Temperature' type='range' var='initTempRight' max='30' min='1'></span>
 				<span class='setting block' alias='Number Of Particles' type='range' var='numberOfParticlesRight' max='200' min='50'></span>
 			</format>
 		</format>
diff --git a/stopwatch.html b/stopwatch.html
@@ -0,0 +1,35 @@
+<!Doctype html>
+<html>
+
+<head>
+	<script src="JS/JQuery.js"></script>
+	<script src="JS/flipclock.min.js"></script>
+	<script>
+		$(function () {
+			let clock = $('.your-clock').FlipClock({});
+			clock.stop()
+			$('#startClock').click(function () {
+				clock.start();
+			});
+			$('#stopClock').click(function () {
+				clock.stop();
+			});
+			$('#resetClock').click(function () {
+				clock.reset();
+			});
+		});
+	</script>
+	<link rel="stylesheet" href="CSS/flipclock.css">
+	<link rel="stylesheet" href="CSS/main.css">
+</head>
+
+<body>
+	<div class="your-clock"></div>
+	<format class='block'>
+		<button id='startClock'>Start</button>
+		<button id='stopClock'>Stop</button>
+		<button id='resetClock'>reset</button>
+	</format>
+</body>
+
+</html>
