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

Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

Browse source 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
This commit is contained in:
Egil Moeller 2012-05-29 21:26:12 +02:00
commit 15a7d24450
32 changed files with 375 additions and 1962 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/handler/APIHandler.js
View file

@ -29,12 +29,12 @@ var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
var apikey = null;
try
{
apikey = fs.readFileSync("../APIKEY.txt","utf8");
apikey = fs.readFileSync("./APIKEY.txt","utf8");
}
catch(e)
{
apikey = randomString(32);
fs.writeFileSync("../APIKEY.txt",apikey,"utf8");
fs.writeFileSync("./APIKEY.txt",apikey,"utf8");
}
//a list of all functions

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

@ -196,6 +196,6 @@ exports.doImport = function(req, res, padId)
ERR(err);
//close the connection
res.send("<script>document.domain = document.domain; var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "'); </script>", 200);
res.send("<script type='text/javascript' src='/static/js/jquery.js'></script><script> if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200);
});
}