From 42512b3161bb350e022c87d5a3ff71c1108d138f Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 2 Dec 2013 16:03:07 +0000 Subject: [PATCH] more hack attempts --- static/css/iframe.css | 5 +++++ static/js/page_view.js | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/static/css/iframe.css b/static/css/iframe.css index 306f9ac..a07a2a0 100644 --- a/static/css/iframe.css +++ b/static/css/iframe.css @@ -61,3 +61,8 @@ margin-left:100px; margin-right:100px; } + +.pageBreakFullScreen{ + width:100%; + height:1px; +} diff --git a/static/js/page_view.js b/static/js/page_view.js index f4c1d3c..7230f34 100644 --- a/static/js/page_view.js +++ b/static/js/page_view.js @@ -26,6 +26,8 @@ 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").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(); } @@ -102,7 +104,7 @@ exports.aceDomLineProcessLineAttributes = function(name, context){ if (tagIndex !== undefined && type){ // NOTE THE INLINE CSS IS REQUIRED FOR IT TO WORK WITH PRINTING! Or is it? var modifier = { - preHtml: '
', + preHtml: '
', postHtml: '
', processedMarker: true }; @@ -171,6 +173,13 @@ exports.aceKeyEvent = function(hook, callstack, editorInfo, rep, documentAttribu } exports.aceEditEvent = function(hook, callstack, editorInfo, rep, documentAttributeManager){ + + // If we're not in page view mode just hide all the things + if($('#options-pageview').is(':checked')) {}else{ + $('.pageBreakComputed').remove(); + return false; + } + // Handle redrawing the page if(!callstack.callstack.docTextChanged) return; @@ -207,14 +216,15 @@ exports.aceEditEvent = function(hook, callstack, editorInfo, rep, documentAttrib var computedBreak = ((pxSinceLastBreak + height) >= yHeight); if(computedBreak){ // console.log(id, "should be a page break"); + + // is it already a page break? var isAlreadyPageBreak = $(this).find(".pageBreakComputed").length != 0; - console.log( "iPB", isAlreadyPageBreak ); - if(!isAlreadyPageBreak) $(this).append("
  • "); -// $(this).addClass("pageBreakComputed"); + // console.log( "iPB", isAlreadyPageBreak ); + + // If it's not already a page break append a page break + if(!isAlreadyPageBreak) $(this).append("
    "); pxSinceLastBreak = 0; - }else{ -// $(this).removeClass("pageBreakComputed"); } lines[lineNumber] = {