Permalink
Browse files

Updated to remove CDN for JavaScripts. Also some updates to get the t…

…hing to work with MVC3
  • Loading branch information...
1 parent a256efb commit 62f7750c8b05dc2fdf2088d7b403e0593e815bb7 @marcusoftnet marcusoftnet committed Sep 10, 2011
View
@@ -10,4 +10,5 @@ obj/
[Dd]ebug*/
[Rr]elease*/
_ReSharper*/
-[Tt]est[Rr]esult*
+[Tt]est[Rr]esult*
+*mm_cache.bin
@@ -69,7 +69,7 @@
<Reference Include="System.Web.Abstractions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml" />
<Reference Include="TechTalk.SpecFlow">
<HintPath>..\packages\SpecFlow.1.7.1\lib\net35\TechTalk.SpecFlow.dll</HintPath>
@@ -83,7 +83,7 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Mobile" />
- <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Routing">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -94,20 +94,6 @@
<ItemGroup>
<Content Include="Global.asax" />
<Content Include="Web.config" />
- <Content Include="Scripts\jquery-1.4.1.js" />
- <Content Include="Scripts\jquery-1.4.1.min.js" />
- <Content Include="Scripts\jquery-1.4.1-vsdoc.js" />
- <Content Include="Scripts\jquery-1.4.1.min-vsdoc.js" />
- <Content Include="Scripts\jquery.validate.js" />
- <Content Include="Scripts\jquery.validate.min.js" />
- <Content Include="Scripts\jquery.validate-vsdoc.js" />
- <Content Include="Scripts\jquery.validate.min-vsdoc.js" />
- <Content Include="Scripts\MicrosoftAjax.js" />
- <Content Include="Scripts\MicrosoftAjax.debug.js" />
- <Content Include="Scripts\MicrosoftMvcAjax.js" />
- <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />
- <Content Include="Scripts\MicrosoftMvcValidation.js" />
- <Content Include="Scripts\MicrosoftMvcValidation.debug.js" />
<Content Include="Views\Web.config" />
</ItemGroup>
<ItemGroup>
@@ -15,8 +15,7 @@ public ActionResult Index()
List<Book> cheapBooks = db.Books.OrderBy(b => b.Price).Take(3).ToList();
- ViewData.Model = cheapBooks;
- return View();
+ return View(cheapBooks);
}
}
}
@@ -1,4 +1,5 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<List<BookShop.Models.Book>>" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master"
+ Inherits="System.Web.Mvc.ViewPage<IList<BookShop.Models.Book>>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
Home
@@ -11,8 +12,7 @@
<th>Book</th>
<th>Price</th>
</tr>
- <% foreach (var m in ViewData.Model)
- { %>
+ <% foreach (var m in ViewData.Model ) { %>
<tr>
<div class="item">
<td class="title">
@@ -5,7 +5,7 @@
<head runat="server">
<title>SpecFlow BookShop</title>
<link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
- <script src="../../Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js" type="text/javascript"></script>
</head>
<body>
<div class="page">
@@ -1,11 +1,12 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<BookShop.Models.ShoppingCart>" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master"
+ Inherits="System.Web.Mvc.ViewPage<BookShop.Models.ShoppingCart>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
Shopping Cart
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
- <script src="../../Scripts/MicrosoftAjax.js" type="text/javascript"></script>
+ <script src="http://ajax.microsoft.com/ajax/beta/0909/MicrosoftAjax.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -15,11 +15,11 @@
-->
<pages
validateRequest="false"
- pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
- pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
- userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+ pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+ pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+ userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
- <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
+ <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
@@ -21,7 +21,7 @@
-->
<compilation debug="true" targetFramework="4.0">
<assemblies>
- <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

0 comments on commit 62f7750

Please sign in to comment.