Merge commit '4fc646598a0c47fb75432d6a407fda2f6b0debb9' into devel
This commit is contained in:
commit
357da96ff6
|
@ -23,7 +23,7 @@ $(function() {
|
||||||
self.macroName = ko.observable();
|
self.macroName = ko.observable();
|
||||||
|
|
||||||
var paramObjRegex = /{(.*?)}/g;
|
var paramObjRegex = /{(.*?)}/g;
|
||||||
var keyValueRegex = /(\w*)\s*:\s*([\w\s°"|]*)/g;
|
var keyValueRegex = /(\w*)\s*:\s*([\w\s°"|\.]*)/g;
|
||||||
|
|
||||||
self.process = function(macro) {
|
self.process = function(macro) {
|
||||||
self.macro = macro.macro();
|
self.macro = macro.macro();
|
||||||
|
|
Loading…
Reference in New Issue