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

session key is now ignored and also padOptions are available in settings

Browse source
This commit is contained in:
John McLear 2015-04-11 21:22:00 +01:00
parent 43687f6e8b
commit 8ed12c7776
5 changed files with 48 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/static/js/pad.js
View file

@ -126,6 +126,18 @@ var getParameters = [
function getParams()
{
// Tries server enforced options first..
for(var i = 0; i < getParameters.length; i++)
{
var setting = getParameters[i];
var value = clientVars.padOptions[setting.name];
if(value.toString() === setting.checkVal)
{
setting.callback(value);
}
}
// Then URL applied stuff
var params = getUrlVars()
for(var i = 0; i < getParameters.length; i++)
@ -475,7 +487,6 @@ var pad = {
{
// start the custom js
if (typeof customStart == "function") customStart();
getParams();
handshake();
// To use etherpad you have to allow cookies.
@ -495,6 +506,8 @@ var pad = {
//initialize the chat
chat.init(this);
getParams();
padcookie.init(); // initialize the cookies
pad.initTime = +(new Date());
pad.padOptions = clientVars.initialOptions;