kopia lustrzana https://github.com/c9/core
commit
f06d5124b4
|
@ -75,7 +75,7 @@ var ColdfusionHighlightRules = function() {
|
||||||
this.$rules[s].unshift(cfTag);
|
this.$rules[s].unshift(cfTag);
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "cfjs-", "cfscript");
|
this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "cfjs-", "cfscript");
|
||||||
|
|
||||||
this.normalizeRules();
|
this.normalizeRules();
|
||||||
};
|
};
|
||||||
|
|
|
@ -99,7 +99,7 @@ var HtmlHighlightRules = function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
this.embedTagRules(CssHighlightRules, "css-", "style");
|
this.embedTagRules(CssHighlightRules, "css-", "style");
|
||||||
this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "js-", "script");
|
this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "js-", "script");
|
||||||
|
|
||||||
if (this.constructor === HtmlHighlightRules)
|
if (this.constructor === HtmlHighlightRules)
|
||||||
this.normalizeRules();
|
this.normalizeRules();
|
||||||
|
|
|
@ -383,7 +383,7 @@ var JavaScriptHighlightRules = function(options) {
|
||||||
}]
|
}]
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!options || !options.noJSX)
|
if (!options || options.jsx != false)
|
||||||
JSX.call(this);
|
JSX.call(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ var TypeScriptHighlightRules = function(options) {
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
var JSRules = new JavaScriptHighlightRules({jsx: options && options.jsx}).getRules();
|
var JSRules = new JavaScriptHighlightRules({jsx: (options && options.jsx) == true}).getRules();
|
||||||
|
|
||||||
JSRules.start = tsRules.concat(JSRules.start);
|
JSRules.start = tsRules.concat(JSRules.start);
|
||||||
this.$rules = JSRules;
|
this.$rules = JSRules;
|
||||||
|
|
Ładowanie…
Reference in New Issue