update smarty mode

This commit is contained in:
nightwing 2014-02-05 23:59:17 +04:00
commit 42f274a42c
2 changed files with 10 additions and 5 deletions

View file

@ -113,13 +113,16 @@ var SmartyHighlightRules = function() {
regex: '(->)([a-zA-Z_][a-zA-Z0-9_]*)(\\()(.*?)(\\))' } ] } regex: '(->)([a-zA-Z_][a-zA-Z0-9_]*)(\\()(.*?)(\\))' } ] }
var smartyStart = smartyRules.start; var smartyStart = smartyRules.start;
["start", "qqstring_inner", "qstring_inner", "attributes", "cdata"].forEach(function(x) {
this.$rules[x].unshift.apply(this.$rules[x], smartyStart);
}, this);
Object.keys(smartyRules).forEach(function(x) { Object.keys(smartyRules).forEach(function(x) {
if (x == "start") if (!this.$rules[x])
this.$rules[x].unshift.apply(this.$rules[x], smartyRules[x]);
else
this.$rules[x] = smartyRules[x]; this.$rules[x] = smartyRules[x];
}, this); }, this);
this.normalizeRules(); this.normalizeRules();
}; };

View file

@ -80,7 +80,9 @@ var TextHighlightRules = function() {
}; };
this.embedRules = function (HighlightRules, prefix, escapeRules, states, append) { this.embedRules = function (HighlightRules, prefix, escapeRules, states, append) {
var embedRules = new HighlightRules().getRules(); var embedRules = typeof HighlightRules == "function"
? new HighlightRules().getRules()
: HighlightRules;
if (states) { if (states) {
for (var i = 0; i < states.length; i++) for (var i = 0; i < states.length; i++)
states[i] = prefix + states[i]; states[i] = prefix + states[i];