lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Code review feedback

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-10-07 11:57:00 -07:00
parent 833beaad3b
commit 9c6b024205
6 changed files with 6 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
View File

@@ -83,9 +83,9 @@
<Compile Include="ViewModels\SetupViewModel.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Views\Setup\Index.cshtml">
<Content Include="Views\Setup\Index.cshtml">
<SubType>Designer</SubType>
</None>
</Content>
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>

2
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -188,7 +188,7 @@
<Content Include="Themes\Classic\Theme.png" />
<Content Include="Themes\Classic\Theme.txt" />
<Content Include="Themes\Classic\Views\Footer.cshtml" />
<None Include="Themes\Classic\Views\Layout.cshtml" />
<Content Include="Themes\Classic\Views\Layout.cshtml" />
<Content Include="Themes\Contoso\Content\Images\bkg.jpg" />
<Content Include="Themes\Contoso\Content\Images\comment-arrow.png" />
<Content Include="Themes\Contoso\Content\Images\content-bkg.png" />

15
src/Orchard/Mvc/ViewEngines/Razor/RazorViewEngine.cs
View File

@@ -1,15 +0,0 @@
using System;
using System.Diagnostics;
using System.Web.Mvc;
namespace Orchard.Mvc.ViewEngines.Razor {
public class RazorViewEngine : System.Web.Mvc.RazorViewEngine {
//[DebuggerStepThrough]
//protected override bool FileExists(ControllerContext controllerContext, string virtualPath) {
// if (!virtualPath.EndsWith(".cshtml", StringComparison.InvariantCultureIgnoreCase))
// return false;
// return base.FileExists(controllerContext, virtualPath);
//}
}
}

30
src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineForAspNet4.cs
View File

@@ -1,30 +0,0 @@
using System;
using System.Web;
using System.Web.Compilation;
using System.Web.Mvc;
namespace Orchard.Mvc.ViewEngines.WebForms {
public class WebFormViewEngineForAspNet4 : WebFormViewEngine {
//protected override bool FileExists(ControllerContext controllerContext, string virtualPath) {
// try {
// if (virtualPath.EndsWith(".aspx", StringComparison.InvariantCultureIgnoreCase) ||
// virtualPath.EndsWith(".ascx", StringComparison.InvariantCultureIgnoreCase) ||
// virtualPath.EndsWith(".master", StringComparison.InvariantCultureIgnoreCase)) {
// return BuildManager.GetObjectFactory(virtualPath, false) != null;
// }
// return false;
// }
// catch (HttpException exception) {
// // Reproducing base class behavior, however these this code path should
// // not be followed for "not found" cases
// if (exception is HttpParseException) {
// throw;
// }
// if ((exception.GetHttpCode() != 0x194) || base.FileExists(controllerContext, virtualPath)) {
// throw;
// }
// return false;
// }
//}
}
}

6
src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineProvider.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Mvc.ViewEngines.WebForms {
//Logger.Debug("AreaPartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", areaPartialViewLocationFormats));
var viewEngine = new WebFormViewEngineForAspNet4 {
var viewEngine = new WebFormViewEngine {
MasterLocationFormats = DisabledFormats,
ViewLocationFormats = DisabledFormats,
PartialViewLocationFormats = partialViewLocationFormats,
@@ -85,7 +85,7 @@ namespace Orchard.Mvc.ViewEngines.WebForms {
//Logger.Debug("UniversalFormats (module): \r\n\t-{0}", string.Join("\r\n\t-", universalFormats));
var viewEngine = new WebFormViewEngineForAspNet4 {
var viewEngine = new WebFormViewEngine {
MasterLocationFormats = DisabledFormats,
ViewLocationFormats = universalFormats,
PartialViewLocationFormats = universalFormats,
@@ -99,7 +99,7 @@ namespace Orchard.Mvc.ViewEngines.WebForms {
public IViewEngine CreateBareViewEngine() {
return new WebFormViewEngineForAspNet4 {
return new WebFormViewEngine {
MasterLocationFormats = DisabledFormats,
ViewLocationFormats = DisabledFormats,
PartialViewLocationFormats = DisabledFormats,

2
src/Orchard/Orchard.Framework.csproj
View File

@@ -169,7 +169,6 @@
<Compile Include="Localization\Services\ILocalizedStringManager.cs" />
<Compile Include="Mvc\IOrchardViewPage.cs" />
<Compile Include="Mvc\Spooling\HtmlStringWriter.cs" />
<Compile Include="Mvc\ViewEngines\Razor\RazorViewEngine.cs" />
<Compile Include="Scripting\IScriptingManager.cs" />
<Compile Include="Scripting\IScriptingRuntime.cs" />
<Compile Include="Scripting\ScriptingManager.cs" />
@@ -584,7 +583,6 @@
<Compile Include="Environment\DefaultOrchardHost.cs" />
<Compile Include="Mvc\OrchardControllerFactory.cs" />
<Compile Include="Environment\IOrchardHost.cs" />
<Compile Include="Mvc\ViewEngines\WebForms\WebFormViewEngineForAspNet4.cs" />
<Compile Include="OrchardCoreException.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Indexing\IIndexDocument.cs" />