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

no errors on chrome client

Browse source
This commit is contained in:
John McLear 2014-12-30 12:12:24 +01:00
parent 5ba3cab445
commit a07d1722fc
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/node/handler/ImportHandler.js
View file

@ -247,9 +247,16 @@ exports.doImport = function(req, res, padId)
padManager.getPad(padId, function(err, _pad){
var pad = _pad;
padManager.unloadPad(padId);
padMessageHandler.updatePadClients(pad, function(){
// direct Database Access means a pad user should perform a switchToPad
// and not attempt to recieve updated pad data..
if(!directDatabaseAccess){
padMessageHandler.updatePadClients(pad, function(){
callback();
});
}else{
callback();
});
}
});
},
@ -282,7 +289,7 @@ exports.doImport = function(req, res, padId)
}
ERR(err);
//close the connection
res.send(
"<head> \
@ -293,7 +300,7 @@ exports.doImport = function(req, res, padId)
if(navigator.userAgent.indexOf('MSIE') === -1){ \
document.domain = document.domain; \
} \
var impexp = window.parent.padimpexp.handleFrameCall('" + status + "'); \
var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \
}) \
</script>"
, 200);