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

Implemented U4-86 - Move EXSLT references from being predefined in core to xsltExtensions.config

Browse Source
This commit is contained in:
leekelleher
2012-08-23 17:55:45 -01:00
parent f36a88384d
commit ebd87e0eaa
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI/config/xsltExtensions.Release.config
View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<XsltExtensions> <XsltExtensions>
<!-- <!-- This file is used to register 3rd party XSLT extensions (methods you can execute from XSLT, like umbraco.library:NiceUrl) -->
This file is used to register 3rt party xslt extensions (methods you can execute from xslt, like umbraco.library:NiceUrl) <!-- <ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom" /> -->
<ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom"> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltCommon" alias="Exslt.ExsltCommon" />
--> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltDatesAndTimes" alias="Exslt.ExsltDatesAndTimes" />
<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltMath" alias="Exslt.ExsltMath" />
<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltRegularExpressions" alias="Exslt.ExsltRegularExpressions" />
<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltStrings" alias="Exslt.ExsltStrings" />
<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltSets" alias="Exslt.ExsltSets" />
</XsltExtensions> </XsltExtensions>

18
src/Umbraco.Web.UI/config/xsltExtensions.config
View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<XsltExtensions> <XsltExtensions>
<!-- <ext assembly="your.assemblyName" type="your.class.name" alias="yourAlias"> <!-- This file is used to register 3rd party XSLT extensions (methods you can execute from XSLT, like umbraco.library:NiceUrl) -->
</ext> --> <!-- <ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom" /> -->
<ext assembly="umbraco.editorControls" type="umbraco.editorControls.tags.library" alias="tagsLib"> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltCommon" alias="Exslt.ExsltCommon" />
</ext> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltDatesAndTimes" alias="Exslt.ExsltDatesAndTimes" />
<ext assembly="Runway.Blog" type="Runway.Blog.BlogLibrary" alias="BlogLibrary"> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltMath" alias="Exslt.ExsltMath" />
</ext> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltRegularExpressions" alias="Exslt.ExsltRegularExpressions" />
</XsltExtensions> <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltStrings" alias="Exslt.ExsltStrings" />
<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltSets" alias="Exslt.ExsltSets" />
</XsltExtensions>

14
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -867,13 +867,13 @@ namespace umbraco
{ {
m_PredefinedExtensions = new Dictionary<string, object>(); m_PredefinedExtensions = new Dictionary<string, object>();
// add predefined EXSLT extensions //// add predefined EXSLT extensions
m_PredefinedExtensions.Add("Exslt.ExsltCommon", new ExsltCommon()); //m_PredefinedExtensions.Add("Exslt.ExsltCommon", new ExsltCommon());
m_PredefinedExtensions.Add("Exslt.ExsltDatesAndTimes", new ExsltDatesAndTimes()); //m_PredefinedExtensions.Add("Exslt.ExsltDatesAndTimes", new ExsltDatesAndTimes());
m_PredefinedExtensions.Add("Exslt.ExsltMath", new ExsltMath()); //m_PredefinedExtensions.Add("Exslt.ExsltMath", new ExsltMath());
m_PredefinedExtensions.Add("Exslt.ExsltRegularExpressions", new ExsltRegularExpressions()); //m_PredefinedExtensions.Add("Exslt.ExsltRegularExpressions", new ExsltRegularExpressions());
m_PredefinedExtensions.Add("Exslt.ExsltStrings", new ExsltStrings()); //m_PredefinedExtensions.Add("Exslt.ExsltStrings", new ExsltStrings());
m_PredefinedExtensions.Add("Exslt.ExsltSets", new ExsltSets()); //m_PredefinedExtensions.Add("Exslt.ExsltSets", new ExsltSets());
} }
return m_PredefinedExtensions; return m_PredefinedExtensions;