lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-19 01:58:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

实现Markdown编辑器编辑合并功能

Browse Source
This commit is contained in:
Minho
2017-06-12 17:58:45 +08:00
parent 92ab952f8b
commit d8dd092f3e
29 changed files with 269 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
views/document/compare.tpl
View File

@@ -4,12 +4,8 @@
<head>
<meta charset="utf-8" />
<title>文档比较 - Powered by MinDoc</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="description" content="Merge and Diff your documents with diff online and share" />
<meta name="keywords" content="diff,merge,compare,jsdiff,comparison,difference,file,text,unix,patch,algorithm,saas,longest common subsequence,diff online" />
<meta name="author" content="Jamie Peabody" />
<link rel="shortcut icon" href="/favicon.ico" />
<link href='http://fonts.googleapis.com/css?family=Noto+Sans:400,700' rel='stylesheet' type='text/css' />
<link href="/static/fonts/notosans.css" rel='stylesheet' type='text/css' />
<script type="text/javascript" src="/static/jquery/1.12.4/jquery.min.js"></script>
<link type='text/css' rel='stylesheet' href='/static/mergely/editor/lib/wicked-ui.css' />
<script type="text/javascript" src="/static/mergely/editor/lib/wicked-ui.js"></script>
@@ -20,25 +16,43 @@
<link type="text/css" rel="stylesheet" href="/static/mergely/editor/lib/farbtastic/farbtastic.css" />
<script type="text/javascript" src="/static/mergely/lib/codemirror.min.js"></script>
<script type="text/javascript" src="/static/mergely/lib/mergely.min.js"></script>
<script type="text/javascript" src="/static/mergely/editor/editor.min.js"></script>
<script type="text/javascript" src="/static/mergely/editor/editor.js"></script>
<link type="text/css" rel="stylesheet" href="/static/mergely/lib/codemirror.css" />
<link type="text/css" rel="stylesheet" href="/static/mergely/lib/mergely.css" />
<link type='text/css' rel='stylesheet' href='/static/mergely/editor/editor.css' />
<script type="text/javascript" src="/static/mergely/lib/searchcursor.js"></script>
<script type="text/javascript">
var key = '';
var isSample = key == 'usaindep';
// var isSample = key === 'usaindep';
</script>
</head>
<body style="visibility:hidden">
<!-- toolbar -->
<ul id="toolbar">
<li id="tb-file-save" data-icon="icon-save" title="保存">保存合并</li>
<li class="separator"></li>
<li id="tb-view-change-prev" data-icon="icon-arrow-up" title="上一处差异">上一处差异</li>
<li id="tb-view-change-next" data-icon="icon-arrow-down" title="下一处差异">下一处差异</li>
<li class="separator"></li>
<li id="tb-edit-right-merge-left" data-icon="icon-arrow-left-v" title="合并到左侧">合并到左侧</li>
<li id="tb-edit-left-merge-right" data-icon="icon-arrow-right-v" title="合并到右侧">合并到右侧</li>
<li id="tb-view-swap" data-icon="icon-swap" title="左右切换">左右切换</li>
</ul>
<!-- find -->
<div class="find">
<input type="text" placeholder="请输入关键字"/>
<button class="find-prev"><span class="icon icon-arrow-up"></span></button>
<button class="find-next"><span class="icon icon-arrow-down"></span></button>
<button class="find-close"><span class="icon icon-x-mark"></span></button>
</div>
<!-- editor -->
<div style="position: absolute;top: 0px;bottom: 10px;left: 5px;right: 5px;overflow-y: hidden;padding-bottom: 2px;">
<div style="position: absolute;top: 33px;bottom: 10px;left: 5px;right: 5px;overflow-y: hidden;padding-bottom: 2px;">
<div id="mergely"></div>
</div>
<template id="historyContent">{{.HistoryContent}}</template>
<template id="documentContent">{{.Content}}</template>
<script type="text/javascript" src="/static/layer/layer.js"></script>
</body>
</html>