From b18147f32c3dd48edb16373d406e3e4843d0982a Mon Sep 17 00:00:00 2001
From: Minho <longfei6671@163.com>
Date: Wed, 6 Jun 2018 22:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E9=A1=B5=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/css/print.css            |  5 +++--
 static/js/kancloud.js           | 19 +++++++++++--------
 views/document/default_read.tpl | 10 +---------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/static/css/print.css b/static/css/print.css
index 0274f241..19feaffe 100644
--- a/static/css/print.css
+++ b/static/css/print.css
@@ -1,6 +1,7 @@
 body {font-size: 12pt !important;}
-.m-manual .manual-left,.navbar {display: none;}
-.m-manual .manual-right{left: 0;}
+.m-manual .manual-left,.navbar {display: none;height: 0 !important; width: 0!important;}
+.m-manual .manual-right{position: relative;left: 0 !important; top: 0;}
+.manual-article .article-content{ min-width: initial !important;max-width: initial !important; width: inherit !important;padding: auto !important;}
 pre, code {white-space: pre-wrap !important;word-wrap: break-word !important;}
 a:link, a:visited {color: blue !important;text-decoration: underline !important;}
 body a:link:after, body a:visited:after {content: " (" attr(href) ") ";}
\ No newline at end of file
diff --git a/static/js/kancloud.js b/static/js/kancloud.js
index ec916fd3..74ad3d7a 100644
--- a/static/js/kancloud.js
+++ b/static/js/kancloud.js
@@ -72,14 +72,17 @@ function loadDocument($url, $id, $callback) {
  * 初始化代码高亮
  */
 function initHighlighting() {
-    $('pre,pre.ql-syntax').each(function (i, block) {
-        if($(this).hasClass('prettyprinted')){
-            return;
-        }
-        hljs.highlightBlock(block);
-    });
-    hljs.initLineNumbersOnLoad();
-
+    try {
+        $('pre,pre.ql-syntax').each(function (i, block) {
+            if ($(this).hasClass('prettyprinted')) {
+                return;
+            }
+            hljs.highlightBlock(block);
+        });
+        hljs.initLineNumbersOnLoad();
+    }catch (e){
+        console.log(e);
+    }
 }
 
 
diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl
index 8239ff41..d94d3e4f 100644
--- a/views/document/default_read.tpl
+++ b/views/document/default_read.tpl
@@ -46,7 +46,7 @@
                 <span style="font-size: 12px;font-weight: 100;"></span>
             </div>
             <div class="navbar-header pull-right manual-menu">
-                <button id="printSinglePage" class="btn btn-default" style="margin-right: 10px;"><i class="fa fa-print"></i> 打印</button>
+                <a href="javascript:window.print();" id="printSinglePage" class="btn btn-default" style="margin-right: 10px;"><i class="fa fa-print"></i> 打印</a>
                 {{if gt .Member.MemberId 0}}
                 {{if gt .Model.RelationshipId 0}}
                 {{if eq .Model.RoleId 0 1 2}}
@@ -295,14 +295,6 @@ $(function () {
             return $(body).highlight(window.keyword);
         });
     });
-    //打印设置
-    $("#printSinglePage").on("click",function () {
-        var body = $("body");
-        var bodyContent = body.html();
-        body.html($(".manual-right").html());
-       window.print();
-        body.html(bodyContent);
-    });
 });
 
 </script>