Export lists fix + code linting and readability update
parent
a4819b21f2
commit
b4ad7cf452
|
@ -1,3 +1,5 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright 2009 Google Inc.
|
* Copyright 2009 Google Inc.
|
||||||
*
|
*
|
||||||
|
@ -15,63 +17,97 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
var async = require("async");
|
var async = require('async');
|
||||||
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
var Changeset = require('ep_etherpad-lite/static/js/Changeset');
|
||||||
var padManager = require("../db/PadManager");
|
var padManager = require('../db/PadManager');
|
||||||
var ERR = require("async-stacktrace");
|
var eRR = require('async-stacktrace');
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Security = require('ep_etherpad-lite/static/js/security');
|
var Security = require('ep_etherpad-lite/static/js/security');
|
||||||
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
|
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
|
||||||
var eejs = require('ep_etherpad-lite/node/eejs');
|
var eejs = require('ep_etherpad-lite/node/eejs');
|
||||||
var _analyzeLine = require('./ExportHelper')._analyzeLine;
|
var _analyzeLine = require('./ExportHelper')._analyzeLine;
|
||||||
var _encodeWhitespace = require('./ExportHelper')._encodeWhitespace;
|
var _encodeWhitespace = require('./ExportHelper')._encodeWhitespace;
|
||||||
|
// copied from ACE
|
||||||
|
var _REGEX_WORDCHAR = /[\u0030-\u0039\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u1FFF\u3040-\u9FFF\uF900-\uFDFF\uFE70-\uFEFE\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDC]/;
|
||||||
|
var _REGEX_URLCHAR = new RegExp('(' + (/[-:@a-zA-Z0-9_.,~%+/\\?=&#;()$]/).source + '|' + _REGEX_WORDCHAR.source + ')');
|
||||||
|
var _REGEX_URL = new RegExp(/(?:(?:https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt):\/\/|mailto:)/.source + _REGEX_URLCHAR.source + '*(?![:.,;])' + _REGEX_URLCHAR.source, 'g');
|
||||||
|
|
||||||
function getPadHTML(pad, revNum, callback)
|
// returns null if no URLs, or [[startIndex1, url1], [startIndex2, url2], ...]
|
||||||
{
|
// copied from ACE
|
||||||
var atext = pad.atext;
|
function _processSpaces (s) {
|
||||||
var html;
|
var doesWrap = true;
|
||||||
async.waterfall([
|
if (s.indexOf('<') < 0 && !doesWrap) {
|
||||||
// fetch revision atext
|
// short-cut
|
||||||
function (callback)
|
return s.replace(/ /g, ' ');
|
||||||
{
|
}
|
||||||
if (revNum != undefined)
|
var parts = [];
|
||||||
{
|
s.replace(/<[^>]*>?| |[^ <]+/g, function (m) {
|
||||||
pad.getInternalRevisionAText(revNum, function (err, revisionAtext)
|
parts.push(m);
|
||||||
{
|
|
||||||
if(ERR(err, callback)) return;
|
|
||||||
atext = revisionAtext;
|
|
||||||
callback();
|
|
||||||
});
|
});
|
||||||
|
if (doesWrap) {
|
||||||
|
var endOfLine = true;
|
||||||
|
var beforeSpace = false;
|
||||||
|
// last space in a run is normal, others are nbsp,
|
||||||
|
// end of line is nbsp
|
||||||
|
for (var i = parts.length - 1; i >= 0; i--) {
|
||||||
|
var p = parts[i];
|
||||||
|
if (p === ' ') {
|
||||||
|
if (endOfLine || beforeSpace) parts[i] = ' ';
|
||||||
|
endOfLine = false;
|
||||||
|
beforeSpace = true;
|
||||||
|
} else if (p.charAt(0) !== '<') {
|
||||||
|
endOfLine = false;
|
||||||
|
beforeSpace = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// beginning of line is nbsp
|
||||||
|
for (i = 0; i < parts.length; i++) {
|
||||||
|
p = parts[i];
|
||||||
|
if (p === ' ') {
|
||||||
|
parts[i] = ' ';
|
||||||
|
break;
|
||||||
|
} else if (p.charAt(0) !== '<') {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for (i = 0; i < parts.length; i++) {
|
||||||
|
p = parts[i];
|
||||||
|
if (p === ' ') {
|
||||||
|
parts[i] = ' ';
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
callback(null);
|
|
||||||
}
|
}
|
||||||
},
|
|
||||||
|
|
||||||
// convert atext to html
|
|
||||||
|
|
||||||
|
|
||||||
function (callback)
|
|
||||||
{
|
|
||||||
html = getHTMLFromAtext(pad, atext);
|
|
||||||
callback(null);
|
|
||||||
}],
|
|
||||||
// run final callback
|
|
||||||
|
|
||||||
|
|
||||||
function (err)
|
|
||||||
{
|
|
||||||
if(ERR(err, callback)) return;
|
|
||||||
callback(null, html);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.getPadHTML = getPadHTML;
|
return parts.join('');
|
||||||
exports.getHTMLFromAtext = getHTMLFromAtext;
|
}
|
||||||
|
|
||||||
function getHTMLFromAtext(pad, atext, authorColors)
|
function _findURLs (text) {
|
||||||
{
|
_REGEX_URL.lastIndex = 0;
|
||||||
|
var urls = null;
|
||||||
|
var execResult;
|
||||||
|
while (execResult = _REGEX_URL.exec(text)) {
|
||||||
|
urls = urls || [];
|
||||||
|
var startIndex = execResult.index;
|
||||||
|
var url = execResult[0];
|
||||||
|
urls.push([startIndex, url]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return urls;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return docx from input html
|
||||||
|
*
|
||||||
|
* @param {text} [pad] text
|
||||||
|
* @param {text} [atext] text
|
||||||
|
* @param {text} [authorColors] text
|
||||||
|
*
|
||||||
|
* @returns {html} html
|
||||||
|
*
|
||||||
|
* @public
|
||||||
|
*/
|
||||||
|
function getHTMLFromAtext (pad, atext, authorColors) {
|
||||||
var apool = pad.apool();
|
var apool = pad.apool();
|
||||||
var textLines = atext.text.slice(0, -1).split('\n');
|
var textLines = atext.text.slice(0, -1).split('\n');
|
||||||
var attribLines = Changeset.splitAttributionLines(atext.attribs, atext.text);
|
var attribLines = Changeset.splitAttributionLines(atext.attribs, atext.text);
|
||||||
|
@ -80,16 +116,22 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
var props = ['heading1', 'heading2', 'bold', 'italic', 'underline', 'strikethrough'];
|
var props = ['heading1', 'heading2', 'bold', 'italic', 'underline', 'strikethrough'];
|
||||||
|
|
||||||
// prepare tags stored as ['tag', true] to be exported
|
// prepare tags stored as ['tag', true] to be exported
|
||||||
hooks.aCallAll("exportHtmlAdditionalTags", pad, function(err, newProps){
|
hooks.aCallAll('exportHtmlAdditionalTags', pad, function (err, newProps) {
|
||||||
newProps.forEach(function (propName, i){
|
if (err) {
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
newProps.forEach(function (propName) {
|
||||||
tags.push(propName);
|
tags.push(propName);
|
||||||
props.push(propName);
|
props.push(propName);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
// prepare tags stored as ['tag', 'value'] to be exported. This will generate HTML
|
// prepare tags stored as ['tag', 'value'] to be exported. This will generate HTML
|
||||||
// with tags like <span data-tag="value">
|
// with tags like <span data-tag='value'>
|
||||||
hooks.aCallAll("exportHtmlAdditionalTagsWithData", pad, function(err, newProps){
|
hooks.aCallAll('exportHtmlAdditionalTagsWithData', pad, function (err, newProps) {
|
||||||
newProps.forEach(function (propName, i){
|
if (err) {
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
newProps.forEach(function (propName) {
|
||||||
tags.push('span data-' + propName[0] + '="' + propName[1] + '"');
|
tags.push('span data-' + propName[0] + '="' + propName[1] + '"');
|
||||||
props.push(propName);
|
props.push(propName);
|
||||||
});
|
});
|
||||||
|
@ -100,47 +142,49 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
// *3:2 -> the attribute *3 means strong
|
// *3:2 -> the attribute *3 means strong
|
||||||
// *2:5 -> the attribute *2 means s(trikethrough)
|
// *2:5 -> the attribute *2 means s(trikethrough)
|
||||||
var anumMap = {};
|
var anumMap = {};
|
||||||
var css = "";
|
var css = '';
|
||||||
|
|
||||||
var stripDotFromAuthorID = function (id) {
|
var stripDotFromAuthorID = function (id) {
|
||||||
return id.replace(/\./g, '_');
|
return id.replace(/\./g, '_');
|
||||||
};
|
};
|
||||||
|
|
||||||
if (authorColors) {
|
if (authorColors) {
|
||||||
css+="<style>\n";
|
css += '<style>\n';
|
||||||
|
|
||||||
for (var a in apool.numToAttrib) {
|
for (var a in apool.numToAttrib) {
|
||||||
|
if (apool.numToAttrib.hasOwnProperty.call(a)) {
|
||||||
var attr = apool.numToAttrib[a];
|
var attr = apool.numToAttrib[a];
|
||||||
|
var newLength = null;
|
||||||
|
var propName = null;
|
||||||
//skip non author attributes
|
//skip non author attributes
|
||||||
if(attr[0] === "author" && attr[1] !== ""){
|
if (attr[0] === 'author' && attr[1] !== '') {
|
||||||
//add to props array
|
//add to props array
|
||||||
var propName = "author" + stripDotFromAuthorID(attr[1]);
|
propName = 'author' + stripDotFromAuthorID(attr[1]);
|
||||||
var newLength = props.push(propName);
|
newLength = props.push(propName);
|
||||||
anumMap[a] = newLength - 1;
|
anumMap[a] = newLength - 1;
|
||||||
|
|
||||||
css+="." + propName + " {background-color: " + authorColors[attr[1]]+ "}\n";
|
css += '.' + propName + ' {background-color: ' + authorColors[attr[1]] + '}\n';
|
||||||
} else if(attr[0] === "removed") {
|
} else if (attr[0] === 'removed') {
|
||||||
var propName = "removed";
|
propName = 'removed';
|
||||||
|
|
||||||
var newLength = props.push(propName);
|
newLength = props.push(propName);
|
||||||
anumMap[a] = newLength - 1;
|
anumMap[a] = newLength - 1;
|
||||||
|
|
||||||
css+=".removed {text-decoration: line-through; " +
|
css += '.removed {text-decoration: line-through; ' +
|
||||||
"-ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)'; "+
|
'-ms-filter:\'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\'; ' +
|
||||||
"filter: alpha(opacity=80); "+
|
'filter: alpha(opacity=80); ' +
|
||||||
"opacity: 0.8; "+
|
'opacity: 0.8; ' +
|
||||||
"}\n";
|
'}\n';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
css+="</style>";
|
css += '</style>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// iterates over all props(h1,h2,strong,...), checks if it is used in
|
// iterates over all props(h1,h2,strong,...), checks if it is used in
|
||||||
// this pad, and if yes puts its attrib id->props value into anumMap
|
// this pad, and if yes puts its attrib id->props value into anumMap
|
||||||
props.forEach(function (propName, i)
|
props.forEach(function (propName, i) {
|
||||||
{
|
|
||||||
var attrib = [propName, true];
|
var attrib = [propName, true];
|
||||||
if (_.isArray(propName)) {
|
if (_.isArray(propName)) {
|
||||||
// propName can be in the form of ['color', 'red'],
|
// propName can be in the form of ['color', 'red'],
|
||||||
|
@ -148,14 +192,12 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
attrib = propName;
|
attrib = propName;
|
||||||
}
|
}
|
||||||
var propTrueNum = apool.putAttrib(attrib, true);
|
var propTrueNum = apool.putAttrib(attrib, true);
|
||||||
if (propTrueNum >= 0)
|
if (propTrueNum >= 0) {
|
||||||
{
|
|
||||||
anumMap[propTrueNum] = i;
|
anumMap[propTrueNum] = i;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function getLineHTML(text, attribs)
|
function getLineHTML (text, attribs) {
|
||||||
{
|
|
||||||
// Use order of tags (b/i/u) as order of nesting, for simplicity
|
// Use order of tags (b/i/u) as order of nesting, for simplicity
|
||||||
// and decent nesting. For example,
|
// and decent nesting. For example,
|
||||||
// <b>Just bold<b> <b><i>Bold and italics</i></b> <i>Just italics</i>
|
// <b>Just bold<b> <b><i>Bold and italics</i></b> <i>Just italics</i>
|
||||||
|
@ -177,12 +219,12 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(property.substr(0,6) === "author"){
|
if (property.substr(0, 6) === 'author') {
|
||||||
return stripDotFromAuthorID(property);
|
return stripDotFromAuthorID(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(property === "removed"){
|
if (property === 'removed') {
|
||||||
return "removed";
|
return 'removed';
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -192,11 +234,11 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
// data attributes
|
// data attributes
|
||||||
function isSpanWithData (i) {
|
function isSpanWithData (i) {
|
||||||
var property = props[i];
|
var property = props[i];
|
||||||
|
|
||||||
return _.isArray(property);
|
return _.isArray(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
function emitOpenTag(i)
|
function emitOpenTag (i) {
|
||||||
{
|
|
||||||
openTags.unshift(i);
|
openTags.unshift(i);
|
||||||
var spanClass = getSpanClassFor(i);
|
var spanClass = getSpanClassFor(i);
|
||||||
|
|
||||||
|
@ -212,8 +254,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
}
|
}
|
||||||
|
|
||||||
// this closes an open tag and removes its reference from openTags
|
// this closes an open tag and removes its reference from openTags
|
||||||
function emitCloseTag(i)
|
function emitCloseTag (i) {
|
||||||
{
|
|
||||||
openTags.shift();
|
openTags.shift();
|
||||||
var spanClass = getSpanClassFor(i);
|
var spanClass = getSpanClassFor(i);
|
||||||
var spanWithData = isSpanWithData(i);
|
var spanWithData = isSpanWithData(i);
|
||||||
|
@ -231,10 +272,8 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
|
|
||||||
var idx = 0;
|
var idx = 0;
|
||||||
|
|
||||||
function processNextChars(numChars)
|
function processNextChars (numChars) {
|
||||||
{
|
if (numChars <= 0) {
|
||||||
if (numChars <= 0)
|
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -243,52 +282,42 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
|
|
||||||
// this iterates over every op string and decides which tags to open or to close
|
// this iterates over every op string and decides which tags to open or to close
|
||||||
// based on the attribs used
|
// based on the attribs used
|
||||||
while (iter.hasNext())
|
while (iter.hasNext()) {
|
||||||
{
|
|
||||||
var o = iter.next();
|
var o = iter.next();
|
||||||
var usedAttribs = [];
|
var usedAttribs = [];
|
||||||
|
|
||||||
// mark all attribs as used
|
// mark all attribs as used
|
||||||
Changeset.eachAttribNumber(o.attribs, function (a)
|
Changeset.eachAttribNumber(o.attribs, function (a) {
|
||||||
{
|
if (a in anumMap) {
|
||||||
if (a in anumMap)
|
|
||||||
{
|
|
||||||
usedAttribs.push(anumMap[a]); // i = 0 => bold, etc.
|
usedAttribs.push(anumMap[a]); // i = 0 => bold, etc.
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
var outermostTag = -1;
|
var outermostTag = -1;
|
||||||
// find the outer most open tag that is no longer used
|
// find the outer most open tag that is no longer used
|
||||||
for (var i = openTags.length - 1; i >= 0; i--)
|
for (var i = openTags.length - 1; i >= 0; i--) {
|
||||||
{
|
if (usedAttribs.indexOf(openTags[i]) === -1) {
|
||||||
if (usedAttribs.indexOf(openTags[i]) === -1)
|
|
||||||
{
|
|
||||||
outermostTag = i;
|
outermostTag = i;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// close all tags upto the outer most
|
// close all tags upto the outer most
|
||||||
if (outermostTag != -1)
|
if (outermostTag !== -1) {
|
||||||
{
|
while (outermostTag >= 0) {
|
||||||
while ( outermostTag >= 0 )
|
|
||||||
{
|
|
||||||
emitCloseTag(openTags[0]);
|
emitCloseTag(openTags[0]);
|
||||||
outermostTag--;
|
outermostTag--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// open all tags that are used but not open
|
// open all tags that are used but not open
|
||||||
for (i=0; i < usedAttribs.length; i++)
|
for (i = 0; i < usedAttribs.length; i++) {
|
||||||
{
|
if (openTags.indexOf(usedAttribs[i]) === -1) {
|
||||||
if (openTags.indexOf(usedAttribs[i]) === -1)
|
emitOpenTag(usedAttribs[i]);
|
||||||
{
|
|
||||||
emitOpenTag(usedAttribs[i])
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var chars = o.chars;
|
var chars = o.chars;
|
||||||
if (o.lines)
|
if (o.lines) {
|
||||||
{
|
|
||||||
chars--; // exclude newline at end of line, if present
|
chars--; // exclude newline at end of line, if present
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -296,21 +325,19 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
|
|
||||||
//removes the characters with the code 12. Don't know where they come
|
//removes the characters with the code 12. Don't know where they come
|
||||||
//from but they break the abiword parser and are completly useless
|
//from but they break the abiword parser and are completly useless
|
||||||
s = s.replace(String.fromCharCode(12), "");
|
s = s.replace(String.fromCharCode(12), '');
|
||||||
|
|
||||||
assem.append(_encodeWhitespace(Security.escapeHTML(s)));
|
assem.append(_encodeWhitespace(Security.escapeHTML(s)));
|
||||||
} // end iteration over spans in line
|
} // end iteration over spans in line
|
||||||
|
|
||||||
// close all the tags that are open after the last op
|
// close all the tags that are open after the last op
|
||||||
while (openTags.length > 0)
|
while (openTags.length > 0) {
|
||||||
{
|
emitCloseTag(openTags[0]);
|
||||||
emitCloseTag(openTags[0])
|
|
||||||
}
|
}
|
||||||
} // end processNextChars
|
} // end processNextChars
|
||||||
if (urls)
|
|
||||||
{
|
if (urls) {
|
||||||
urls.forEach(function (urlData)
|
urls.forEach(function (urlData) {
|
||||||
{
|
|
||||||
var startIndex = urlData[0];
|
var startIndex = urlData[0];
|
||||||
var url = urlData[1];
|
var url = urlData[1];
|
||||||
var urlLength = url.length;
|
var urlLength = url.length;
|
||||||
|
@ -320,10 +347,12 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
assem.append('</a>');
|
assem.append('</a>');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
processNextChars(text.length - idx);
|
processNextChars(text.length - idx);
|
||||||
|
|
||||||
return _processSpaces(assem.toString());
|
return _processSpaces(assem.toString());
|
||||||
} // end getLineHTML
|
} // end getLineHTML
|
||||||
|
|
||||||
var pieces = [css];
|
var pieces = [css];
|
||||||
|
|
||||||
// Need to deal with constraints imposed on HTML lists; can
|
// Need to deal with constraints imposed on HTML lists; can
|
||||||
|
@ -334,41 +363,36 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
// want to deal gracefully with blank lines.
|
// want to deal gracefully with blank lines.
|
||||||
// => keeps track of the parents level of indentation
|
// => keeps track of the parents level of indentation
|
||||||
var lists = []; // e.g. [[1,'bullet'], [3,'bullet'], ...]
|
var lists = []; // e.g. [[1,'bullet'], [3,'bullet'], ...]
|
||||||
var listLevels = []
|
var listLevels = [];
|
||||||
for (var i = 0; i < textLines.length; i++)
|
for (var i = 0; i < textLines.length; i++) {
|
||||||
{
|
var context;
|
||||||
var line = _analyzeLine(textLines[i], attribLines[i], apool);
|
var line = _analyzeLine(textLines[i], attribLines[i], apool);
|
||||||
var lineContent = getLineHTML(line.text, line.aline);
|
var lineContent = getLineHTML(line.text, line.aline);
|
||||||
listLevels.push(line.listLevel)
|
listLevels.push(line.listLevel);
|
||||||
|
|
||||||
if (line.listLevel)//If we are inside a list
|
if (line.listLevel) { //If we are inside a list
|
||||||
{
|
|
||||||
// do list stuff
|
// do list stuff
|
||||||
var whichList = -1; // index into lists or -1
|
var whichList = -1; // index into lists or -1
|
||||||
if (line.listLevel)
|
if (line.listLevel) {
|
||||||
{
|
|
||||||
whichList = lists.length;
|
whichList = lists.length;
|
||||||
for (var j = lists.length - 1; j >= 0; j--)
|
for (var j = lists.length - 1; j >= 0; j--) {
|
||||||
{
|
if (line.listLevel <= lists[j][0]) {
|
||||||
if (line.listLevel <= lists[j][0])
|
|
||||||
{
|
|
||||||
whichList = j;
|
whichList = j;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var context = {
|
context = {
|
||||||
line: line,
|
line: line,
|
||||||
lineContent: lineContent,
|
lineContent: lineContent,
|
||||||
apool: apool,
|
apool: apool,
|
||||||
attribLine: attribLines[i],
|
attribLine: attribLines[i],
|
||||||
text: textLines[i],
|
text: textLines[i],
|
||||||
padId: pad.id
|
padId: pad.id
|
||||||
}
|
};
|
||||||
hooks.callAll("getLineHTMLForExport", context);
|
hooks.callAll('getLineHTMLForExport', context);
|
||||||
if (whichList >= lists.length)//means we are on a deeper level of indentation than the previous line
|
if (whichList >= lists.length) {
|
||||||
{
|
|
||||||
if (lists.length > 0) {
|
if (lists.length > 0) {
|
||||||
pieces.push('</li>')
|
pieces.push('</li>');
|
||||||
}
|
}
|
||||||
lists.push([line.listLevel, line.listTypeName]);
|
lists.push([line.listLevel, line.listTypeName]);
|
||||||
|
|
||||||
|
@ -376,103 +400,64 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
// if there is no previous list we need to open x tags, where x is the wanted level
|
// if there is no previous list we need to open x tags, where x is the wanted level
|
||||||
var toOpen = lists.length > 1 ? line.listLevel - lists[lists.length - 2][0] - 1 : line.listLevel - 1
|
var toOpen = lists.length > 1 ? line.listLevel - lists[lists.length - 2][0] - 1 : line.listLevel - 1
|
||||||
|
|
||||||
if(line.listTypeName == "number")
|
if (line.listTypeName === 'number') {
|
||||||
{
|
|
||||||
if (toOpen > 0) {
|
if (toOpen > 0) {
|
||||||
pieces.push(new Array(toOpen + 1).join('<ol>'))
|
pieces.push(new Array(toOpen + 1).join('<ol></li><li>'));
|
||||||
}
|
}
|
||||||
pieces.push('<ol class="' + line.listTypeName + '"><li>', context.lineContent || '<br>');
|
pieces.push('<ol class="' + line.listTypeName + '"><li>', context.lineContent || '<br>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
if (toOpen > 0) {
|
if (toOpen > 0) {
|
||||||
pieces.push(new Array(toOpen + 1).join('<ul>'))
|
pieces.push(new Array(toOpen + 1).join('<li><ul><li>'));
|
||||||
}
|
}
|
||||||
pieces.push('<ul class="' + line.listTypeName + '"><li>', context.lineContent || '<br>');
|
pieces.push('<ul class="' + line.listTypeName + '"><li>', context.lineContent || '<br>');
|
||||||
}
|
}
|
||||||
}
|
} else { //means we are getting closer to the lowest level of indentation or are at the same level
|
||||||
//the following code *seems* dead after my patch.
|
|
||||||
//I keep it just in case I'm wrong...
|
|
||||||
/*else if (whichList == -1)//means we are not inside a list
|
|
||||||
{
|
|
||||||
if (line.text)
|
|
||||||
{
|
|
||||||
console.log('trace 1');
|
|
||||||
// non-blank line, end all lists
|
|
||||||
if(line.listTypeName == "number")
|
|
||||||
{
|
|
||||||
pieces.push(new Array(lists.length + 1).join('</li></ol>'));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
pieces.push(new Array(lists.length + 1).join('</li></ul>'));
|
|
||||||
}
|
|
||||||
lists.length = 0;
|
|
||||||
pieces.push(lineContent, '<br>');
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
console.log('trace 2');
|
|
||||||
pieces.push('<br><br>');
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
else//means we are getting closer to the lowest level of indentation or are at the same level
|
|
||||||
{
|
|
||||||
var toClose = lists.length > 0 ? listLevels[listLevels.length - 2] - line.listLevel : 0
|
var toClose = lists.length > 0 ? listLevels[listLevels.length - 2] - line.listLevel : 0
|
||||||
if (toClose > 0) {
|
if (toClose > 0) {
|
||||||
pieces.push('</li>')
|
pieces.push('</li>');
|
||||||
if(lists[lists.length - 1][1] == "number")
|
if (lists[lists.length - 1][1] === 'number') {
|
||||||
{
|
pieces.push(new Array(toClose + 1).join('</ol></li>'));
|
||||||
pieces.push(new Array(toClose+1).join('</ol>'))
|
pieces.push('<li>', context.lineContent || '<br>');
|
||||||
|
} else {
|
||||||
|
pieces.push(new Array(toClose + 1).join('</ul></li>'));
|
||||||
pieces.push('<li>', context.lineContent || '<br>');
|
pieces.push('<li>', context.lineContent || '<br>');
|
||||||
}
|
}
|
||||||
else
|
lists = lists.slice(0, whichList + 1);
|
||||||
{
|
|
||||||
pieces.push(new Array(toClose+1).join('</ul>'))
|
|
||||||
pieces.push('<li>', context.lineContent || '<br>');
|
|
||||||
}
|
|
||||||
lists = lists.slice(0,whichList+1)
|
|
||||||
} else {
|
} else {
|
||||||
pieces.push('</li><li>', context.lineContent || '<br>');
|
pieces.push('</li><li>', context.lineContent || '<br>');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else { //outside any list, need to close line.listLevel of lists
|
||||||
else//outside any list, need to close line.listLevel of lists
|
|
||||||
{
|
|
||||||
if (lists.length > 0) {
|
if (lists.length > 0) {
|
||||||
if(lists[lists.length - 1][1] == "number"){
|
if (lists[lists.length - 1][1] === 'number') {
|
||||||
pieces.push('</li></ol>');
|
pieces.push('</li></ol>');
|
||||||
pieces.push(new Array(listLevels[listLevels.length - 2]).join('</ol>'))
|
pieces.push(new Array(listLevels[listLevels.length - 2]).join('</ol></li>'));
|
||||||
} else {
|
} else {
|
||||||
pieces.push('</li></ul>');
|
pieces.push('</li></ul>');
|
||||||
pieces.push(new Array(listLevels[listLevels.length - 2]).join('</ul>'))
|
pieces.push(new Array(listLevels[listLevels.length - 2]).join('</ul></li>'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
lists = []
|
lists = [];
|
||||||
|
|
||||||
var context = {
|
context = {
|
||||||
line: line,
|
line: line,
|
||||||
lineContent: lineContent,
|
lineContent: lineContent,
|
||||||
apool: apool,
|
apool: apool,
|
||||||
attribLine: attribLines[i],
|
attribLine: attribLines[i],
|
||||||
text: textLines[i],
|
text: textLines[i],
|
||||||
padId: pad.id
|
padId: pad.id
|
||||||
}
|
};
|
||||||
|
|
||||||
hooks.callAll("getLineHTMLForExport", context);
|
|
||||||
|
|
||||||
|
hooks.callAll('getLineHTMLForExport', context);
|
||||||
pieces.push(context.lineContent, '<br>');
|
pieces.push(context.lineContent, '<br>');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var k = lists.length - 1; k >= 0; k--)
|
for (var k = lists.length - 1; k >= 0; k--) {
|
||||||
{
|
if (lists[k][1] === 'number') {
|
||||||
if(lists[k][1] == "number")
|
|
||||||
{
|
|
||||||
pieces.push('</li></ol>');
|
pieces.push('</li></ol>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
pieces.push('</li></ul>');
|
pieces.push('</li></ul>');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -480,23 +465,60 @@ function getHTMLFromAtext(pad, atext, authorColors)
|
||||||
return pieces.join('');
|
return pieces.join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.getPadHTMLDocument = function (padId, revNum, callback)
|
function getPadHTML (pad, revNum, callback) {
|
||||||
{
|
var atext = pad.atext;
|
||||||
padManager.getPad(padId, function (err, pad)
|
var html;
|
||||||
{
|
async.waterfall(
|
||||||
if(ERR(err, callback)) return;
|
[
|
||||||
|
// fetch revision atext
|
||||||
|
function (callback) {
|
||||||
|
if (revNum !== undefined) {
|
||||||
|
pad.getInternalRevisionAText(revNum, function (err, revisionAtext) {
|
||||||
|
if (eRR(err, callback)) return;
|
||||||
|
atext = revisionAtext;
|
||||||
|
|
||||||
var stylesForExportCSS = "";
|
return callback();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return callback(null);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// convert atext to html
|
||||||
|
|
||||||
|
|
||||||
|
function (callback) {
|
||||||
|
html = getHTMLFromAtext(pad, atext);
|
||||||
|
callback(null);
|
||||||
|
}
|
||||||
|
],
|
||||||
|
// run final callback
|
||||||
|
|
||||||
|
|
||||||
|
function (err) {
|
||||||
|
if (eRR(err, callback)) return;
|
||||||
|
callback(null, html);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.getPadHTML = getPadHTML;
|
||||||
|
exports.getHTMLFromAtext = getHTMLFromAtext;
|
||||||
|
exports.getPadHTMLDocument = function (padId, revNum, callback) {
|
||||||
|
padManager.getPad(padId, function (err, pad) {
|
||||||
|
if (eRR(err, callback)) return;
|
||||||
|
|
||||||
|
var stylesForExportCSS = '';
|
||||||
// Include some Styles into the Head for Export
|
// Include some Styles into the Head for Export
|
||||||
hooks.aCallAll("stylesForExport", padId, function(err, stylesForExport){
|
hooks.aCallAll('stylesForExport', padId, function (err, stylesForExport) {
|
||||||
|
if (eRR(err, callback)) return;
|
||||||
stylesForExport.forEach(function (css) {
|
stylesForExport.forEach(function (css) {
|
||||||
stylesForExportCSS += css;
|
stylesForExportCSS += css;
|
||||||
});
|
});
|
||||||
|
|
||||||
getPadHTML(pad, revNum, function (err, html)
|
getPadHTML(pad, revNum, function (err, html) {
|
||||||
{
|
if (eRR(err, callback)) return;
|
||||||
if(ERR(err, callback)) return;
|
var exportedDoc = eejs.require('ep_etherpad-lite/templates/export_html.html', {
|
||||||
var exportedDoc = eejs.require("ep_etherpad-lite/templates/export_html.html", {
|
|
||||||
body: html,
|
body: html,
|
||||||
padId: Security.escapeHTML(padId),
|
padId: Security.escapeHTML(padId),
|
||||||
extraCSS: stylesForExportCSS
|
extraCSS: stylesForExportCSS
|
||||||
|
@ -506,81 +528,3 @@ exports.getPadHTMLDocument = function (padId, revNum, callback)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// copied from ACE
|
|
||||||
var _REGEX_WORDCHAR = /[\u0030-\u0039\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u1FFF\u3040-\u9FFF\uF900-\uFDFF\uFE70-\uFEFE\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDC]/;
|
|
||||||
var _REGEX_SPACE = /\s/;
|
|
||||||
var _REGEX_URLCHAR = new RegExp('(' + /[-:@a-zA-Z0-9_.,~%+\/\\?=&#;()$]/.source + '|' + _REGEX_WORDCHAR.source + ')');
|
|
||||||
var _REGEX_URL = new RegExp(/(?:(?:https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt):\/\/|mailto:)/.source + _REGEX_URLCHAR.source + '*(?![:.,;])' + _REGEX_URLCHAR.source, 'g');
|
|
||||||
|
|
||||||
// returns null if no URLs, or [[startIndex1, url1], [startIndex2, url2], ...]
|
|
||||||
|
|
||||||
|
|
||||||
function _findURLs(text)
|
|
||||||
{
|
|
||||||
_REGEX_URL.lastIndex = 0;
|
|
||||||
var urls = null;
|
|
||||||
var execResult;
|
|
||||||
while ((execResult = _REGEX_URL.exec(text)))
|
|
||||||
{
|
|
||||||
urls = (urls || []);
|
|
||||||
var startIndex = execResult.index;
|
|
||||||
var url = execResult[0];
|
|
||||||
urls.push([startIndex, url]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return urls;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// copied from ACE
|
|
||||||
function _processSpaces(s){
|
|
||||||
var doesWrap = true;
|
|
||||||
if (s.indexOf("<") < 0 && !doesWrap){
|
|
||||||
// short-cut
|
|
||||||
return s.replace(/ /g, ' ');
|
|
||||||
}
|
|
||||||
var parts = [];
|
|
||||||
s.replace(/<[^>]*>?| |[^ <]+/g, function (m){
|
|
||||||
parts.push(m);
|
|
||||||
});
|
|
||||||
if (doesWrap){
|
|
||||||
var endOfLine = true;
|
|
||||||
var beforeSpace = false;
|
|
||||||
// last space in a run is normal, others are nbsp,
|
|
||||||
// end of line is nbsp
|
|
||||||
for (var i = parts.length - 1; i >= 0; i--){
|
|
||||||
var p = parts[i];
|
|
||||||
if (p == " "){
|
|
||||||
if (endOfLine || beforeSpace) parts[i] = ' ';
|
|
||||||
endOfLine = false;
|
|
||||||
beforeSpace = true;
|
|
||||||
}
|
|
||||||
else if (p.charAt(0) != "<"){
|
|
||||||
endOfLine = false;
|
|
||||||
beforeSpace = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// beginning of line is nbsp
|
|
||||||
for (i = 0; i < parts.length; i++){
|
|
||||||
p = parts[i];
|
|
||||||
if (p == " "){
|
|
||||||
parts[i] = ' ';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else if (p.charAt(0) != "<"){
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for (i = 0; i < parts.length; i++){
|
|
||||||
p = parts[i];
|
|
||||||
if (p == " "){
|
|
||||||
parts[i] = ' ';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return parts.join('');
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue