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

DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB

Browse Source 
Upgraded to latest ClientDependency version. Changed ClientDependency path to App_Data.

[TFS Changeset #59132]
This commit is contained in:
Shandem
2009-09-14 10:42:14 +00:00
parent 9685c50b3b
commit e44e564c54
9 changed files with 61 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/umbraco.controls/UmbracoClientDependencyLoader.cs
View File

@@ -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
{

17
config templates/web.config
View File

@@ -41,11 +41,18 @@
<add key="umbracoUseSSL" value="false" />
<add key="umbracoUseMediumTrust" value="false" />
</appSettings>
<clientDependency defaultProvider="PageHeaderProvider" compositeFilePath="~/data/ClientDependency" enableCompositeFiles="true" fileDependencyExtensions="js,css" isDebugMode="false">
<providers>
<add name="PageHeaderProvider" type="ClientDependency.Core.Providers.PageHeaderProvider" />
<add name="ClientSideRegistrationProvider" type="ClientDependency.Core.Providers.ClientSideRegistrationProvider" />
</providers>
<clientDependency isDebugMode="false">
<fileRegistration defaultProvider="PageHeaderProvider" fileDependencyExtensions="js,css" enableCompositeFiles="true">
<providers>
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
<add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core" />
</providers>
</fileRegistration>
<compositeFiles defaultProvider="CompositeFileProcessor" compositeFilePath="~/App_Data/ClientDependency" compositeFileHandlerPath="DependencyHandler.axd">
<providers>
<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" />
</providers>
</compositeFiles>
</clientDependency>
<system.net>
<mailSettings>

2
umbraco/presentation/install/default.aspx
View File

@@ -57,7 +57,7 @@
</head>
<body>
<cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" ProviderName="ClientSideRegistrationProvider" />
<cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" ProviderName="LazyLoadProvider" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="style.css" />
<umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />

2
umbraco/presentation/install/default.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.

3
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -1,6 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProductVersion>9.0.30729</ProductVersion>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -1439,6 +1439,7 @@
<Content Include="config\splashes\booting.aspx" />
<Content Include="config\splashes\noNodes.aspx" />
<Content Include="config\splashes\worker.png" />
<Content Include="web.config.SHANDEMVAIO.xslt" />
<Content Include="default.aspx" />
<Content Include="Global.asax">
<SubType>Component</SubType>

4
umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs
View File

@@ -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();

2
umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs
View File

@@ -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
{
/// <summary>

25
umbraco/presentation/web.STANDARD.config
View File

@@ -17,7 +17,7 @@
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" />
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core"/>
</configSections>
<urlrewritingnet configSource="config\UrlRewriting.config" />
<appSettings>
@@ -41,12 +41,21 @@
<add key="umbracoUseSSL" value="false" />
<add key="umbracoUseMediumTrust" value="false" />
</appSettings>
<clientDependency defaultProvider="PageHeaderProvider" compositeFilePath="~/data/ClientDependency" enableCompositeFiles="true" fileDependencyExtensions="js,css" isDebugMode="false">
<providers>
<add name="PageHeaderProvider" type="ClientDependency.Core.Providers.PageHeaderProvider" />
<add name="ClientSideRegistrationProvider" type="ClientDependency.Core.Providers.ClientSideRegistrationProvider" />
</providers>
<clientDependency isDebugMode="false">
<fileRegistration defaultProvider="PageHeaderProvider" fileDependencyExtensions="js,css" enableCompositeFiles="true">
<providers>
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
<add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core" />
</providers>
</fileRegistration>
<compositeFiles defaultProvider="CompositeFileProcessor" compositeFilePath="~/App_Data/ClientDependency" compositeFileHandlerPath="DependencyHandler.axd">
<providers>
<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" />
</providers>
</compositeFiles>
</clientDependency>
<system.net>
<mailSettings>
<smtp>
@@ -94,7 +103,7 @@
<!-- UMBRACO CHANNELS -->
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeDependencyHandler, ClientDependency.Core" />
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
</httpHandlers>
<compilation defaultLanguage="c#" debug="true" batch="false">
@@ -177,7 +186,7 @@
<add verb="*" name="Channels" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
<add verb="*" name="Channels_Word" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
<add verb="*" name="ClientDependency" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeDependencyHandler, ClientDependency.Core"/>
<add verb="*" name="ClientDependency" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
<add verb="GET,HEAD,POST" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
</handlers>
</system.webServer>

24
umbraco/presentation/web.config.SHANDEMVAIO.xslt Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl">
<xsl:output method="xml" indent="yes"/>
<!-- Set up a local connection string -->
<xsl:template match="/configuration/appSettings/add[@key='umbracoDbDSN']/@value">
<xsl:attribute name="value">datalayer=&quot;VistaDB,VistaDB For Umbraco&quot;</xsl:attribute>
</xsl:template>
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
<xsl:attribute name="value">4.1.0.alpha</xsl:attribute>
</xsl:template>
<!-- Default templates to match anything else -->
<xsl:template match="@*">
<xsl:copy/>
</xsl:template>
<xsl:template match="node()">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>