libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,9 +247,16 @@ exports.doImport = function(req, res, padId)
padManager.getPad(padId, function(err, _pad){ padManager.getPad(padId, function(err, _pad){
var pad = _pad; var pad = _pad;
padManager.unloadPad(padId); padManager.unloadPad(padId);
// 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(){ padMessageHandler.updatePadClients(pad, function(){
callback(); callback();
}); });
}else{
callback();
}
}); });
}, },
@ -293,7 +300,7 @@ exports.doImport = function(req, res, padId)
if(navigator.userAgent.indexOf('MSIE') === -1){ \ if(navigator.userAgent.indexOf('MSIE') === -1){ \
document.domain = document.domain; \ document.domain = document.domain; \
} \ } \
var impexp = window.parent.padimpexp.handleFrameCall('" + status + "'); \ var impexp = window.parent.padimpexp.handleFrameCall('" + directDatabaseAccess +"', '" + status + "'); \
}) \ }) \
</script>" </script>"
, 200); , 200);

4
src/static/js/pad_impexp.js
View file

@ -237,13 +237,13 @@ var padimpexp = (function()
$('#importform').submit(fileInputSubmit); $('#importform').submit(fileInputSubmit);
$('.disabledexport').click(cantExport); $('.disabledexport').click(cantExport);
}, },
handleFrameCall: function(status) handleFrameCall: function(directDatabaseAccess, status)
{ {
if (status !== "ok") if (status !== "ok")
{ {
importFailed(status); importFailed(status);
} }
if(directDatabaseAccess) pad.switchToPad(clientVars.padId);
importDone(); importDone();
}, },
disable: function() disable: function()