Merge branch '6.1.2' into 7.0.0
Conflicts: .gitignore src/Umbraco.Web.UI/config/ClientDependency.config
This commit is contained in:
Shannon
1
.gitignore
vendored
1
.gitignore
vendored
@@ -84,4 +84,5 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
|
||||
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
|
||||
build/_BuildOutput/
|
||||
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
|
||||
tools/NDepend/
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<!--
|
||||
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 also manages the combination, compression and minification of all JS & CSS files.
|
||||
|
||||
@@ -10,18 +10,32 @@ NOTES:
|
||||
* 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
|
||||
-->
|
||||
<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">
|
||||
<providers>
|
||||
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, 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="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, 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="PlaceHolderProvider" type="ClientDependency.Core.FileRegistration.Providers.PlaceHolderProvider, ClientDependency.Core" enableCompositeFiles="true" javascriptPlaceHolderId="JavaScriptPlaceHolder" cssPlaceHolderId="CssPlaceHolder" />
|
||||
<!-- Used for loading dependencies in Canvas mode -->
|
||||
<add name="CanvasProvider" type="umbraco.presentation.LiveEditing.CanvasClientDependencyProvider, umbraco" />
|
||||
</providers>
|
||||
</fileRegistration>
|
||||
|
||||
<!-- This section is used for MVC only -->
|
||||
<mvc defaultRenderer="StandardRenderer">
|
||||
<renderers>
|
||||
<add name="StandardRenderer" type="ClientDependency.Core.FileRegistration.Providers.StandardRenderer, ClientDependency.Core" />
|
||||
<add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
|
||||
</renderers>
|
||||
</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
|
||||
@@ -38,9 +52,18 @@ NOTES:
|
||||
enableJsMinify="true"
|
||||
persistFiles="true"
|
||||
compositeFilePath="~/App_Data/TEMP/ClientDependency"
|
||||
urlType="Base64QueryStrings" />
|
||||
bundleDomains="localhost:123456"
|
||||
urlType="Base64QueryStrings"
|
||||
pathUrlFormat="{dependencyId}/{version}/{type}"/>
|
||||
</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.
|
||||
Path is a regex selector, or a * can be used as in place of 'any'.
|
||||
@@ -52,16 +75,19 @@ NOTES:
|
||||
<add type="application/json" path="^.*?/webservices/Tree.*" />
|
||||
</mimeTypeCompression>
|
||||
|
||||
</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>
|
||||
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>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<!--
|
||||
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 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">
|
||||
|
||||
<!--
|
||||
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">
|
||||
<providers>
|
||||
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
|
||||
@@ -41,7 +46,7 @@ NOTES:
|
||||
-->
|
||||
<compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
|
||||
<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>
|
||||
|
||||
<!-- 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 -->
|
||||
@@ -60,6 +65,20 @@ NOTES:
|
||||
<add type="application/json" path="^.*?/webservices/Tree.*" />
|
||||
</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>
|
||||
|
||||
</clientDependency>
|
||||
|
||||
Reference in New Issue
Block a user