From c3588cb2759cdcfa95db75bd10ee5b2f5e031b6c Mon Sep 17 00:00:00 2001 From: Cosjimmy Date: Tue, 27 Sep 2016 23:13:42 -0400 Subject: [PATCH 1/7] first try --- index.html | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/index.html b/index.html index 6524157..2292ce5 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,55 @@ Mashup + + + + + +
+ Enter an address:
+
+ +
+
+ + + From b57cbe2f299abb51d5b5744e53a5f778208ce6d9 Mon Sep 17 00:00:00 2001 From: Cosjimmy Date: Tue, 27 Sep 2016 23:33:38 -0400 Subject: [PATCH 2/7] merge2 --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 2292ce5..dcddb68 100644 --- a/index.html +++ b/index.html @@ -13,7 +13,7 @@ var address= document.getElementById("newadd").value; $.ajex({ dataType: 'text', - url: "https://maps.googleapis.com/maps/api/js?key=AIzaSyCBRJ-TOtZaaHlt7QYxkhPPfO0IhyfDPik&callback=initMap", + url: "https://maps.googleapis.com/maps/api/js?key=AIzaSyCBRJ-TOtZaaHlt7QYxkhPPfO0IhyfDPik", type: "GET", success: function(data){ $("#resultarea").text(data); @@ -49,7 +49,7 @@ }); } - From 2a80eb8762718ad6609712bb2252e983c0bb9b8c Mon Sep 17 00:00:00 2001 From: Cosjimmy Date: Tue, 27 Sep 2016 23:37:23 -0400 Subject: [PATCH 3/7] merge3 --- index.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index dcddb68..a16c6f1 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ html, body { height: 80%; margin: 0; padding: 0; } #map { height: 80%; } - + - + From 7aac57624244e5631db722fdaa661b919c6192f3 Mon Sep 17 00:00:00 2001 From: Cosjimmy Date: Tue, 27 Sep 2016 23:56:06 -0400 Subject: [PATCH 4/7] merge3 --- index.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index a16c6f1..016c68c 100644 --- a/index.html +++ b/index.html @@ -3,23 +3,25 @@ Mashup - + +