Index: richtext/resources/src/main/resources/xinha/XinhaCore.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- richtext/resources/src/main/resources/xinha/XinhaCore.js (revision 37311)
+++ richtext/resources/src/main/resources/xinha/XinhaCore.js (revision )
@@ -3484,7 +3484,7 @@
this.firePluginEvent('onBeforeMode', 'textmode');
this._toolbarObjects.htmlmode.swapImage(this.config.iconList.wysiwygmode);
this.setCC("iframe");
- html = this.outwardHtml(this.getHTML());
+ html = this.outwardHtml(this.getHTML(true));
this.setHTML(html);
// Hide the iframe
@@ -5694,7 +5694,7 @@
* @private
* @returns {String} HTML content
*/
-Xinha.prototype.getHTML = function()
+Xinha.prototype.getHTML = function(beautify)
{
var html = '';
switch ( this._editMode )
@@ -5702,11 +5702,11 @@
case "wysiwyg":
if ( !this.config.fullPage )
{
- html = Xinha.getHTML(this._doc.body, false, this).trim();
+ html = Xinha.getHTML(this._doc.body, false, this, beautify).trim();
}
else
{
- html = this.doctype + "\n" + Xinha.getHTML(this._doc.documentElement, true, this);
+ html = this.doctype + "\n" + Xinha.getHTML(this._doc.documentElement, true, this, beautify);
}
break;
case "textmode":
Index: richtext/resources/src/main/resources/xinha/modules/GetHtml/TransformInnerHTML.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- richtext/resources/src/main/resources/xinha/modules/GetHtml/TransformInnerHTML.js (revision 37311)
+++ richtext/resources/src/main/resources/xinha/modules/GetHtml/TransformInnerHTML.js (revision )
@@ -104,51 +104,7 @@
return sHtml;
};
-/**
- * Prettyfies html by inserting linebreaks before tags, and indenting blocklevel tags
- */
-Xinha.indent = function(s, sindentChar) {
- Xinha.__nindent = 0;
- Xinha.__sindent = "";
- Xinha.__sindentChar = (typeof sindentChar == "undefined") ? " " : sindentChar;
- var c = Xinha.RegExpCache;
- if(Xinha.is_gecko) { //moz changes returns into
inside tags
- s = s.replace(c[19], function(str){return str.replace(/
/g,"\n")});
- }
- s = s.replace(c[18], function(strn) { //skip pre and script tags
- strn = strn.replace(c[20], function(st,$1,$2) { //exclude comments
- string = $2.replace(/[\n\r]/gi, " ").replace(/\s+/gi," ").replace(c[14], function(str) {
- if (str.match(c[16])) {
- var s = "\n" + Xinha.__sindent + str;
- // blocklevel openingtag - increase indent
- Xinha.__sindent += Xinha.__sindentChar;
- ++Xinha.__nindent;
- return s;
- } else if (str.match(c[15])) {
- // blocklevel closingtag - decrease indent
- --Xinha.__nindent;
- Xinha.__sindent = "";
- for (var i=Xinha.__nindent;i>0;--i) {
- Xinha.__sindent += Xinha.__sindentChar;
- }
- return "\n" + Xinha.__sindent + str;
- } else if (str.match(c[17])) {
- // singlet tag
- return "\n" + Xinha.__sindent + str;
- }
- return str; // this won't actually happen
- });
- return $1 + string;
- });return strn;
- });
- //final cleanup
- s = s.replace(/^\s*/,'').//strip leading whitespace
- replace(/ +\n/g,'\n').//strip spaces at end of lines
- replace(/[\r\n]+(\s+)<\/script>/g,'\n$1');//strip returns added into scripts
- return s;
-};
-
-Xinha.getHTML = function(root, outputRoot, editor) {
+Xinha.getHTML = function(root, outputRoot, editor, beautify) {
var html = "";
var c = Xinha.RegExpCache;
@@ -217,7 +173,10 @@
if (outputRoot) {
html += "";
}
- html = Xinha.indent(html);
+
+ if (beautify) {
+ html = JSBEAUTIFY.style_html(html, {max_char: 120});
+ }
};
// html = Xinha.htmlEncode(html);
@@ -233,3 +192,511 @@
Xinha._escapeDollars = function(str) {
return str.replace(/\$/g, "$$$$");
};
+
+/**
+ Style HTML
+ ---------------
+
+ Written by Nochum Sossonko, (nsossonko@hotmail.com)
+
+ Based on code initially developed by: Einar Lielmanis,
+ http://jsbeautifier.org/
+
+
+ You are free to use this in any way you want, in case you find this useful or working for you.
+ */
+JSBEAUTIFY = {};
+JSBEAUTIFY.style_html = function(html_source, options) {
+ //Wrapper function to invoke all the necessary constructors and deal with the output.
+
+ var multi_parser,
+ indent_size,
+ indent_character,
+ max_char,
+ brace_style,
+ unformatted;
+
+ options = options || {};
+ indent_size = options.indent_size || 4;
+ indent_character = options.indent_char || ' ';
+ brace_style = options.brace_style || 'collapse';
+ max_char = options.max_char == 0 ? Infinity : options.max_char || 70;
+ unformatted = options.unformatted || ['a', 'span', 'bdo', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'q', 'sub', 'sup', 'tt', 'i', 'b', 'big', 'small', 'u', 's', 'strike', 'font', 'ins', 'del', 'pre', 'address', 'dt', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+
+ function Parser() {
+
+ this.pos = 0; //Parser position
+ this.token = '';
+ this.current_mode = 'CONTENT'; //reflects the current Parser mode: TAG/CONTENT
+ this.tags = { //An object to hold tags, their position, and their parent-tags, initiated with default values
+ parent: 'parent1',
+ parentcount: 1,
+ parent1: ''
+ };
+ this.tag_type = '';
+ this.token_text = this.last_token = this.last_text = this.token_type = '';
+
+ this.Utils = { //Uilities made available to the various functions
+ whitespace: "\n\r\t ".split(''),
+ single_token: 'br,input,link,meta,!doctype,basefont,base,area,hr,wbr,param,img,isindex,?xml,embed,?php,?,?='.split(','), //all the single tags for HTML
+ extra_liners: 'head,body,/html'.split(','), //for tags that need a line of whitespace before them
+ in_array: function (what, arr) {
+ for (var i=0; i= this.input.length) {
+ return content.length?content.join(''):['', 'TK_EOF'];
+ }
+
+ input_char = this.input.charAt(this.pos);
+ this.pos++;
+ this.line_char_count++;
+
+ if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
+ if (content.length) {
+ space = true;
+ }
+ this.line_char_count--;
+ continue; //don't want to insert unnecessary space
+ }
+ else if (space) {
+ if (this.line_char_count >= this.max_char) { //insert a line when the max_char is reached
+ content.push('\n');
+ for (var i=0; i', 'igm');
+ reg_match.lastIndex = this.pos;
+ var reg_array = reg_match.exec(this.input);
+ var end_script = reg_array?reg_array.index:this.input.length; //absolute end of script
+ if(this.pos < end_script) { //get everything in between the script tags
+ content = this.input.substring(this.pos, end_script);
+ this.pos = end_script;
+ }
+ return content;
+ }
+
+ this.record_tag = function (tag){ //function to record a tag and its parent in this.tags Object
+ if (this.tags[tag + 'count']) { //check for the existence of this tag type
+ this.tags[tag + 'count']++;
+ this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
+ }
+ else { //otherwise initialize this tag type
+ this.tags[tag + 'count'] = 1;
+ this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
+ }
+ this.tags[tag + this.tags[tag + 'count'] + 'parent'] = this.tags.parent; //set the parent (i.e. in the case of a div this.tags.div1parent)
+ this.tags.parent = tag + this.tags[tag + 'count']; //and make this the current parent (i.e. in the case of a div 'div1')
+ }
+
+ this.retrieve_tag = function (tag) { //function to retrieve the opening tag to the corresponding closer
+ if (this.tags[tag + 'count']) { //if the openener is not in the Object we ignore it
+ var temp_parent = this.tags.parent; //check to see if it's a closable tag.
+ while (temp_parent) { //till we reach '' (the initial value);
+ if (tag + this.tags[tag + 'count'] === temp_parent) { //if this is it use it
+ break;
+ }
+ temp_parent = this.tags[temp_parent + 'parent']; //otherwise keep on climbing up the DOM Tree
+ }
+ if (temp_parent) { //if we caught something
+ this.indent_level = this.tags[tag + this.tags[tag + 'count']]; //set the indent_level accordingly
+ this.tags.parent = this.tags[temp_parent + 'parent']; //and set the current parent
+ }
+ delete this.tags[tag + this.tags[tag + 'count'] + 'parent']; //delete the closed tags parent reference...
+ delete this.tags[tag + this.tags[tag + 'count']]; //...and the tag itself
+ if (this.tags[tag + 'count'] == 1) {
+ delete this.tags[tag + 'count'];
+ }
+ else {
+ this.tags[tag + 'count']--;
+ }
+ }
+ }
+
+ this.get_tag = function () { //function to get a full tag and parse its type
+ var input_char = '',
+ content = [],
+ space = false,
+ tag_start, tag_end;
+
+ do {
+ if (this.pos >= this.input.length) {
+ return content.length?content.join(''):['', 'TK_EOF'];
+ }
+
+ input_char = this.input.charAt(this.pos);
+ this.pos++;
+ this.line_char_count++;
+
+ if (this.Utils.in_array(input_char, this.Utils.whitespace)) { //don't want to insert unnecessary space
+ space = true;
+ this.line_char_count--;
+ continue;
+ }
+
+ if (input_char === "'" || input_char === '"') {
+ if (!content[1] || content[1] !== '!') { //if we're in a comment strings don't get treated specially
+ input_char += this.get_unformatted(input_char);
+ space = true;
+ }
+ }
+
+ if (input_char === '=') { //no space before =
+ space = false;
+ }
+
+ if (content.length && content[content.length-1] !== '=' && input_char !== '>'
+ && space) { //no space after = or before >
+ if (this.line_char_count >= this.max_char) {
+ this.print_newline(false, content);
+ this.line_char_count = 0;
+ }
+ else {
+ content.push(' ');
+ this.line_char_count++;
+ }
+ space = false;
+ }
+ if (input_char === '<') {
+ tag_start = this.pos - 1;
+ }
+ content.push(input_char); //inserts character at-a-time (or string)
+ } while (input_char !== '>');
+
+ var tag_complete = content.join('');
+ var tag_index;
+ if (tag_complete.indexOf(' ') != -1) { //if there's whitespace, thats where the tag name ends
+ tag_index = tag_complete.indexOf(' ');
+ }
+ else { //otherwise go with the tag ending
+ tag_index = tag_complete.indexOf('>');
+ }
+ var tag_check = tag_complete.substring(1, tag_index).toLowerCase();
+ if (tag_complete.charAt(tag_complete.length-2) === '/' ||
+ this.Utils.in_array(tag_check, this.Utils.single_token)) { //if this tag name is a single tag type (either in the list or has a closing /)
+ this.tag_type = 'SINGLE';
+ }
+ else if (tag_check === 'script') { //for later script handling
+ this.record_tag(tag_check);
+ this.tag_type = 'SCRIPT';
+ }
+ else if (tag_check === 'style') { //for future style handling (for now it justs uses get_content)
+ this.record_tag(tag_check);
+ this.tag_type = 'STYLE';
+ }
+ else if (this.Utils.in_array(tag_check, unformatted)) { // do not reformat the "unformatted" tags
+ var comment = this.get_unformatted('', tag_complete); //...delegate to get_unformatted function
+ content.push(comment);
+ // Preserve collapsed whitespace either before or after this tag.
+ if (tag_start > 0 && this.Utils.in_array(this.input.charAt(tag_start - 1), this.Utils.whitespace)){
+ content.splice(0, 0, this.input.charAt(tag_start - 1));
+ }
+ tag_end = this.pos - 1;
+ if (this.Utils.in_array(this.input.charAt(tag_end + 1), this.Utils.whitespace)){
+ content.push(this.input.charAt(tag_end + 1));
+ }
+ this.tag_type = 'SINGLE';
+ }
+ else if (tag_check.charAt(0) === '!') { //peek for so...
+ var comment = this.get_unformatted('-->', tag_complete); //...delegate to get_unformatted
+ content.push(comment);
+ }
+ this.tag_type = 'START';
+ }
+ else if (tag_check.indexOf('[endif') != -1) {//peek for ', tag_complete);
+ content.push(comment);
+ this.tag_type = 'SINGLE';
+ }
+ }
+ else {
+ if (tag_check.charAt(0) === '/') { //this tag is a double tag so check for tag-ending
+ this.retrieve_tag(tag_check.substring(1)); //remove it and all ancestors
+ this.tag_type = 'END';
+ }
+ else { //otherwise it's a start-tag
+ this.record_tag(tag_check); //push it on the tag stack
+ this.tag_type = 'START';
+ }
+ if (this.Utils.in_array(tag_check, this.Utils.extra_liners)) { //check if this double needs an extra line
+ this.print_newline(true, this.output);
+ }
+ }
+ return content.join(''); //returns fully formatted tag
+ }
+
+ this.get_unformatted = function (delimiter, orig_tag) { //function to return unformatted content in its entirety
+
+ if (orig_tag && orig_tag.toLowerCase().indexOf(delimiter) != -1) {
+ return '';
+ }
+ var input_char = '';
+ var content = '';
+ var space = true;
+ do {
+
+ if (this.pos >= this.input.length) {
+ return content;
+ }
+
+ input_char = this.input.charAt(this.pos);
+ this.pos++
+
+ if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
+ if (!space) {
+ this.line_char_count--;
+ continue;
+ }
+ if (input_char === '\n' || input_char === '\r') {
+ content += '\n';
+ /* Don't change tab indention for unformatted blocks. If using code for html editing, this will greatly affect tags if they are specified in the 'unformatted array'
+ for (var i=0; i 0) {
+ this.indent_level--;
+ }
+ }
+ }
+ return this;
+ }
+
+ /*_____________________--------------------_____________________*/
+
+ multi_parser = new Parser(); //wrapping functions Parser
+ multi_parser.printer(html_source, indent_character, indent_size, max_char, brace_style); //initialize starting values
+
+ while (true) {
+ var t = multi_parser.get_token();
+ multi_parser.token_text = t[0];
+ multi_parser.token_type = t[1];
+
+ if (multi_parser.token_type === 'TK_EOF') {
+ break;
+ }
+
+ switch (multi_parser.token_type) {
+ case 'TK_TAG_START':
+ multi_parser.print_newline(false, multi_parser.output);
+ multi_parser.print_token(multi_parser.token_text);
+ multi_parser.indent();
+ multi_parser.current_mode = 'CONTENT';
+ break;
+ case 'TK_TAG_STYLE':
+ case 'TK_TAG_SCRIPT':
+ multi_parser.print_newline(false, multi_parser.output);
+ multi_parser.print_token(multi_parser.token_text);
+ multi_parser.current_mode = 'CONTENT';
+ break;
+ case 'TK_TAG_END':
+ //Print new line only if the tag has no content and has child
+ if (multi_parser.last_token === 'TK_CONTENT' && multi_parser.last_text === '') {
+ var tag_name = multi_parser.token_text.match(/\w+/)[0];
+ var tag_extracted_from_last_output = multi_parser.output[multi_parser.output.length -1].match(/<\s*(\w+)/);
+ if (tag_extracted_from_last_output === null || tag_extracted_from_last_output[1] !== tag_name)
+ multi_parser.print_newline(true, multi_parser.output);
+ }
+ multi_parser.print_token(multi_parser.token_text);
+ multi_parser.current_mode = 'CONTENT';
+ break;
+ case 'TK_TAG_SINGLE':
+ // Don't add a newline before elements that should remain unformatted.
+ var tag_check = multi_parser.token_text.match(/^\s*<([a-z]+)/i);
+ if (!tag_check || !multi_parser.Utils.in_array(tag_check[1], unformatted)){
+ multi_parser.print_newline(false, multi_parser.output);
+ }
+ multi_parser.print_token(multi_parser.token_text);
+ multi_parser.current_mode = 'CONTENT';
+ break;
+ case 'TK_CONTENT':
+ if (multi_parser.token_text !== '') {
+ multi_parser.print_token(multi_parser.token_text);
+ }
+ multi_parser.current_mode = 'TAG';
+ break;
+ case 'TK_STYLE':
+ case 'TK_SCRIPT':
+ if (multi_parser.token_text !== '') {
+ multi_parser.output.push('\n');
+ var text = multi_parser.token_text;
+ if (multi_parser.token_type == 'TK_SCRIPT') {
+ var _beautifier = typeof js_beautify == 'function' && js_beautify;
+ } else if (multi_parser.token_type == 'TK_STYLE') {
+ var _beautifier = typeof css_beautify == 'function' && css_beautify;
+ }
+
+ if (options.indent_scripts == "keep") {
+ var script_indent_level = 0;
+ } else if (options.indent_scripts == "separate") {
+ var script_indent_level = -multi_parser.indent_level;
+ } else {
+ var script_indent_level = 1;
+ }
+
+ var indentation = multi_parser.get_full_indent(script_indent_level);
+ if (_beautifier) {
+ // call the Beautifier if avaliable
+ text = _beautifier(text.replace(/^\s*/, indentation), options);
+ } else {
+ // simply indent the string otherwise
+ var white = text.match(/^\s*/)[0];
+ var _level = white.match(/[^\n\r]*$/)[0].split(multi_parser.indent_string).length - 1;
+ var reindent = multi_parser.get_full_indent(script_indent_level -_level);
+ text = text.replace(/^\s*/, indentation)
+ .replace(/\r\n|\r|\n/g, '\n' + reindent)
+ .replace(/\s*$/, '');
+ }
+ if (text) {
+ multi_parser.print_token(text);
+ multi_parser.print_newline(true, multi_parser.output);
+ }
+ }
+ multi_parser.current_mode = 'TAG';
+ break;
+ }
+ multi_parser.last_token = multi_parser.token_type;
+ multi_parser.last_text = multi_parser.token_text;
+ }
+ return multi_parser.output.join('');
+}