...

vilterp · vilterp · commit abac28ce9f47 · 2014-03-01T01:37:15.000-06:00
diff --git a/basic.html b/basic.html
@@ -7,6 +7,7 @@
 		<script type="text/javascript">
 			function sayHello() {
 				alert('Hello from JavaScript!');
+				console.log('hello in the console');
 			}
 			document.getElementById('mybutton').addEventListener('click', sayHello);
 		</script>
diff --git a/dom1.html b/dom1.html
@@ -3,9 +3,12 @@
 		<title>My First JS</title>
 	</head>
 	<body>
-		<button id="mybutton">Click Me</button>
+		<p>
+			<button id="mybutton">Click Me</button>
+		</p>
 		<ul id="clicklist"></ul>
 		<script type="text/javascript">
+			// click list
 			var clicks = 0;
 			var click_list = document.getElementById('clicklist');
 			function addClick() {
diff --git a/dom2.html b/dom2.html
@@ -0,0 +1,19 @@
+<html>
+	<head>
+		<title>My First JS</title>
+	</head>
+	<body>
+		<p>
+			<input type="text" id="text_box"/> Chars: <span id="chars_display"></span>
+		</p>
+		<script type="text/javascript">
+			// chars in text box
+			var text_box = document.getElementById('text_box');
+			var chars_display = document.getElementById('chars_display');
+			function updateDisplay() {
+				chars_display.innerText = text_box.value.length;
+			}
+			text_box.addEventListener('keyup', updateDisplay);
+		</script>
+	</body>
+</html>
diff --git a/janky-blog/posts.json b/janky-blog/posts.json
@@ -6,5 +6,9 @@
   {
     "title": "test",
     "body": "foo"
+  },
+  {
+    "title": "Another post",
+    "body": "fun timez"
   }
 ]
diff --git a/janky-blog/web.js b/janky-blog/web.js
@@ -7,10 +7,10 @@ var app = express();
 
 var POSTS_FILE = 'posts.json';
 
-// tell express to print requests in the console as they come in
-app.use(express.logger());
 // detail, not sure why express does't do this automatically
 app.use(express.urlencoded());
+// tell express to print requests in the console as they come in
+app.use(express.logger());
 // tell express to use handlebars as templating engine
 app.engine('handlebars', exphbs());
 app.set('view engine', 'handlebars');
@@ -51,5 +51,6 @@ app.post('/save', function(req, res) {
 	});
 });
 
-app.listen(3000);
-console.log('listening on http://localhost:3000/');
+app.listen(3000, function() {
+	console.log('listening on http://localhost:3000/');
+});
diff --git a/timer.html b/timer.html
@@ -0,0 +1,17 @@
+<html>
+	<head>
+		<title>Timer</title>
+	</head>
+	<body>
+		Seconds you've been on this page: <span id="time_display"></span>
+		<script type="text/javascript">
+			var seconds = 0;
+			var display = document.getElementById('time_display');
+			function update() {
+				display.innerText = seconds.toString();
+				seconds++;
+			}
+			setInterval(update, 1000);
+		</script>
+	</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`<script type="text/javascript">`
`8`	`8`	`function sayHello() {`
`9`	`9`	`alert('Hello from JavaScript!');`
	`10`	`+ console.log('hello in the console');`
`10`	`11`	`}`
`11`	`12`	`document.getElementById('mybutton').addEventListener('click', sayHello);`
`12`	`13`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,9 @@`
`6`	`6`	`{`
`7`	`7`	`"title": "test",`
`8`	`8`	`"body": "foo"`
	`9`	`+ },`
	`10`	`+ {`
	`11`	`+ "title": "Another post",`
	`12`	`+ "body": "fun timez"`
`9`	`13`	`}`
`10`	`14`	`]`