Small changes

Thorium · Jun 7, 2011 · 25f3377 · 25f3377
1 parent 6febac9
commit 25f3377
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/StocksApplication/StocksApplication.Web/ClientBin/StocksApplicationSL.xap b/StocksApplication/StocksApplication.Web/ClientBin/StocksApplicationSL.xap
diff --git a/StocksApplication/StocksApplication.Web/StocksApplication.Web.csproj b/StocksApplication/StocksApplication.Web/StocksApplication.Web.csproj
@@ -56,6 +56,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ClientBin\StocksApplicationSL.xap" />
+    <Content Include="htmlclient\jquery-1.6.1.min.js" />
+    <Content Include="htmlclient\json2.min.js" />
+    <Content Include="htmlclient\scripts.js" />
+    <Content Include="htmlclient\Stocks.html" />
     <Content Include="Silverlight.js" />
     <Content Include="StocksApplicationSLTestPage.aspx" />
     <Content Include="StocksApplicationSLTestPage.html" />

diff --git a/StocksApplication/StocksApplication.Web/StocksService.svc.cs b/StocksApplication/StocksApplication.Web/StocksService.svc.cs
@@ -24,15 +24,13 @@ public IEnumerable<Stocks.StockQuote> FetchStockData(string quote, string from,
             Contract.Assert(todate <= DateTime.Now, "Future not allowed yet...");
 
             var uri = Stocks.MakeUrl(quote, fromdate, todate);
-            var result = Enumerable.Empty<Stocks.StockQuote>();
 
             try { 
-                result = Stocks.GetResult(uri);
+                return Stocks.GetResult(uri);
             }catch(System.Net.WebException){
                 //throw;
-                result = Enumerable.Repeat(new Stocks.StockQuote(todate, -1.0), 1);
+                return Enumerable.Repeat(new Stocks.StockQuote(todate, -1.0), 1);
             }
-            return result;
         }
         // example: http://localhost:49624/StocksService.svc/Symbol/MSFT/20100905/20100910
     }

diff --git a/StocksApplication/StocksApplication.Web/htmlclient/scripts.js b/StocksApplication/StocksApplication.Web/htmlclient/scripts.js
@@ -1,4 +1,4 @@
-window.onload = function()
+$(document).ready(function() 
 {
     //Debug:
     function concatObject(obj) {
@@ -63,6 +63,6 @@ window.onload = function()
             error: function(res){alert("Communication error...");}
         });
     });
-}
+});