mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-24 00:00:55 +01:00
9497ee734f
This change is only cosmetic. Its aim is do make it easier to understand the
async changes that are going to be merged later on. It was extracted from the
original work from Ray Bellis.
To verify that nothing has changed, you can run the following command on each
file touched by this commit:
npm install uglify-es
diff --unified <(uglify-js --beautify bracketize <BEFORE.js>) <(uglify-js --beautify bracketize <AFTER.js>)
This is a complete script that does the same automatically (works from a
mercurial clone):
```bash
#!/usr/bin/env bash
set -eu
REVISION=<THIS_REVISION>
PARENT_REV=$(hg identify --rev "${REVISION}" --template '{p1rev}')
FILE_LIST=$(hg status --no-status --change ${REVISION})
UGLIFYJS="node_modules/uglify-es/bin/uglifyjs"
for FILE_NAME in ${FILE_LIST[@]}; do
echo "Checking ${FILE_NAME}"
diff --unified \
<("${UGLIFYJS}" --beautify bracketize <(hg cat --rev "${PARENT_REV}" "${FILE_NAME}")) \
<("${UGLIFYJS}" --beautify bracketize <(hg cat --rev "${REVISION}" "${FILE_NAME}"))
done
```
97 lines
3.1 KiB
JavaScript
97 lines
3.1 KiB
JavaScript
/**
|
|
* Copyright Yaco Sistemas S.L. 2011.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS-IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
var log4js = require('log4js');
|
|
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
|
var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");
|
|
var cheerio = require("cheerio");
|
|
|
|
function setPadHTML(pad, html, callback)
|
|
{
|
|
var apiLogger = log4js.getLogger("ImportHtml");
|
|
|
|
var $ = cheerio.load(html);
|
|
|
|
// Appends a line break, used by Etherpad to ensure a caret is available
|
|
// below the last line of an import
|
|
$('body').append("<p></p>");
|
|
|
|
var doc = $('html')[0];
|
|
apiLogger.debug('html:');
|
|
apiLogger.debug(html);
|
|
|
|
// Convert a dom tree into a list of lines and attribute liens
|
|
// using the content collector object
|
|
var cc = contentcollector.makeContentCollector(true, null, pad.pool);
|
|
try {
|
|
// we use a try here because if the HTML is bad it will blow up
|
|
cc.collectContent(doc);
|
|
} catch(e) {
|
|
apiLogger.warn("HTML was not properly formed", e);
|
|
|
|
// don't process the HTML because it was bad
|
|
return callback(e);
|
|
}
|
|
|
|
var result = cc.finish();
|
|
|
|
apiLogger.debug('Lines:');
|
|
|
|
var i;
|
|
for (i = 0; i < result.lines.length; i += 1) {
|
|
apiLogger.debug('Line ' + (i + 1) + ' text: ' + result.lines[i]);
|
|
apiLogger.debug('Line ' + (i + 1) + ' attributes: ' + result.lineAttribs[i]);
|
|
}
|
|
|
|
// Get the new plain text and its attributes
|
|
var newText = result.lines.join('\n');
|
|
apiLogger.debug('newText:');
|
|
apiLogger.debug(newText);
|
|
var newAttribs = result.lineAttribs.join('|1+1') + '|1+1';
|
|
|
|
function eachAttribRun(attribs, func /*(startInNewText, endInNewText, attribs)*/ ) {
|
|
var attribsIter = Changeset.opIterator(attribs);
|
|
var textIndex = 0;
|
|
var newTextStart = 0;
|
|
var newTextEnd = newText.length;
|
|
while (attribsIter.hasNext()) {
|
|
var op = attribsIter.next();
|
|
var nextIndex = textIndex + op.chars;
|
|
if (!(nextIndex <= newTextStart || textIndex >= newTextEnd)) {
|
|
func(Math.max(newTextStart, textIndex), Math.min(newTextEnd, nextIndex), op.attribs);
|
|
}
|
|
textIndex = nextIndex;
|
|
}
|
|
}
|
|
|
|
// create a new changeset with a helper builder object
|
|
var builder = Changeset.builder(1);
|
|
|
|
// assemble each line into the builder
|
|
eachAttribRun(newAttribs, function(start, end, attribs) {
|
|
builder.insert(newText.substring(start, end), attribs);
|
|
});
|
|
|
|
// the changeset is ready!
|
|
var theChangeset = builder.toString();
|
|
|
|
apiLogger.debug('The changeset: ' + theChangeset);
|
|
pad.setText("\n");
|
|
pad.appendRevision(theChangeset);
|
|
callback(null);
|
|
}
|
|
|
|
exports.setPadHTML = setPadHTML;
|