Skip to content
Snippets Groups Projects
Commit a07d1722 authored by John McLear's avatar John McLear
Browse files

no errors on chrome client

parent 5ba3cab4
Branches etherpad-export-and-import
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/node/handler/ImportHandler.js
+ 11
− 4
View file @ a07d1722
...@@ -247,9 +247,16 @@ exports.doImport = function(req, res, padId) ...@@ -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);
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(); callback();
}); }
}); });
}, },
...@@ -282,7 +289,7 @@ exports.doImport = function(req, res, padId) ...@@ -282,7 +289,7 @@ exports.doImport = function(req, res, padId)
} }
ERR(err); ERR(err);
//close the connection //close the connection
res.send( res.send(
"<head> \ "<head> \
...@@ -293,7 +300,7 @@ exports.doImport = function(req, res, padId) ...@@ -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);
......
src/static/js/pad_impexp.js
+ 2
− 2
View file @ a07d1722
...@@ -237,13 +237,13 @@ var padimpexp = (function() ...@@ -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()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment