dont make local variables global
webzwo0i
parent
1932d240e5
commit
5d15f655f0
|
|
@ -263,7 +263,7 @@ exports.getText = function(padID, rev, callback)
|
|||
{
|
||||
if(ERR(err, callback)) return;
|
||||
|
||||
data = {text: atext.text};
|
||||
var data = {text: atext.text};
|
||||
|
||||
callback(null, data);
|
||||
})
|
||||
|
|
@ -368,7 +368,7 @@ exports.getHTML = function(padID, rev, callback)
|
|||
if(ERR(err, callback)) return;
|
||||
html = "<!DOCTYPE HTML><html><body>" +html; // adds HTML head
|
||||
html += "</body></html>";
|
||||
data = {html: html};
|
||||
var data = {html: html};
|
||||
callback(null, data);
|
||||
});
|
||||
}
|
||||
|
|
@ -380,7 +380,7 @@ exports.getHTML = function(padID, rev, callback)
|
|||
if(ERR(err, callback)) return;
|
||||
html = "<!DOCTYPE HTML><html><body>" +html; // adds HTML head
|
||||
html += "</body></html>";
|
||||
data = {html: html};
|
||||
var data = {html: html};
|
||||
callback(null, data);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ Pad.prototype.getRevisionDate = function getRevisionDate(revNum, callback) {
|
|||
Pad.prototype.getAllAuthors = function getAllAuthors() {
|
||||
var authors = [];
|
||||
|
||||
for(key in this.pool.numToAttrib)
|
||||
for(var key in this.pool.numToAttrib)
|
||||
{
|
||||
if(this.pool.numToAttrib[key][0] == "author" && this.pool.numToAttrib[key][1] != "")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ exports.begin_define_block = function (name) {
|
|||
}
|
||||
|
||||
exports.end_define_block = function () {
|
||||
content = exports.end_capture();
|
||||
var content = exports.end_capture();
|
||||
return content;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ exports.restartServer = function () {
|
|||
console.log( "SSL -- server key file: " + settings.ssl.key );
|
||||
console.log( "SSL -- Certificate Authority's certificate file: " + settings.ssl.cert );
|
||||
|
||||
options = {
|
||||
var options = {
|
||||
key: fs.readFileSync( settings.ssl.key ),
|
||||
cert: fs.readFileSync( settings.ssl.cert )
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5038,7 +5038,7 @@ function Ace2Inner(){
|
|||
//3-renumber every list item of the same level from the beginning, level 1
|
||||
//IMPORTANT: never skip a level because there imbrication may be arbitrary
|
||||
var builder = Changeset.builder(rep.lines.totalWidth());
|
||||
loc = [0,0];
|
||||
var loc = [0,0];
|
||||
function applyNumberList(line, level)
|
||||
{
|
||||
//init
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ function loadBroadcastRevisionsJS()
|
|||
});
|
||||
}
|
||||
|
||||
revisionInfo = {};
|
||||
var revisionInfo = {};
|
||||
revisionInfo.addChangeset = function(fromIndex, toIndex, changeset, backChangeset, timeDelta)
|
||||
{
|
||||
var startRevision = revisionInfo[fromIndex] || revisionInfo.createNew(fromIndex);
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
|
|||
// We need to replace all author attribs with thisSession.author, in case they copy/pasted or otherwise inserted other peoples changes
|
||||
if(apool.numToAttrib){
|
||||
for (var attr in apool.numToAttrib){
|
||||
if (apool.numToAttrib[attr][0] == 'author' && apool.numToAttrib[attr][1] == authorId) authorAttr = Number(attr).toString(36)
|
||||
if (apool.numToAttrib[attr][0] == 'author' && apool.numToAttrib[attr][1] == authorId) var authorAttr = Number(attr).toString(36)
|
||||
}
|
||||
|
||||
// Replace all added 'author' attribs with the value of the current user
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
|
|||
|
||||
// apply msgQueue changeset.
|
||||
if (msgQueue.length != 0) {
|
||||
while (msg = msgQueue.shift()) {
|
||||
while (var msg = msgQueue.shift()) {
|
||||
var newRev = msg.newRev;
|
||||
rev=newRev;
|
||||
if (msg.type == "ACCEPT_COMMIT")
|
||||
|
|
@ -274,7 +274,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
|
|||
|
||||
// When inInternationalComposition, msg pushed msgQueue.
|
||||
if (msgQueue.length > 0 || editor.getInInternationalComposition()) {
|
||||
if (msgQueue.length > 0) oldRev = msgQueue[msgQueue.length - 1].newRev;
|
||||
if (msgQueue.length > 0) var oldRev = msgQueue[msgQueue.length - 1].newRev;
|
||||
else oldRev = rev;
|
||||
|
||||
if (newRev != (oldRev + 1))
|
||||
|
|
|
|||
|
|
@ -663,7 +663,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
|
|||
{
|
||||
//var semiloc = oldString.lastIndexOf(';', lineLimit-1);
|
||||
//var lengthToTake = (semiloc >= 0 ? (semiloc+1) : lineLimit);
|
||||
lengthToTake = lineLimit;
|
||||
var lengthToTake = lineLimit;
|
||||
newStrings.push(oldString.substring(0, lengthToTake));
|
||||
oldString = oldString.substring(lengthToTake);
|
||||
newAttribStrings.push(Changeset.subattribution(oldAttribString, 0, lengthToTake));
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ exports.syncMapFirst = function (lst, fn) {
|
|||
exports.mapFirst = function (lst, fn, cb) {
|
||||
var i = 0;
|
||||
|
||||
next = function () {
|
||||
var next = function () {
|
||||
if (i >= lst.length) return cb(undefined);
|
||||
fn(lst[i++], function (err, result) {
|
||||
if (err) return cb(err);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ function init() {
|
|||
var resource = exports.baseURL.substring(1) + 'socket.io';
|
||||
|
||||
//build up the socket io connection
|
||||
socket = io.connect(url, {resource: resource});
|
||||
var socket = io.connect(url, {resource: resource});
|
||||
|
||||
//send the ready message once we're connected
|
||||
socket.on('connect', function()
|
||||
|
|
|
|||
Loading…
Reference in New Issue