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

Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP

Browse source
This commit is contained in:
mluto 2013-02-08 22:00:17 +01:00
parent 0d5b98a338
commit e6454af5ed
3 changed files with 1 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/node/handler/PadMessageHandler.js
View file

@ -964,7 +964,6 @@ function handleClientReady(client, message)
"globalPadId": message.padId, "globalPadId": message.padId,
"userId": author, "userId": author,
"cookiePrefsToSet": { "cookiePrefsToSet": {
"fullWidth": false,
"hideSidebar": false "hideSidebar": false
}, },
"abiwordAvailable": settings.abiwordAvailable(), "abiwordAvailable": settings.abiwordAvailable(),

17
src/static/js/broadcast_slider.js
View file

@ -460,26 +460,11 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
if (clientVars) if (clientVars)
{ {
if (clientVars.fullWidth)
{
$("#padpage").css('width', '100%');
$("#revision").css('position', "absolute")
$("#revision").css('right', "20px")
$("#revision").css('top', "20px")
$("#padmain").css('left', '0px');
$("#padmain").css('right', '197px');
$("#padmain").css('width', 'auto');
$("#rightbars").css('right', '7px');
$("#rightbars").css('margin-right', '0px');
$("#timeslider").css('width', 'auto');
}
if (clientVars.disableRightBar) if (clientVars.disableRightBar)
{ {
$("#rightbars").css('display', 'none'); $("#rightbars").css('display', 'none');
$('#padmain').css('width', 'auto'); $('#padmain').css('width', 'auto');
if (clientVars.fullWidth) $("#padmain").css('right', '7px'); $("#padmain").css('width', '860px');
else $("#padmain").css('width', '860px');
$("#revision").css('position', "absolute"); $("#revision").css('position', "absolute");
$("#revision").css('right', "20px"); $("#revision").css('right', "20px");
$("#revision").css('top', "20px"); $("#revision").css('top', "20px");

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

@ -464,7 +464,6 @@ var pad = {
// order of inits is important here: // order of inits is important here:
padcookie.init(clientVars.cookiePrefsToSet, this); padcookie.init(clientVars.cookiePrefsToSet, this);
$("#widthprefcheck").click(pad.toggleWidthPref);
// $("#sidebarcheck").click(pad.togglewSidebar); // $("#sidebarcheck").click(pad.togglewSidebar);
pad.myUserInfo = { pad.myUserInfo = {
@ -829,13 +828,6 @@ var pad = {
$('form#reconnectform input.missedChanges').val(JSON.stringify(pad.collabClient.getMissedChanges())); $('form#reconnectform input.missedChanges').val(JSON.stringify(pad.collabClient.getMissedChanges()));
$('form#reconnectform').submit(); $('form#reconnectform').submit();
}, },
toggleWidthPref: function()
{
var newValue = !padcookie.getPref('fullWidth');
padcookie.setPref('fullWidth', newValue);
$("#widthprefcheck").toggleClass('widthprefchecked', !! newValue).toggleClass('widthprefunchecked', !newValue);
pad.handleWidthChange();
},
/* /*
toggleSidebar: function() toggleSidebar: function()
{ {
@ -845,21 +837,6 @@ var pad = {
pad.determineSidebarVisibility(); pad.determineSidebarVisibility();
}, },
*/ */
handleWidthChange: function()
{
var isFullWidth = padcookie.getPref('fullWidth');
if (isFullWidth)
{
$("body").addClass('fullwidth').removeClass('limwidth').removeClass('squish1width').removeClass('squish2width');
}
else
{
$("body").addClass('limwidth').removeClass('fullwidth');
var pageWidth = $(window).width();
$("body").toggleClass('squish1width', (pageWidth < 912 && pageWidth > 812)).toggleClass('squish2width', (pageWidth <= 812));
}
},
// this is called from code put into a frame from the server: // this is called from code put into a frame from the server:
handleImportExportFrameCall: function(callName, varargs) handleImportExportFrameCall: function(callName, varargs)
{ {