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

Merge branch '6.1.2' into 7.0.0

Browse Source 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/config/ClientDependency.config
This commit is contained in:
Shannon
2013-06-21 15:49:40 +10:00
parent 7a94b49b34 eac66f5696
commit c81cd0fd1d
3 changed files with 93 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -84,4 +84,5 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/ src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/ build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/

86
src/Umbraco.Web.UI/config/ClientDependency.Release.config
View File

@@ -2,7 +2,7 @@
<!-- <!--
For full details of the client dependency framework, visit For full details of the client dependency framework, visit
the CodePlex site @ http://clientdependency.codeplex.com https://github.com/Shandem/ClientDependency
It manages CSS and JS file dependencies per control without having to worry about duplicates. It manages CSS and JS file dependencies per control without having to worry about duplicates.
It also manages the combination, compression and minification of all JS & CSS files. It also manages the combination, compression and minification of all JS & CSS files.
@@ -10,26 +10,40 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files * A new version will invalidate both client and server cache and create new persisted files
--> -->
<clientDependency version="1" fileDependencyExtensions=".js,.css"> <clientDependency version="1" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<!--
This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
The LoaderControlProvider is set to default, the javascriptPlaceHolderId, cssPlaceHolderId attributes are optional and default to what is listed below. If using
this provider, then you must specify both PlaceHolder controls on your page in order to render the JS/CSS.
-->
<fileRegistration defaultProvider="LoaderControlProvider"> <fileRegistration defaultProvider="LoaderControlProvider">
<providers> <providers>
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core"/> <add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
<add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core"/> <add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core" />
<add name="LoaderControlProvider" type="ClientDependency.Core.FileRegistration.Providers.LoaderControlProvider, ClientDependency.Core"/> <add name="LoaderControlProvider" type="ClientDependency.Core.FileRegistration.Providers.LoaderControlProvider, ClientDependency.Core" />
<add name="PlaceHolderProvider" type="ClientDependency.Core.FileRegistration.Providers.PlaceHolderProvider, ClientDependency.Core" enableCompositeFiles="true" javascriptPlaceHolderId="JavaScriptPlaceHolder" cssPlaceHolderId="CssPlaceHolder" />
<!-- Used for loading dependencies in Canvas mode --> <!-- Used for loading dependencies in Canvas mode -->
<add name="CanvasProvider" type="umbraco.presentation.LiveEditing.CanvasClientDependencyProvider, umbraco" /> <add name="CanvasProvider" type="umbraco.presentation.LiveEditing.CanvasClientDependencyProvider, umbraco" />
</providers> </providers>
</fileRegistration> </fileRegistration>
<!-- <!-- This section is used for MVC only -->
The composite file section configures the compression/combination/minification of files. <mvc defaultRenderer="StandardRenderer">
You can enable/disable minification of either JS/CSS files and you can enable/disable the <renderers>
persistence of composite files. By default, minification and persistence is enabled. Persisting files <add name="StandardRenderer" type="ClientDependency.Core.FileRegistration.Providers.StandardRenderer, ClientDependency.Core" />
means that the system is going to save the output of the compressed/combined/minified files <add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
to disk so that on any subsequent request (when output cache expires) that these files don't have </renderers>
to be recreated again and will be based on the persisted file on disk. This saves on processing time. </mvc>
-->
<!--
The composite file section configures the compression/combination/minification of files.
You can enable/disable minification of either JS/CSS files and you can enable/disable the
persistence of composite files. By default, minification and persistence is enabled. Persisting files
means that the system is going to save the output of the compressed/combined/minified files
to disk so that on any subsequent request (when output cache expires) that these files don't have
to be recreated again and will be based on the persisted file on disk. This saves on processing time.
-->
<compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd"> <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
<fileProcessingProviders> <fileProcessingProviders>
<add name="CompositeFileProcessor" <add name="CompositeFileProcessor"
@@ -38,30 +52,42 @@ NOTES:
enableJsMinify="true" enableJsMinify="true"
persistFiles="true" persistFiles="true"
compositeFilePath="~/App_Data/TEMP/ClientDependency" compositeFilePath="~/App_Data/TEMP/ClientDependency"
urlType="Base64QueryStrings" /> bundleDomains="localhost:123456"
urlType="Base64QueryStrings"
pathUrlFormat="{dependencyId}/{version}/{type}"/>
</fileProcessingProviders> </fileProcessingProviders>
<!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
<fileMapProviders>
<add name="XmlFileMap"
type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core"
mapPath="~/App_Data/TEMP/ClientDependency" />
</fileMapProviders>
<!-- <!--
Defines the mime types to compress when requested by the client. Defines the mime types to compress when requested by the client.
Path is a regex selector, or a * can be used as in place of 'any'. Path is a regex selector, or a * can be used as in place of 'any'.
Generally mime types are only set by client browsers in the request for things Generally mime types are only set by client browsers in the request for things
such as JSON or XML ajax requests. such as JSON or XML ajax requests.
--> -->
<mimeTypeCompression> <mimeTypeCompression>
<!-- Compress all json requests for the tree --> <!-- Compress all json requests for the tree -->
<add type="application/json" path="^.*?/webservices/Tree.*" /> <add type="application/json" path="^.*?/webservices/Tree.*" />
</mimeTypeCompression> </mimeTypeCompression>
<!--
Defines the paths to match on to enable rogue file compression.
Path is a regex selector, or a * can be used as in place of 'any'.
jsExt and cssExt are comma seperated list of extensions to match to have the dependencies
replaced with the composite file handler. You can even include ASP.Net web service JS proxies.
-->
<rogueFileCompression>
<!--<add path="*" compressJs="true" compressCss="true" jsExt=".js,asmx/js" cssExt=".css">
<exclusions>
<add path="^.*test.aspx.*"/>
</exclusions>
</add>-->
</rogueFileCompression>
</compositeFiles> </compositeFiles>
<!-- ClientDependency also supports the ASP.Net MVC framework, see codeplex URL for full details -->
<!--
<mvc defaultRenderer="StandardRenderer">
<renderers>
<add name="StandardRenderer" type="ClientDependency.Core.Mvc.Providers.StandardRenderer, ClientDependency.Core"/>
<add name="LazyLoadRenderer" type="ClientDependency.Core.Mvc.Providers.LazyLoadRenderer, ClientDependency.Core"/>
</renderers>
</mvc>
-->
</clientDependency> </clientDependency>

