Added ability to run start/end methods in a global controller

zhdwwf · Jul 18, 2012 · 0f66e95 · 0f66e95
1 parent 6fcc8b2
commit 0f66e95
Show file tree

Hide file tree

Showing 28 changed files with 13,101 additions and 4,719 deletions.
diff --git a/distribution/CsQuery.XML b/distribution/CsQuery.XML
diff --git a/distribution/CsQuery.dll b/distribution/CsQuery.dll
diff --git a/distribution/CsQuery.pdb b/distribution/CsQuery.pdb
diff --git a/examples/CsQuery.MvcApp/CsQuery.MvcApp/Controllers/HomeController.cs b/examples/CsQuery.MvcApp/CsQuery.MvcApp/Controllers/HomeController.cs
@@ -4,6 +4,7 @@
 using System.Web;
 using System.Web.Mvc;
 using CsQuery.Mvc;
+
 namespace CsQuery.MvcApp.Controllers
 {
     public class HomeController : CsQueryController

diff --git a/examples/CsQuery.MvcApp/CsQuery.MvcApp/Controllers/Shared/LayoutController.cs b/examples/CsQuery.MvcApp/CsQuery.MvcApp/Controllers/Shared/LayoutController.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using CsQuery.Mvc;
+
+namespace CsQuery.MvcApp.Controllers
+{
+    public class LayoutController : CsQueryController
+    {
+
+
+        public void Cq_Start()
+        {
+            Doc["body"].Append("<hr /><div>A footer. This has a red border around it because it was created before the code that adds the red border.</div>");
+        }
+
+        public void Cq_End()
+        {
+            Doc["body"].Append("<hr /><div>A late-bound footer. This is the last method to execute, so there's no border.</div>");
+        }
+
+    }
+}
diff --git a/examples/CsQuery.MvcApp/CsQuery.MvcApp/CsQuery.MvcApp.csproj b/examples/CsQuery.MvcApp/CsQuery.MvcApp/CsQuery.MvcApp.csproj
@@ -36,9 +36,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CsQuery, Version=1.1.2.22634, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="CsQuery, Version=1.1.3.30725, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CsQuery.1.1.2.1\lib\net40\CsQuery.dll</HintPath>
+      <HintPath>..\packages\CsQuery.1.1.3.2\lib\net40\CsQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="CsQuery.Mvc, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CsQuery.Mvc.1.0.5\lib\net40\CsQuery.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.Entity" />
@@ -66,16 +69,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\AccountController.cs" />
+    <Compile Include="Controllers\Shared\LayoutController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="CsQueryView\CsQueryController.cs" />
-    <Compile Include="CsQueryView\ICsQueryController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Models\AccountModels.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CsQueryView\CsQueryView.cs" />
-    <Compile Include="CsQueryView\CsQueryViewEngine.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
@@ -148,7 +148,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Controllers\Shared\" />
     <Folder Include="Controllers\Sub\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/examples/CsQuery.MvcApp/CsQuery.MvcApp/Global.asax.cs b/examples/CsQuery.MvcApp/CsQuery.MvcApp/Global.asax.cs
@@ -40,7 +40,7 @@ protected void Application_Start()
             // [CsQuery] The following code must be added to enable to CsQuery engine
 
             ViewEngines.Engines.Clear();
-            ViewEngines.Engines.Add(new CsQueryViewEngine());
+            ViewEngines.Engines.Add(new CsQueryViewEngine<Controllers.LayoutController>());
         }
     }
 }
diff --git a/examples/CsQuery.MvcApp/CsQuery.MvcApp/packages.config b/examples/CsQuery.MvcApp/CsQuery.MvcApp/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CsQuery" version="1.1.2.1" />
+  <package id="CsQuery" version="1.1.3.2" targetFramework="net40" />
+  <package id="CsQuery.Mvc" version="1.0.5" targetFramework="net40" />
   <package id="EntityFramework" version="4.1.10331.0" />
   <package id="jQuery" version="1.5.1" />
   <package id="jQuery.UI.Combined" version="1.8.11" />