From e44e564c5442186722368de7983db3fe29c557aa Mon Sep 17 00:00:00 2001 From: Shandem Date: Mon, 14 Sep 2009 10:42:14 +0000 Subject: [PATCH] DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB Upgraded to latest ClientDependency version. Changed ClientDependency path to App_Data. [TFS Changeset #59132] --- .../UmbracoClientDependencyLoader.cs | 2 +- config templates/web.config | 17 +++++++++---- umbraco/presentation/install/default.aspx | 2 +- .../install/default.aspx.designer.cs | 2 +- .../presentation/umbraco.presentation.csproj | 3 ++- .../Controls/LiveEditingManager.cs | 4 +-- .../Modules/ItemEditing/ItemEditor.cs | 2 +- umbraco/presentation/web.STANDARD.config | 25 +++++++++++++------ .../presentation/web.config.SHANDEMVAIO.xslt | 24 ++++++++++++++++++ 9 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 umbraco/presentation/web.config.SHANDEMVAIO.xslt diff --git a/components/umbraco.controls/UmbracoClientDependencyLoader.cs b/components/umbraco.controls/UmbracoClientDependencyLoader.cs index 2cf1db7617..ac14280941 100644 --- a/components/umbraco.controls/UmbracoClientDependencyLoader.cs +++ b/components/umbraco.controls/UmbracoClientDependencyLoader.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web.UI; using ClientDependency.Core.Controls; -using ClientDependency.Core.Providers; +using ClientDependency.Core.FileRegistration.Providers; namespace umbraco.uicontrols { diff --git a/config templates/web.config b/config templates/web.config index 2ed0393084..a69cf7c648 100644 --- a/config templates/web.config +++ b/config templates/web.config @@ -41,11 +41,18 @@ - - - - - + + + + + + + + + + + + diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx index 5d1ef4f301..82dc91b489 100644 --- a/umbraco/presentation/install/default.aspx +++ b/umbraco/presentation/install/default.aspx @@ -57,7 +57,7 @@ - + diff --git a/umbraco/presentation/install/default.aspx.designer.cs b/umbraco/presentation/install/default.aspx.designer.cs index 47289d6faf..4a7bd00d30 100644 --- a/umbraco/presentation/install/default.aspx.designer.cs +++ b/umbraco/presentation/install/default.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3082 +// Runtime Version:2.0.50727.3074 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index ff397afc25..7fb32dade4 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -1,6 +1,6 @@  - 9.0.30729 + 9.0.21022 2.0 {651E1350-91B6-44B7-BD60-7207006D7003} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} @@ -1439,6 +1439,7 @@ + Component diff --git a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs index fcbbcef983..05764a1069 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs @@ -4,11 +4,11 @@ using System.Web.UI; using System.Web.UI.WebControls; using umbraco.presentation.LiveEditing.Modules.ItemEditing; using ClientDependency.Core; -using ClientDependency.Core.Providers; using ClientDependency.Core.Controls; using umbraco.BasePages; using System.Collections.Generic; using umbraco.uicontrols; +using ClientDependency.Core.FileRegistration.Providers; namespace umbraco.presentation.LiveEditing.Controls { @@ -118,7 +118,7 @@ namespace umbraco.presentation.LiveEditing.Controls //we need a DependencyLoader control bool isNew; UmbracoClientDependencyLoader.TryCreate(this, out isNew); - ClientDependencyLoader.Instance.ProviderName = ClientSideRegistrationProvider.DefaultName; + ClientDependencyLoader.Instance.ProviderName = LazyLoadProvider.DefaultName; ClientDependencyLoader.Instance.IsDebugMode = true; m_Communicator = new Communicator(); diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs index 1676228ad5..9f0d2ab965 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs @@ -14,7 +14,7 @@ using umbraco.presentation.LiveEditing.Updates; using umbraco.presentation.templateControls; using ClientDependency.Core; using ClientDependency.Core.Controls; -using ClientDependency.Core.Providers; + namespace umbraco.presentation.LiveEditing.Modules.ItemEditing { /// diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config index 48204aa464..48b960b245 100644 --- a/umbraco/presentation/web.STANDARD.config +++ b/umbraco/presentation/web.STANDARD.config @@ -17,7 +17,7 @@
-
+
@@ -41,12 +41,21 @@ - - - - - + + + + + + + + + + + + + + @@ -94,7 +103,7 @@ - + @@ -177,7 +186,7 @@ - + diff --git a/umbraco/presentation/web.config.SHANDEMVAIO.xslt b/umbraco/presentation/web.config.SHANDEMVAIO.xslt new file mode 100644 index 0000000000..07fd38f287 --- /dev/null +++ b/umbraco/presentation/web.config.SHANDEMVAIO.xslt @@ -0,0 +1,24 @@ + + + + + + + datalayer="VistaDB,VistaDB For Umbraco" + + + 4.1.0.alpha + + + + + + + + + + + + + +