From 92624d6cef6d7400a1e7f8ffb2a27fbab489b4ce Mon Sep 17 00:00:00 2001 From: John McLear Date: Wed, 4 Dec 2013 19:32:27 +0000 Subject: [PATCH] seems to have fixed toggling between page view and none page view just fine --- static/css/iframe.css | 2 +- static/css/page_view.css | 1 - static/js/page_view.js | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/static/css/iframe.css b/static/css/iframe.css index a07a2a0..9ecf2f6 100644 --- a/static/css/iframe.css +++ b/static/css/iframe.css @@ -54,7 +54,7 @@ } #innerdocbody { - min-height:1200px; + min-height:1500px; } #innerdocbody > div{ diff --git a/static/css/page_view.css b/static/css/page_view.css index 1c782ee..8ab074b 100644 --- a/static/css/page_view.css +++ b/static/css/page_view.css @@ -4,7 +4,6 @@ overflow: hidden; background-color: #f7f7f7; text-align: center; - padding-top: 16px; } iframe.page_view { diff --git a/static/js/page_view.js b/static/js/page_view.js index 7230f34..21c1efc 100644 --- a/static/js/page_view.js +++ b/static/js/page_view.js @@ -12,12 +12,17 @@ if (!isMobile) { $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").addClass('innerPV'); $('iframe[name="ace_outer"]').contents().find("iframe").addClass('outerPV'); $('iframe[name="ace_outer"]').contents().find('#outerdocbody').addClass("outerBackground"); + $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").css("margin-left","0px"); $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").contents().find('.pageBreak').click(function(e){ $(this).focusout().blur(); top.console.log("Can't edit pagebreak Line"); e.preventDefault(); return false; }); + if($('#options-linenoscheck').is(':checked')){ + $('#options-linenoscheck').attr("disabled", true); + $('#options-linenoscheck').click(); + } $('#ep_page_ruler').show(); }, @@ -26,10 +31,12 @@ if (!isMobile) { $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").removeClass('innerPV'); $('iframe[name="ace_outer"]').contents().find("iframe").removeClass('outerPV'); // $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").contents().find("div").removeClass("innerPVDiv"); + $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").css("margin-left","-100px"); // $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").contents().find(".pageBreak").css({width:"100%"}); // $('iframe[name="ace_outer"]').contents().find('iframe').contents().find("#innerdocbody").contents().find(".pageBreakComputed").hide('pageBreakFullScreen'); $('iframe[name="ace_outer"]').contents().find('#outerdocbody').removeClass("outerBackground"); $('#ep_page_ruler').hide(); + $('#options-linenoscheck').attr("disabled", false); } } /* init */