Merge branch 'master' of https://github.com/ClearBlade/Tutorial-JavaScript

aallsbrook · aallsbrook · commit d66347acdc1c · 2015-09-04T13:47:07.000-05:00
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ var initOptions = {
 ```
 - Save the file
 
-If your using a local instance try platform_url = "http://localhost:8080"; messaging_url = localhost;
+If you are using a local instance try platform_url = "http://localhost:8080"; messaging_url = localhost;
   
   
 
diff --git a/index.html b/index.html
@@ -126,7 +126,7 @@
 
 			<div id="part4" class="hiddenView">
 				<div class="label">Part 4 - Create a service</div>
-				<div>Implement your Web API by creating a new service that </div>
+				<div>Implement your Web API by creating a new service that is secure and runs your business logic</div>
 				<ul>
 					<li>Are written in standard Javascript</li>
 					<li>Take custom parameters and respond with standard JSON objects</li>
diff --git a/js/part1.js b/js/part1.js
@@ -1,12 +1,12 @@
 var cb = new ClearBlade();
 var initOptions = {
-	URI : "YOUR_PLATFORMURL",
-    messagingURI : "YOUR_MESSAGINGURL",
+	URI : "PLATFORM_URL",
+    messagingURI : "MESSAGING_URL",
     messagingPort: 8904,
     useMQTT: true,
     cleanSession: true,
-    systemKey: "YOUR_SYSTEMKEY",
-    systemSecret: "YOUR_SYSTEMSECRET"  
+    systemKey: "SYSTEMKEY",
+    systemSecret: "SYSTEMSECRET"  
 }
 
 var part1Event = function() {
diff --git a/js/part3.js b/js/part3.js
@@ -1,14 +1,16 @@
+
 var part3Event = function() {
 	var query = cb.Query({collectionName: "Weather"});
     query.setPage(0,0);
     query.fetch(function(err, data){
         if (err){
-            showError("part3", data)
+            showError("part3", "Either collection does not exist or it doesn't have the right permissions")
         }else{
+            document.getElementById("weatherList").innerHTML = "";
             var listElement = document.getElementById("weatherList"); 
             listElement.innerHTML="";
             for (var i =0 ; i < data.length; i++) {
-                var node = document.createElement("li");
+                node = document.createElement("li");
                 var textNode = document.createTextNode(JSON.stringify(data[i].data));
                 node.appendChild(textNode);
                 listElement.appendChild(node);
@@ -20,6 +22,6 @@ var part3Event = function() {
 };
 
 var part3bEvent = function() {
-   showView("part4");
-    
-};
+    document.getElementById("weatherList").innerHTML = "";
+    showView("part4");
+};
