yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Shannon Deminick
2013-01-19 06:43:13 +03:00
parent 3e28376ae7 9106438317
commit 362e98ebe7
3 changed files with 19 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/IApplicationEventHandler.cs
View File

@@ -8,8 +8,26 @@ namespace Umbraco.Web
/// </summary>
public interface IApplicationEventHandler : IApplicationStartupHandler
{
/// <summary>
/// ApplicationContext is created and other static objects that require initialization have been setup
/// </summary>
/// <param name="httpApplication"></param>
/// <param name="applicationContext"></param>
void OnApplicationInitialized(UmbracoApplication httpApplication, ApplicationContext applicationContext);
/// <summary>
/// All resolvers have been initialized but resolution is not frozen so they can be modified in this method
/// </summary>
/// <param name="httpApplication"></param>
/// <param name="applicationContext"></param>
void OnApplicationStarting(UmbracoApplication httpApplication, ApplicationContext applicationContext);
/// <summary>
/// Bootup is completed, this allows you to perform any other bootup logic required for the application.
/// Resolution is frozen so now they can be used to resolve instances.
/// </summary>
/// <param name="httpApplication"></param>
/// <param name="applicationContext"></param>
void OnApplicationStarted(UmbracoApplication httpApplication, ApplicationContext applicationContext);
}
}

46
src/Umbraco.Web/Mvc/SurfaceController.cs
View File

@@ -6,52 +6,6 @@ using Umbraco.Core;
namespace Umbraco.Web.Mvc
{
//[PluginController("MyTestSurfaceController")]
//public class TestSurfaceController : SurfaceController
//{
// public ActionResult Index()
// {
// return View();
// //return Content("<html><body>hello</body></html>");
// }
// public ActionResult PostVals(TestFormModel model)
// {
// ModelState.AddModelError("name", "bad name!");
// return CurrentUmbracoPage();
// }
// [ChildActionOnly]
// public ActionResult DoThis(string asdf)
// {
// return PartialView("DoThis", asdf + " DONE!");
// }
//}
//public class TestFormModel
//{
// public string Name { get; set; }
//}
//public class LocalSurfaceController : SurfaceController
//{
// public ActionResult Index()
// {
// return View();
// }
// public ActionResult PostVals([Bind(Prefix = "blah")]TestFormModel model)
// {
// ModelState.AddModelError("Name", "you suck!");
// return this.RedirectToCurrentUmbracoPage();
// }
// [ChildActionOnly]
// public ActionResult DoThis(string asdf)
// {
// return PartialView("DoThis", asdf + " DONE Again!");
// }
//}
/// <summary>
/// The base controller that all Presentation Add-in controllers should inherit from

2
src/Umbraco.Web/WebBootManager.cs
View File

@@ -46,7 +46,7 @@ namespace Umbraco.Web
_umbracoApplication = umbracoApplication;
if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
}
/// <summary>
/// Initialize objects before anything during the boot cycle happens
/// </summary>