mirror of
https://github.com/beautifier/js-beautify.git
synced 2024-11-23 04:40:06 +00:00
Update tokenizer.js
This commit is contained in:
parent
18a518a89a
commit
7d8f600a84
@ -327,27 +327,6 @@ Tokenizer.prototype._is_content_unformatted = function(tag_name) {
|
|||||||
this._options.unformatted.indexOf(tag_name) !== -1);
|
this._options.unformatted.indexOf(tag_name) !== -1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Tokenizer.prototype._read_script_and_style = function(c, previous_token) { // jshint unused:false
|
|
||||||
if (previous_token.type === TOKEN.TAG_CLOSE && previous_token.opened.text[0] === '<' && previous_token.text[0] !== '/') {
|
|
||||||
var tag_name = previous_token.opened.text.substr(1).toLowerCase();
|
|
||||||
if (tag_name === 'script' || tag_name === 'style') {
|
|
||||||
// Script and style tags are allowed to have comments wrapping their content
|
|
||||||
// or just have regular content.
|
|
||||||
var token = this._read_comment_or_cdata(c);
|
|
||||||
if (token) {
|
|
||||||
token.type = TOKEN.TEXT;
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
var resulting_string = this._input.readUntil(new RegExp('</' + tag_name + '[\\n\\r\\t ]*?>', 'ig'));
|
|
||||||
if (resulting_string) {
|
|
||||||
return this._create_token(TOKEN.TEXT, resulting_string);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
Tokenizer.prototype._read_raw_content = function(c, previous_token, open_token) { // jshint unused:false
|
Tokenizer.prototype._read_raw_content = function(c, previous_token, open_token) { // jshint unused:false
|
||||||
var resulting_string = '';
|
var resulting_string = '';
|
||||||
if (open_token && open_token.text[0] === '{') {
|
if (open_token && open_token.text[0] === '{') {
|
||||||
@ -369,6 +348,26 @@ Tokenizer.prototype._read_raw_content = function(c, previous_token, open_token)
|
|||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Tokenizer.prototype._read_script_and_style = function(c, previous_token) { // jshint unused:false
|
||||||
|
if (previous_token.type === TOKEN.TAG_CLOSE && previous_token.opened.text[0] === '<' && previous_token.text[0] !== '/') {
|
||||||
|
var tag_name = previous_token.opened.text.substr(1).toLowerCase();
|
||||||
|
if (tag_name === 'script' || tag_name === 'style') {
|
||||||
|
// Script and style tags are allowed to have comments wrapping their content
|
||||||
|
// or just have regular content.
|
||||||
|
var token = this._read_comment_or_cdata(c);
|
||||||
|
if (token) {
|
||||||
|
token.type = TOKEN.TEXT;
|
||||||
|
return token;
|
||||||
|
}
|
||||||
|
var resulting_string = this._input.readUntil(new RegExp('</' + tag_name + '[\\n\\r\\t ]*?>', 'ig'));
|
||||||
|
if (resulting_string) {
|
||||||
|
return this._create_token(TOKEN.TEXT, resulting_string);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
Tokenizer.prototype._read_content_word = function(c, open_token) {
|
Tokenizer.prototype._read_content_word = function(c, open_token) {
|
||||||
var resulting_string = '';
|
var resulting_string = '';
|
||||||
if (this._options.unformatted_content_delimiter) {
|
if (this._options.unformatted_content_delimiter) {
|
||||||
|
Loading…
Reference in New Issue
Block a user