From e6454af5ed6b67976c32adac74ecdd4279f2fe07 Mon Sep 17 00:00:00 2001 From: mluto Date: Fri, 8 Feb 2013 22:00:17 +0100 Subject: [PATCH] Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP --- src/node/handler/PadMessageHandler.js | 1 - src/static/js/broadcast_slider.js | 17 +---------------- src/static/js/pad.js | 23 ----------------------- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 80c79ada8..1840cab35 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -964,7 +964,6 @@ function handleClientReady(client, message) "globalPadId": message.padId, "userId": author, "cookiePrefsToSet": { - "fullWidth": false, "hideSidebar": false }, "abiwordAvailable": settings.abiwordAvailable(), diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index 5acaedaff..a915eacde 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -460,26 +460,11 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) 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) { $("#rightbars").css('display', 'none'); $('#padmain').css('width', 'auto'); - if (clientVars.fullWidth) $("#padmain").css('right', '7px'); - else $("#padmain").css('width', '860px'); + $("#padmain").css('width', '860px'); $("#revision").css('position', "absolute"); $("#revision").css('right', "20px"); $("#revision").css('top', "20px"); diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 81ae1f85d..b70029898 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -464,7 +464,6 @@ var pad = { // order of inits is important here: padcookie.init(clientVars.cookiePrefsToSet, this); - $("#widthprefcheck").click(pad.toggleWidthPref); // $("#sidebarcheck").click(pad.togglewSidebar); pad.myUserInfo = { @@ -829,13 +828,6 @@ var pad = { $('form#reconnectform input.missedChanges').val(JSON.stringify(pad.collabClient.getMissedChanges())); $('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() { @@ -845,21 +837,6 @@ var pad = { 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: handleImportExportFrameCall: function(callName, varargs) {