53
src/Umbraco.Web.UI/config/ClientDependency.config
View File

@@ -2,7 +2,7 @@
<!-- <!--
For full details of the client dependency framework, visit For full details of the client dependency framework, visit
the CodePlex site @ http://clientdependency.codeplex.com https://github.com/Shandem/ClientDependency
It manages CSS and JS file dependencies per control without having to worry about duplicates. It manages CSS and JS file dependencies per control without having to worry about duplicates.
It also manages the combination, compression and minification of all JS & CSS files. It also manages the combination, compression and minification of all JS & CSS files.
@@ -12,6 +12,11 @@ NOTES:
--> -->
<clientDependency version="12" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco"> <clientDependency version="12" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<!--
This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
The LoaderControlProvider is set to default, the javascriptPlaceHolderId, cssPlaceHolderId attributes are optional and default to what is listed below. If using
this provider, then you must specify both PlaceHolder controls on your page in order to render the JS/CSS.
-->
<fileRegistration defaultProvider="LoaderControlProvider"> <fileRegistration defaultProvider="LoaderControlProvider">
<providers> <providers>
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" /> <add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
@@ -32,16 +37,16 @@ NOTES:
</mvc> </mvc>
<!-- <!--
The composite file section configures the compression/combination/minification of files. The composite file section configures the compression/combination/minification of files.
You can enable/disable minification of either JS/CSS files and you can enable/disable the You can enable/disable minification of either JS/CSS files and you can enable/disable the
persistence of composite files. By default, minification and persistence is enabled. Persisting files persistence of composite files. By default, minification and persistence is enabled. Persisting files
means that the system is going to save the output of the compressed/combined/minified files means that the system is going to save the output of the compressed/combined/minified files
to disk so that on any subsequent request (when output cache expires) that these files don't have to disk so that on any subsequent request (when output cache expires) that these files don't have
to be recreated again and will be based on the persisted file on disk. This saves on processing time. to be recreated again and will be based on the persisted file on disk. This saves on processing time.
--> -->
<compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd"> <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
<fileProcessingProviders> <fileProcessingProviders>
<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" urlType="Base64QueryStrings" /> <add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" bundleDomains="localhost:123456" urlType="Base64QueryStrings" pathUrlFormat="{dependencyId}/{version}/{type}" />
</fileProcessingProviders> </fileProcessingProviders>
<!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type --> <!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
@@ -49,17 +54,31 @@ NOTES:
<add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" /> <add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" />
</fileMapProviders> </fileMapProviders>
<!-- <!--
Defines the mime types to compress when requested by the client. Defines the mime types to compress when requested by the client.
Path is a regex selector, or a * can be used as in place of 'any'. Path is a regex selector, or a * can be used as in place of 'any'.
Generally mime types are only set by client browsers in the request for things Generally mime types are only set by client browsers in the request for things
such as JSON or XML ajax requests. such as JSON or XML ajax requests.
--> -->
<mimeTypeCompression> <mimeTypeCompression>
<!-- Compress all json requests for the tree --> <!-- Compress all json requests for the tree -->
<add type="application/json" path="^.*?/webservices/Tree.*" /> <add type="application/json" path="^.*?/webservices/Tree.*" />
</mimeTypeCompression> </mimeTypeCompression>
</compositeFiles> <!--
Defines the paths to match on to enable rogue file compression.
Path is a regex selector, or a * can be used as in place of 'any'.
jsExt and cssExt are comma seperated list of extensions to match to have the dependencies
replaced with the composite file handler. You can even include ASP.Net web service JS proxies.
-->
<rogueFileCompression>
<!--<add path="*" compressJs="true" compressCss="true" jsExt=".js,asmx/js" cssExt=".css">
<exclusions>
<add path="^.*test.aspx.*"/>
</exclusions>
</add>-->
</rogueFileCompression>
</compositeFiles>
</clientDependency> </clientDependency>