fixed merge conflicts

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

View file

@ -1162,7 +1162,6 @@ label[for=readonlyinput] {
margin-left:10px;
}
@media screen and (max-width: 960px) {
.modaldialog {
position: relative;
@ -1251,3 +1250,6 @@ label[for=readonlyinput] {
display:none;
}
}
.rtl{
direction:RTL;
}

View file

@ -1127,6 +1127,10 @@ function OUTER(gscope)
{
setTextSize(value);
}
else if (k == 'rtlistrue')
{
setClassPresence(root, "rtl", !! value);
}
}
editorInfo.ace_setBaseText = function(txt)

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)

View file

@ -89,6 +89,7 @@ var padeditor = (function()
self.ace.setProperty("showsauthorcolors", noColors);
self.ace.setProperty("rtlIsTrue", rtlIsTrue);
},
initViewZoom: function()
{