Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest from upstream #10

Merged
merged 75 commits into from
Aug 12, 2021
Merged

Conversation

bdukes
Copy link

@bdukes bdukes commented Aug 10, 2021

This repo is currently based on the 1.9.2 release of https://github.com/Shazwazza/ClientDependency.

This PR includes changes from 1.9.3 to 1.9.10.

bdukes and others added 30 commits November 22, 2016 14:56
When parsing the `HtmlAttributesAsString` property, the keys and values accumulate, so that when there are multiple key/value pairs, the keys and values are duplicated.  For example, `HtmlAttributesAsString="defer=true,async=true"` yields the following:

    defer=true
    deferasync=truetrue
Some sites force a "/" to be at the end of every URL Shazwazza#110
Fix bug with multiple values in HtmlAttributes
Its not really in the css spec but browsers do let you have a space after the @import url() statement and the ; - so with CDF off @import url('styles.css') ; works but when debug=false, it stops because the reg-ex doesn't find it.
sorry, didn't mean to commit that change :(
…ath/FileInfo/GetExtension, missing using statements, returns 404 when processing cannot be done instead of throwing, trims file paths, adds propery logging to test site
Fix to EnableDebugVersionString reading incorrect config key
Fix to EnableDebugVersionString reading incorrect config key
Resolve issue Shazwazza#134
Require a Web.config app setting key="ClientDependencyHTML4" value="true" in order to output type="text/javascript"
Copy link

@valadas valadas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks about right to me except one little note

bdukes added 5 commits August 11, 2021 08:43
# Conflicts:
#	ClientDependency.Core/CompositeFiles/CompositeDependencyHandler.cs
#	ClientDependency.Core/CompositeFiles/Providers/BaseCompositeFileProcessingProvider.cs
#	ClientDependency.Core/CompositeFiles/Providers/CompositeFileProcessingProvider.cs
#	ClientDependency.Core/FileRegistration/Providers/StandardRenderer.cs
#	build/ClientDependency.nuspec
# Conflicts:
#	build/ClientDependency.nuspec
# Conflicts:
#	appveyor.yml
#	src/ClientDependency.Coffee/CoffeeWriter.cs
#	src/ClientDependency.Core/BasicFile.cs
#	src/ClientDependency.Core/ClientDependency.Core.csproj
#	src/ClientDependency.Core/ClientDependencyAttribute.cs
#	src/ClientDependency.Core/CompositeFiles/CompositeDependencyHandler.cs
#	src/ClientDependency.Core/CompositeFiles/Providers/BaseCompositeFileProcessingProvider.cs
#	src/ClientDependency.Core/CompositeFiles/Providers/CompositeFileProcessingProvider.cs
#	src/ClientDependency.Core/Config/ClientDependencySettings.cs
#	src/ClientDependency.Core/Config/DnnConfiguration.cs
#	src/ClientDependency.Core/Controls/ClientDependencyInclude.cs
#	src/ClientDependency.Core/Controls/ClientDependencyLoader.cs
#	src/ClientDependency.Core/Controls/HtmlInclude.cs
#	src/ClientDependency.Core/CssHelper.cs
#	src/ClientDependency.Core/DependencySorter.cs
#	src/ClientDependency.Core/FileRegistration/Providers/BaseFileRegistrationProvider.cs
#	src/ClientDependency.Core/FileWriters.cs
#	src/ClientDependency.Core/IClientDependencyFile.cs
#	src/ClientDependency.Core/IClientDependencyFileExtensions.cs
#	src/ClientDependency.Core/Module/ResponseFilterStream.cs
#	src/ClientDependency.Core/Module/RogueFileFilter.cs
#	src/ClientDependency.Core/SimpleCompressor.cs
#	src/ClientDependency.Less/LessWriter.cs
#	src/ClientDependency.SASS/SassWriter.cs
#	src/ClientDependency.TypeScript/TypeScriptWriter.cs
#	src/ClientDependency.UnitTests/CssImportStatementsTest.cs
# Conflicts:
#	src/ClientDependency.Core/CssHelper.cs
# Conflicts:
#	appveyor.yml
@mitchelsellers mitchelsellers merged commit 85494df into dnnsoftware:dnn Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.