Magic-Mirror/js-beautify
1
0
Fork 0
mirror of https://github.com/beautifier/js-beautify.git synced 2025-03-01 17:47:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing complex is_unformatted check

Browse Source
This commit is contained in:
Liam Newman 2018-06-29 20:16:52 -07:00
parent 8b85d77fa9
commit b6b84720d7
2 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/lib/beautify-html.js
View File

@ -706,10 +706,10 @@ function Beautifier(html_source, options, js_beautify, css_beautify) {
this.indent_content = true;
this.traverse_whitespace();
}
} else if (this.is_unformatted(tag_check, unformatted) ||
this.is_unformatted(tag_check, content_unformatted)) {
} else if (this.Utils.in_array(tag_check, unformatted) ||
this.Utils.in_array(tag_check, content_unformatted)) {
// do not reformat the "unformatted" or "content_unformatted" tags
if (this.is_unformatted(tag_check, unformatted)) {
if (this.Utils.in_array(tag_check, unformatted)) {
content = [this.input.slice(tag_start, this.pos)];
}
comment = this.get_unformatted('</' + tag_check + '>', tag_complete); //...delegate to get_unformatted function
@ -923,33 +923,6 @@ function Beautifier(html_source, options, js_beautify, css_beautify) {
return Array(level + 1).join(this.indent_string);
};
this.is_unformatted = function(tag_check, unformatted) {
//is this an HTML5 block-level link?
if (!this.Utils.in_array(tag_check, unformatted)) {
return false;
}
if (tag_check.toLowerCase() !== 'a' || !this.Utils.in_array('a', unformatted)) {
return true;
}
//at this point we have a tag; is its first child something we want to remain
//unformatted?
var next_tag = this.get_tag(true /* peek. */ );
// test next_tag to see if it is just html tag (no external content)
var tag = (next_tag.text).match(/^\s*<\s*\/?([a-z]*)\s*[^>]*>\s*$/);
// if next_tag comes back but is not an isolated tag, then
// let's treat the 'a' tag as having content
// and respect the unformatted option
if (!tag || this.Utils.in_array(tag[1], unformatted)) {
return true;
} else {
return false;
}
};
this.printer = function(js_source, indent_character, indent_size, wrap_line_length, brace_style) { //handles input/output and some other printing functions
this.input = js_source || ''; //gets the input for the Parser

33
js/src/html/beautifier.js
View File

@ -557,10 +557,10 @@ function Beautifier(html_source, options, js_beautify, css_beautify) {
this.indent_content = true;
this.traverse_whitespace();
}
} else if (this.is_unformatted(tag_check, unformatted) ||
this.is_unformatted(tag_check, content_unformatted)) {
} else if (this.Utils.in_array(tag_check, unformatted) ||
this.Utils.in_array(tag_check, content_unformatted)) {
// do not reformat the "unformatted" or "content_unformatted" tags
if (this.is_unformatted(tag_check, unformatted)) {
if (this.Utils.in_array(tag_check, unformatted)) {
content = [this.input.slice(tag_start, this.pos)];
}
comment = this.get_unformatted('</' + tag_check + '>', tag_complete); //...delegate to get_unformatted function
@ -774,33 +774,6 @@ function Beautifier(html_source, options, js_beautify, css_beautify) {
return Array(level + 1).join(this.indent_string);
};
this.is_unformatted = function(tag_check, unformatted) {
//is this an HTML5 block-level link?
if (!this.Utils.in_array(tag_check, unformatted)) {
return false;
}
if (tag_check.toLowerCase() !== 'a' || !this.Utils.in_array('a', unformatted)) {
return true;
}
//at this point we have a tag; is its first child something we want to remain
//unformatted?
var next_tag = this.get_tag(true /* peek. */ );
// test next_tag to see if it is just html tag (no external content)
var tag = (next_tag.text).match(/^\s*<\s*\/?([a-z]*)\s*[^>]*>\s*$/);
// if next_tag comes back but is not an isolated tag, then
// let's treat the 'a' tag as having content
// and respect the unformatted option
if (!tag || this.Utils.in_array(tag[1], unformatted)) {
return true;
} else {
return false;
}
};
this.printer = function(js_source, indent_character, indent_size, wrap_line_length, brace_style) { //handles input/output and some other printing functions
this.input = js_source || ''; //gets the input for the Parser