Merge pull request #5 from davidtaylorjr/variables

Add Temp Feels Like Condtional
davidtaylorjr · Jan 12, 2017 · f51e156 · f51e156
2 parents 3be5ada + 404fa54
commit f51e156
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,30 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch index.html",
+            "type": "firefox",
+            "request": "launch",
+            "file": "${workspaceRoot}/index.html"
+        },
+        {
+            "name": "Launch localhost",
+            "type": "firefox",
+            "request": "launch",
+            "url": "http://localhost/index.html",
+            "webRoot": "${workspaceRoot}"
+        },
+        {
+            "name": "Attach",
+            "type": "firefox",
+            "request": "attach"
+        },
+        {
+            "name": "Launch addon",
+            "type": "firefox",
+            "request": "launch",
+            "addonType": "addonSdk",
+            "addonPath": "${workspaceRoot}"
+        }
+    ]
+}
diff --git a/scripts/javascript.js b/scripts/javascript.js
@@ -46,12 +46,18 @@ function geoLocation() {
                 window.tempFeel = tempFeel;
                 window.tempFeelCelsius = tempFeelCelsius;
 
-
+                console.log(data);
 
                 var current = document.getElementById(conditions);
+                var dataPoints = document.getElementById(variables);
 
                 conditions.innerHTML = "<p>It is currently " + Math.round(temp) + " °F" + " and " + description;
 
+                if (temp != tempFeel) {
+                    variables.innerHTML = "<p> It feels like it is " + Math.round(tempFeel) + " °F.";
+
+                }
+
 
 
                 var hourly = document.getElementById(twentyfour);
@@ -104,7 +110,7 @@ function geoLocation() {
         output.innerHTML = "Unable to retrieve your location";
     }
 
-    userAddress.innerHTML = "<p>Locating…</p>";
+    userAddress.innerHTML = "<p>Grabbing Your Location...</p>";
 
     navigator.geolocation.getCurrentPosition(success, error);