From 7076aaf6cee5ba0afec8c665b1b765bd55350480 Mon Sep 17 00:00:00 2001 From: houxg Date: Thu, 9 Feb 2017 21:09:47 +0800 Subject: [PATCH] merge https://github.com/leanote/leanote-ios/commit/1fa04c6a4870fa095462cf71eb1efc0e0e586266 --- app/src/main/assets/markdownEditor/all.css | 2 +- app/src/main/assets/markdownEditor/all.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/assets/markdownEditor/all.css b/app/src/main/assets/markdownEditor/all.css index a8cc433..ef1a2e8 100644 --- a/app/src/main/assets/markdownEditor/all.css +++ b/app/src/main/assets/markdownEditor/all.css @@ -912,7 +912,7 @@ div.jGrowl div.jGrowl-closer { } .preview-container, #preview-contents, -.wmd-preview-section { +.md-table { overflow-x: auto; /*解决长表格无法滚动问题*/ } .wmd-prompt-background { diff --git a/app/src/main/assets/markdownEditor/all.js b/app/src/main/assets/markdownEditor/all.js index 3bfb84e..c396c3f 100644 --- a/app/src/main/assets/markdownEditor/all.js +++ b/app/src/main/assets/markdownEditor/all.js @@ -14267,7 +14267,7 @@ define("libs/Markdown.Converter", function(){}); // build html var cls = self.tableClass ? ' class="' + self.tableClass + '"' : ''; - var html = ['\n', '\n', '\n'].join(''); + var html = ['
\n', '\n', '\n'].join(''); // build column headers. for (i = 0; i < colCount; i++) { @@ -14296,7 +14296,7 @@ define("libs/Markdown.Converter", function(){}); html += "\n"; } - html += "\n"; + html += "
\n"; // replace html with placeholder until postConversion step return self.hashExtraBlock(html);