mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-09 16:35:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

DOMLines use objects.

Browse source
This commit is contained in:
Chad Weider 2012-05-16 16:31:27 -07:00
parent 453b6473a0
commit b1063556a0
1 changed files with 70 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

130
src/static/js/domline.js
View file

@ -52,49 +52,51 @@ domline.addToLineClass = function(lineClass, cls)
return lineClass; return lineClass;
} }
// if "document" is falsy we don't create a DOM node, just function DOMLine(nonEmpty, doesWrap, browser, document) {
// an object with innerHTML and className this.node = null;
domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) this.lineMarker = 0;
{ this.nonEmpty = nonEmpty;
var result = { this.doesWrap = doesWrap;
node: null, this.browser = browser;
appendSpan: noop, this.document = document;
prepareForAdd: noop,
notifyAdded: noop,
clearSpans: noop,
finishUpdate: noop,
lineMarker: 0
};
var browser = (optBrowser || {});
var document = optDocument;
// if "document" is falsy we don't create a DOM node, just
// an object with innerHTML and className
if (document) if (document)
{ {
result.node = document.createElement("div"); this.node = document.createElement("div");
} }
else else
{ {
result.node = { this.node = {
innerHTML: '', innerHTML: '',
className: '' className: ''
}; };
} }
var html = []; this.html = [];
var preHtml = '', this.preHtml = '';
postHtml = ''; this.postHtml = '';
var curHTML = null; this.curHTML = null;
function processSpaces(s) this.perTextNodeProcess = (doesWrap ? _.identity : this.processSpaces);
this.perHtmlLineProcess = (doesWrap ? this.processSpaces : _.identity);
this.lineClass = 'ace-line';
// Apparently overridden at the instance level sometimes...
this.notifyAdded = function () {this._notifyAdded()};
this.finishUpdate = function () {this._finishUpdate()};
}
DOMLine.prototype = {};
(function () {
this.processSpaces = function(s)
{ {
return domline.processSpaces(s, doesWrap); return domline.processSpaces(s, this.doesWrap);
} }
this._notifyAdded = function () {};
var perTextNodeProcess = (doesWrap ? _.identity : processSpaces); this.appendSpan = function(txt, cls)
var perHtmlLineProcess = (doesWrap ? processSpaces : _.identity);
var lineClass = 'ace-line';
result.appendSpan = function(txt, cls)
{ {
var processedMarker = false; var processedMarker = false;
// Handle lineAttributeMarker, if present // Handle lineAttributeMarker, if present
@ -110,13 +112,13 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
{ {
if(listType.indexOf("number") < 0) if(listType.indexOf("number") < 0)
{ {
preHtml = '<ul class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>'; this.preHtml = '<ul class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
postHtml = '</li></ul>'; this.postHtml = '</li></ul>';
} }
else else
{ {
preHtml = '<ol '+start+' class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>'; this.preHtml = '<ol '+start+' class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
postHtml = '</li></ol>'; this.postHtml = '</li></ol>';
} }
} }
processedMarker = true; processedMarker = true;
@ -127,13 +129,13 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
cls: cls cls: cls
}), function(modifier) }), function(modifier)
{ {
preHtml += modifier.preHtml; this.preHtml += modifier.preHtml;
postHtml += modifier.postHtml; this.postHtml += modifier.postHtml;
processedMarker |= modifier.processedMarker; processedMarker |= modifier.processedMarker;
}); });
if( processedMarker ){ if( processedMarker ){
result.lineMarker += txt.length; this.lineMarker += txt.length;
return; // don't append any text return; // don't append any text
} }
@ -174,7 +176,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
if ((!txt) && cls) if ((!txt) && cls)
{ {
lineClass = domline.addToLineClass(lineClass, cls); this.lineClass = domline.addToLineClass(this.lineClass, cls);
} }
else if (txt) else if (txt)
{ {
@ -194,54 +196,62 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
simpleTags.reverse(); simpleTags.reverse();
extraCloseTags = '</' + simpleTags.join('></') + '>' + extraCloseTags; extraCloseTags = '</' + simpleTags.join('></') + '>' + extraCloseTags;
} }
html.push('<span class="', Security.escapeHTMLAttribute(cls || ''), '">', extraOpenTags, perTextNodeProcess(Security.escapeHTML(txt)), extraCloseTags, '</span>'); this.html.push('<span class="', Security.escapeHTMLAttribute(cls || ''), '">', extraOpenTags, this.perTextNodeProcess(Security.escapeHTML(txt)), extraCloseTags, '</span>');
} }
}; };
result.clearSpans = function() this.clearSpans = function()
{ {
html = []; this.html = [];
lineClass = ''; // non-null to cause update this.lineClass = ''; // non-null to cause update
result.lineMarker = 0; this.lineMarker = 0;
}; };
function writeHTML() this._writeHTML = function ()
{ {
var newHTML = perHtmlLineProcess(html.join('')); var newHTML = this.perHtmlLineProcess(this.html.join(''));
if (!newHTML) if (!newHTML)
{ {
if ((!document) || (!optBrowser)) if ((!this.document) || (!this.browser))
{ {
newHTML += '&nbsp;'; newHTML += '&nbsp;';
} }
else if (!browser.msie) else if (!(this.browser || {}).msie)
{ {
newHTML += '<br/>'; newHTML += '<br/>';
} }
} }
if (nonEmpty) if (this.nonEmpty)
{ {
newHTML = (preHtml || '') + newHTML + (postHtml || ''); newHTML = (this.preHtml || '') + newHTML + (this.postHtml || '');
} }
html = preHtml = postHtml = ''; // free memory this.html = this.preHtml = this.postHtml = ''; // free memory
if (newHTML !== curHTML) if (newHTML !== this.curHTML)
{ {
curHTML = newHTML; this.curHTML = newHTML;
result.node.innerHTML = curHTML; this.node.innerHTML = this.curHTML;
} }
if (lineClass !== null) result.node.className = lineClass; if (this.lineClass !== null) this.node.className = this.lineClass;
hooks.callAll("acePostWriteDomLineHTML", { hooks.callAll("acePostWriteDomLineHTML", {
node: result.node node: this.node
}); });
} }
result.prepareForAdd = writeHTML; this.prepareForAdd = function () {
result.finishUpdate = writeHTML; return this._writeHTML();
result.getInnerHTML = function() };
this._finishUpdate = function () {
return this._writeHTML();
};
this.getInnerHTML = function()
{ {
return curHTML || ''; return this.curHTML || '';
}; };
return result; }).call(DOMLine.prototype);
domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
{
return new DOMLine(nonEmpty, doesWrap, optBrowser, optDocument);
}; };
domline.processSpaces = function(s, doesWrap) domline.processSpaces = function(s, doesWrap)