no errors on chrome client
parent
5ba3cab445
commit
a07d1722fc
|
@ -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);
|
||||
|
|
|
@ -237,13 +237,13 @@ var padimpexp = (function()
|
|||
$('#importform').submit(fileInputSubmit);
|
||||
$('.disabledexport').click(cantExport);
|
||||
},
|
||||
handleFrameCall: function(status)
|
||||
handleFrameCall: function(directDatabaseAccess, status)
|
||||
{
|
||||
if (status !== "ok")
|
||||
{
|
||||
importFailed(status);
|
||||
}
|
||||
|
||||
if(directDatabaseAccess) pad.switchToPad(clientVars.padId);
|
||||
importDone();
|
||||
},
|
||||
disable: function()
|
||||
|
|
Loading…
Reference in New Issue