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

fixed merge conflicts

Browse source
This commit is contained in:
John McLear 2011-12-04 18:55:35 +00:00 • committed by Peter 'Pita' Martischka
parent 3401a7bc11
commit d20dcc7c57
4 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
static/js/pad2.js
View file

@ -22,6 +22,7 @@ var noColors = false;
var useMonospaceFontGlobal = false;
var globalUserName = false;
var hideQRCode = false;
var rtlIsTrue = false;
$(document).ready(function()
{
@ -88,6 +89,7 @@ function getParams()
var useMonospaceFont = params["useMonospaceFont"];
var IsnoColors = params["noColors"];
var hideQRCode = params["hideQRCode"];
var rtl = params["rtl"];
if(IsnoColors)
{
@ -135,6 +137,13 @@ function getParams()
{
$('#qrcode').hide();
}
if(rtl)
{
if(rtl == "true")
{
rtlIsTrue = true
}
}
}
function getUrlVars()
@ -293,6 +302,11 @@ function handshake()
{
pad.changeViewOption('noColors', true);
}
if (rtlIsTrue == true)
{
pad.changeViewOption('rtl', true);
}
// If the Monospacefont value is set to true then change it to monospace.
if (useMonospaceFontGlobal == true)