Bugfix on webforms example

sjdweb · Jul 30, 2013 · ca00d95 · ca00d95
1 parent 59724ca
commit ca00d95
Show file tree

Hide file tree

Showing 8 changed files with 3,543 additions and 4,691 deletions.
diff --git a/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp.sln b/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsQuery.WebFormsApp", "CsQuery.WebFormsApp\CsQuery.WebFormsApp.csproj", "{F7B1D594-F7ED-4A98-9207-C01F65ED6AC7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsQuery", "..\..\source\CsQuery\CsQuery.csproj", "{C38DFFE9-321B-4941-B031-29D718AB5C31}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,14 +17,6 @@ Global
 		{F7B1D594-F7ED-4A98-9207-C01F65ED6AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7B1D594-F7ED-4A98-9207-C01F65ED6AC7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F7B1D594-F7ED-4A98-9207-C01F65ED6AC7}.Release|x64.ActiveCfg = Release|Any CPU
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Debug|x64.ActiveCfg = Debug|x64
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Debug|x64.Build.0 = Debug|x64
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Release|x64.ActiveCfg = Release|x64
-		{C38DFFE9-321B-4941-B031-29D718AB5C31}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/CsQuery.WebFormsApp.csproj b/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/CsQuery.WebFormsApp.csproj
@@ -44,6 +44,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CsQuery, Version=1.3.3.5, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\CsQuery.1.3.3\lib\net40\CsQuery.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -108,13 +112,9 @@
     <Folder Include="App_Data\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\source\CsQuery\CsQuery.csproj">
-      <Project>{c38dffe9-321b-4941-b031-29d718ab5c31}</Project>
-      <Name>CsQuery</Name>
-    </ProjectReference>
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/CsQueryPage/CsQueryUserControl.cs b/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/CsQueryPage/CsQueryUserControl.cs
@@ -29,7 +29,6 @@ protected override void Render(System.Web.UI.HtmlTextWriter writer)
                 Cq_Render();
             }
 
-            Cq_Render();
 
             csqContext.Render();
         }

diff --git a/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/WebUserControl1.ascx.cs b/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/WebUserControl1.ascx.cs
@@ -25,12 +25,12 @@ public partial class WebUserControl1 : CsQueryUserControl
         protected override void Cq_Render()
         {
             var table = Doc["table"];
-            for (int row = 1; row < TableRows; row++)
+            for (int row = 0; row < TableRows; row++)
             {
                 CQ curRow = Doc["<tr></tr>"];
-                for (int col = 1; col < TableColumns; col++)
+                for (int col = 0; col < TableColumns; col++)
                 {
-                    CQ curCol = Doc["<td /"].Text(
+                    CQ curCol = Doc["<td />"].Text(
                         String.Format("Row {0} Column {1}", row, col)
                     );
                     curRow.Append(curCol);

diff --git a/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/packages.config b/examples/CsQuery.WebFormsApp/CsQuery.WebFormsApp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CsQuery" version="1.1.2.1" targetFramework="net40" />
+  <package id="CsQuery" version="1.3.3" targetFramework="net40" />
 </packages>
-Original file line number
+Diff line change
@@ Expand Up @@
                     Cq_Render();
                 }
-                Cq_Render();
                 csqContext.Render();
             }
@@ Expand Down @@