public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/jose/etherpad-lite/

pull/85/merge
Peter 'Pita' Martischka 2011-08-13 19:54:16 +01:00
parent fd4bdeccb3 bba9cd515b
commit 0384f677b9
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
static/js/pad2.js
View File

@ -18,6 +18,7 @@
var socket;
var LineNumbersDisabled = false;
var globalUserName = false;
$(document).ready(function()
{
@ -97,10 +98,15 @@ function getParams()
{
if(showLineNumbers == "false")
{
// pad.changeViewOption('showLineNumbers', false);
LineNumbersDisabled = true;
}
}
if(userName)
{
// If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
globalUserName = userName;
}
}
function getUrlVars()
@ -170,10 +176,20 @@ function handshake()
pad.init();
initalized = true;
// If the LineNumbersDisabled value is set to true then we need to hide the Line Numbers
if (LineNumbersDisabled == true)
{
pad.changeViewOption('showLineNumbers', false); $
pad.changeViewOption('showLineNumbers', false);
}
// if the globalUserName value is set we need to tell the server and the client about the new authorname
if (globalUserName !== false)
{
pad.notifyChangeName(globalUserName); // Notifies the server
$('#myusernameedit').attr({"value":globalUserName}); // Updates the current users UI
}
}
//This handles every Message after the clientVars
else