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

Merge pull request #613 from gildebrand/patch-4

Browse Source 
parseMacroSyntax accepts other characters than a-z
This commit is contained in:
Shannon Deminick
2015-03-18 19:17:33 +11:00
parent 9aa5df43bf fec70fcf47
commit 300a46f1b2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
View File

@@ -12,8 +12,8 @@ function macroService() {
/** parses the special macro syntax like <?UMBRACO_MACRO macroAlias="Map" /> and returns an object with the macro alias and it's parameters */
parseMacroSyntax: function (syntax) {
var expression = /(<\?UMBRACO_MACRO macroAlias=["']([\w\.]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
var expression = /(<\?UMBRACO_MACRO macroAlias=["']([\s\S.]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
var match = expression.exec(syntax);
if (!match || match.length < 3) {
return null;
@@ -157,4 +157,4 @@ function macroService() {
}
angular.module('umbraco.services').factory('macroService', macroService);
angular.module('umbraco.services').factory('macroService', macroService);