From f2cd9e3adc3968b14ff0f3e9321abd65cbc52ecf Mon Sep 17 00:00:00 2001 From: mluto Date: Fri, 8 Feb 2013 22:06:28 +0100 Subject: [PATCH] Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this. --- src/node/handler/PadMessageHandler.js | 3 --- src/static/js/broadcast_slider.js | 10 --------- src/static/js/pad.js | 31 --------------------------- 3 files changed, 44 deletions(-) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 1840cab35..19ebfe92e 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -963,9 +963,6 @@ function handleClientReady(client, message) "serverTimestamp": new Date().getTime(), "globalPadId": message.padId, "userId": author, - "cookiePrefsToSet": { - "hideSidebar": false - }, "abiwordAvailable": settings.abiwordAvailable(), "plugins": { "plugins": plugins.plugins, diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index a915eacde..b8dbd9ffd 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -460,16 +460,6 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) if (clientVars) { - if (clientVars.disableRightBar) - { - $("#rightbars").css('display', 'none'); - $('#padmain').css('width', 'auto'); - $("#padmain").css('width', '860px'); - $("#revision").css('position', "absolute"); - $("#revision").css('right', "20px"); - $("#revision").css('top', "20px"); - } - $("#timeslider").show(); var startPos = clientVars.collab_client_vars.rev; diff --git a/src/static/js/pad.js b/src/static/js/pad.js index b70029898..6e8b2ae01 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -462,10 +462,6 @@ var pad = { } // order of inits is important here: - padcookie.init(clientVars.cookiePrefsToSet, this); - - // $("#sidebarcheck").click(pad.togglewSidebar); - pad.myUserInfo = { userId: clientVars.userId, name: clientVars.userName, @@ -745,28 +741,10 @@ var pad = { }, 1000); } - // pad.determineSidebarVisibility(isConnected && !isInitialConnect); pad.determineChatVisibility(isConnected && !isInitialConnect); pad.determineAuthorshipColorsVisibility(); }, -/* determineSidebarVisibility: function(asNowConnectedFeedback) - { - if (pad.isFullyConnected()) - { - var setSidebarVisibility = padutils.getCancellableAction("set-sidebar-visibility", function() - { - // $("body").toggleClass('hidesidebar', !! padcookie.getPref('hideSidebar')); - }); - window.setTimeout(setSidebarVisibility, asNowConnectedFeedback ? 3000 : 0); - } - else - { - padutils.cancelActions("set-sidebar-visibility"); - $("body").removeClass('hidesidebar'); - } - }, -*/ determineChatVisibility: function(asNowConnectedFeedback){ var chatVisCookie = padcookie.getPref('chatAlwaysVisible'); if(chatVisCookie){ // if the cookie is set for chat always visible @@ -828,15 +806,6 @@ var pad = { $('form#reconnectform input.missedChanges').val(JSON.stringify(pad.collabClient.getMissedChanges())); $('form#reconnectform').submit(); }, -/* - toggleSidebar: function() - { - var newValue = !padcookie.getPref('hideSidebar'); - padcookie.setPref('hideSidebar', newValue); - $("#sidebarcheck").toggleClass('sidebarchecked', !newValue).toggleClass('sidebarunchecked', !! newValue); - pad.determineSidebarVisibility(); - }, -*/ // this is called from code put into a frame from the server: handleImportExportFrameCall: function(callName, varargs) {