diff --git a/node/utils/ExportHtml.js b/node/utils/ExportHtml.js
index e74e404ca..4cd4bbee7 100644
--- a/node/utils/ExportHtml.js
+++ b/node/utils/ExportHtml.js
@@ -13,27 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var async = require("async");
var Changeset = require("./Changeset");
var padManager = require("../db/PadManager");
-
-function getPadPlainText(pad, revNum) {
- var atext = ((revNum !== undefined) ? pad.getInternalRevisionAText(revNum) :
- pad.atext());
- var textLines = atext.text.slice(0,-1).split('\n');
+function getPadPlainText(pad, revNum)
+{
+ var atext = ((revNum !== undefined) ? pad.getInternalRevisionAText(revNum) : pad.atext());
+ var textLines = atext.text.slice(0, -1).split('\n');
var attribLines = Changeset.splitAttributionLines(atext.attribs, atext.text);
var apool = pad.pool();
var pieces = [];
- for(var i=0;i= 0) {
+
+ props.forEach(function (propName, i)
+ {
+ var propTrueNum = apool.putAttrib([propName, true], true);
+ if (propTrueNum >= 0)
+ {
anumMap[propTrueNum] = i;
}
});
- function getLineHTML(text, attribs) {
+ function getLineHTML(text, attribs)
+ {
var propVals = [false, false, false];
var ENTER = 1;
var STAY = 2;
@@ -97,16 +116,18 @@ function getHTMLFromAtext(pad, atext) {
// Just bold Bold and italics Just italics
// becomes
// Just bold Bold and italics Just italics
-
var taker = Changeset.stringIterator(text);
var assem = Changeset.stringAssembler();
- function emitOpenTag(i) {
+ function emitOpenTag(i)
+ {
assem.append('<');
assem.append(tags[i]);
assem.append('>');
}
- function emitCloseTag(i) {
+
+ function emitCloseTag(i)
+ {
assem.append('');
assem.append(tags[i]);
assem.append('>');
@@ -115,101 +136,123 @@ function getHTMLFromAtext(pad, atext) {
var urls = _findURLs(text);
var idx = 0;
- function processNextChars(numChars) {
- if (numChars <= 0) {
+
+ function processNextChars(numChars)
+ {
+ if (numChars <= 0)
+ {
return;
}
- var iter = Changeset.opIterator(Changeset.subattribution(attribs,
- idx, idx+numChars));
+ var iter = Changeset.opIterator(Changeset.subattribution(attribs, idx, idx + numChars));
idx += numChars;
- while (iter.hasNext()) {
+ while (iter.hasNext())
+ {
var o = iter.next();
var propChanged = false;
- Changeset.eachAttribNumber(o.attribs, function(a) {
- if (a in anumMap) {
+ Changeset.eachAttribNumber(o.attribs, function (a)
+ {
+ if (a in anumMap)
+ {
var i = anumMap[a]; // i = 0 => bold, etc.
- if (! propVals[i]) {
+ if (!propVals[i])
+ {
propVals[i] = ENTER;
propChanged = true;
}
- else {
+ else
+ {
propVals[i] = STAY;
}
}
});
- for(var i=0;i=0; i--) {
- if (propVals[i] === LEAVE) {
+ for (var i = propVals.length - 1; i >= 0; i--)
+ {
+ if (propVals[i] === LEAVE)
+ {
emitCloseTag(i);
propVals[i] = false;
}
- else if (propVals[i] === STAY) {
+ else if (propVals[i] === STAY)
+ {
emitCloseTag(i);
}
}
- for(var i=0; i=0; i--) {
- if (propVals[i]) {
+ for (var i = propVals.length - 1; i >= 0; i--)
+ {
+ if (propVals[i])
+ {
emitCloseTag(i);
propVals[i] = false;
}
}
} // end processNextChars
-
- if (urls) {
- urls.forEach(function(urlData) {
+ if (urls)
+ {
+ urls.forEach(function (urlData)
+ {
var startIndex = urlData[0];
var url = urlData[1];
var urlLength = url.length;
processNextChars(startIndex - idx);
- assem.append('');
+ assem.append('');
processNextChars(urlLength);
assem.append('');
});
@@ -218,7 +261,6 @@ function getHTMLFromAtext(pad, atext) {
return _processSpaces(assem.toString());
} // end getLineHTML
-
var pieces = [];
// Need to deal with constraints imposed on HTML lists; can
@@ -228,79 +270,98 @@ function getHTMLFromAtext(pad, atext) {
// so we want to do something reasonable there. We also
// want to deal gracefully with blank lines.
var lists = []; // e.g. [[1,'bullet'], [3,'bullet'], ...]
- for(var i=0;i 0) {
+ if (line.listLevel || lists.length > 0)
+ {
// do list stuff
var whichList = -1; // index into lists or -1
- if (line.listLevel) {
+ if (line.listLevel)
+ {
whichList = lists.length;
- for(var j=lists.length-1;j>=0;j--) {
- if (line.listLevel <= lists[j][0]) {
+ for (var j = lists.length - 1; j >= 0; j--)
+ {
+ if (line.listLevel <= lists[j][0])
+ {
whichList = j;
}
}
}
- if (whichList >= lists.length) {
+ if (whichList >= lists.length)
+ {
lists.push([line.listLevel, line.listTypeName]);
pieces.push('- ', lineContent || '
');
}
- else if (whichList == -1) {
- if (line.text) {
+ else if (whichList == -1)
+ {
+ if (line.text)
+ {
// non-blank line, end all lists
- pieces.push(new Array(lists.length+1).join('
'));
+ pieces.push(new Array(lists.length + 1).join(''));
lists.length = 0;
pieces.push(lineContent, '
');
}
- else {
+ else
+ {
pieces.push('
');
}
}
- else {
- while (whichList < lists.length-1) {
+ else
+ {
+ while (whichList < lists.length - 1)
+ {
pieces.push('');
lists.length--;
}
pieces.push('', lineContent || '
');
}
}
- else {
+ else
+ {
pieces.push(lineContent, '
');
}
}
- pieces.push(new Array(lists.length+1).join(''));
+ pieces.push(new Array(lists.length + 1).join(''));
return pieces.join('');
}
-function _analyzeLine(text, aline, apool) {
+function _analyzeLine(text, aline, apool)
+{
var line = {};
// identify list
var lineMarker = 0;
line.listLevel = 0;
- if (aline) {
+ if (aline)
+ {
var opIter = Changeset.opIterator(aline);
- if (opIter.hasNext()) {
+ if (opIter.hasNext())
+ {
var listType = Changeset.opAttributeValue(opIter.next(), 'list', apool);
- if (listType) {
+ if (listType)
+ {
lineMarker = 1;
listType = /([a-z]+)([12345678])/.exec(listType);
- if (listType) {
+ if (listType)
+ {
line.listTypeName = listType[1];
line.listLevel = Number(listType[2]);
}
}
}
}
- if (lineMarker) {
+ if (lineMarker)
+ {
line.text = text.substring(1);
line.aline = Changeset.subattribution(aline, 1);
}
- else {
+ else
+ {
line.text = text;
line.aline = aline;
}
@@ -308,37 +369,32 @@ function _analyzeLine(text, aline, apool) {
return line;
}
-exports.getPadHTMLDocument = function(padId, revNum, noDocType, callback) {
- padManager.getPad(padId, function(err, pad)
+exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback)
+{
+ padManager.getPad(padId, function (err, pad)
{
- if(err)
+ if (err)
{
callback(err);
return;
}
-
- var head = (noDocType?'':'\n')+
- '\n'+
- (noDocType?'':
- '\n'+
- '\n'+
- '\n' +
- '\n')+
- '';
+
+ var head = (noDocType ? '' : '\n') + '\n' + (noDocType ? '' : '\n' + '\n' + '\n' + '\n') + '';
var foot = '\n\n';
- getPadHTML(pad, revNum, function (err, html) {
+ getPadHTML(pad, revNum, function (err, html)
+ {
callback(err, head + html + foot);
});
});
}
-function _escapeHTML(s) {
+function _escapeHTML(s)
+{
var re = /[&<>]/g;
- if (! re.MAP) {
+ if (!re.MAP)
+ {
// persisted across function calls!
re.MAP = {
'&': '&',
@@ -346,53 +402,72 @@ function _escapeHTML(s) {
'>': '>',
};
}
- return s.replace(re, function(c) { return re.MAP[c]; });
+ return s.replace(re, function (c)
+ {
+ return re.MAP[c];
+ });
}
// copied from ACE
-function _processSpaces(s) {
+
+
+function _processSpaces(s)
+{
var doesWrap = true;
- if (s.indexOf("<") < 0 && ! doesWrap) {
+ if (s.indexOf("<") < 0 && !doesWrap)
+ {
// short-cut
return s.replace(/ /g, ' ');
}
var parts = [];
- s.replace(/<[^>]*>?| |[^ <]+/g, function(m) { parts.push(m); });
- if (doesWrap) {
+ 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--) {
+ for (var i = parts.length - 1; i >= 0; i--)
+ {
var p = parts[i];
- if (p == " ") {
- if (endOfLine || beforeSpace)
- parts[i] = ' ';
- endOfLine = false;
- beforeSpace = true;
+ if (p == " ")
+ {
+ if (endOfLine || beforeSpace) parts[i] = ' ';
+ endOfLine = false;
+ beforeSpace = true;
}
- else if (p.charAt(0) != "<") {
- endOfLine = false;
- beforeSpace = false;
+ else if (p.charAt(0) != "<")
+ {
+ endOfLine = false;
+ beforeSpace = false;
}
}
// beginning of line is nbsp
- for(var i=0;i