Merge branch 'master' of https://github.com/flames/dynmap

web/chat.js

@@ -5,14 +5,14 @@ function sendChat(message) {
 		url: "http://jsonip.appspot.com/?callback=?",
 		dataType: "jsonp",
 		success: function(getip) {
-		    var data = { name: getip.ip, message: message };
+				var data = '{"name":"'+getip.ip+'","message":"'+message+'"}';
-			$.ajax({
+				$.ajax({
-				type: 'POST',
+					type: 'POST',
-				url: '/up/sendmessage',
+					url: '/up/sendmessage',
-				data: data,
+					data: data,
-				dataType: 'json',
+					dataType: 'json',
-				success: function(response) {
+					success: function(response) {
-					//handle response
+						//handle response
 				}
 			});
 		}

web/map.js

@@ -210,7 +210,7 @@ DynMap.prototype = {
 				.attr({
 					id: 'chatinput',
 					type: 'text',
-					value: 'not working yet'
+					value: ''
 				})
 				.keydown(function(event) {
 					if (event.keyCode == '13') {