Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
fe095ac92b
|
|||
|
5b1647a2c9
|
|||
|
af25d3405a
|
|||
|
a954d49c5c
|
32
index.html
32
index.html
@ -1,27 +1,25 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8">
|
||||||
<title>Online File Diff and Mergely</title>
|
<title>Online File Diff and Mergely</title>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1, IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<link rel="shortcut icon" href="favicon.ico">
|
<link rel="shortcut icon" href="favicon.ico">
|
||||||
<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="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">
|
||||||
<meta name="keywords" content="diff,merge,compare,jsdiff,comparison,difference,file,text,unix,patch,algorithm,saas,longest common subsequence" />
|
<meta name="author" content="Alexander Popov">
|
||||||
<meta name="author" content="Alexander Popov" />
|
<script src="./lib/jquery.min.js"></script>
|
||||||
<script src="http://libs.baidu.com/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
|
<script src="./lib/codemirror.min.js"></script>
|
||||||
<script type="text/javascript" src="./lib/codemirror.min.js"></script>
|
<link type="text/css" rel="stylesheet" href="./lib/codemirror.min.css">
|
||||||
<link type="text/css" rel="stylesheet" href="./lib/codemirror.css" />
|
<script src="./lib/mergely.min.js"></script>
|
||||||
<script type="text/javascript" src="./lib/mergely.min.js"></script>
|
<link type="text/css" rel="stylesheet" href="./lib/mergely.css">
|
||||||
<link type="text/css" rel="stylesheet" href="./lib/mergely.css" />
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="mergely-resizer">
|
<div id="mergely-resizer">
|
||||||
<div id="compare">
|
<div id="compare">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
<script>
|
||||||
<script type="text/javascript">
|
|
||||||
function getWinHeight() {
|
function getWinHeight() {
|
||||||
var winHeight = 0;
|
var winHeight = 0;
|
||||||
if (window.innerHeight)
|
if (window.innerHeight)
|
||||||
@ -40,8 +38,9 @@
|
|||||||
}
|
}
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$('#compare').mergely({
|
$('#compare').mergely({
|
||||||
width: 'auto',
|
editor_width: 'auto',
|
||||||
height: '400',
|
editor_height: '400',
|
||||||
|
license: 'mpl-separate-notice',
|
||||||
cmsettings: {
|
cmsettings: {
|
||||||
readOnly: false,
|
readOnly: false,
|
||||||
lineWrapping: true,
|
lineWrapping: true,
|
||||||
@ -55,9 +54,10 @@
|
|||||||
});
|
});
|
||||||
$(window).resize(function() {
|
$(window).resize(function() {
|
||||||
$('#compare').mergely('options', {height:getWinHeight() - 30, width:getWinWidth() - 30});
|
$('#compare').mergely('options', {height:getWinHeight() - 30, width:getWinWidth() - 30});
|
||||||
$('#compare').mergely('update')
|
$('#compare').mergely('update');
|
||||||
});
|
});
|
||||||
$(window).resize();
|
$(window).resize();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,245 +0,0 @@
|
|||||||
/* BASICS */
|
|
||||||
|
|
||||||
.CodeMirror {
|
|
||||||
/* Set height, width, borders, and global font properties here */
|
|
||||||
font-family: monospace;
|
|
||||||
height: 300px;
|
|
||||||
}
|
|
||||||
.CodeMirror-scroll {
|
|
||||||
/* Set scrolling behaviour here */
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* PADDING */
|
|
||||||
|
|
||||||
.CodeMirror-lines {
|
|
||||||
padding: 4px 0; /* Vertical padding around content */
|
|
||||||
}
|
|
||||||
.CodeMirror pre {
|
|
||||||
padding: 0 4px; /* Horizontal padding of content */
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-scrollbar-filler {
|
|
||||||
background-color: white; /* The little square between H and V scrollbars */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* GUTTER */
|
|
||||||
|
|
||||||
.CodeMirror-gutters {
|
|
||||||
border-right: 1px solid #ddd;
|
|
||||||
background-color: #f7f7f7;
|
|
||||||
}
|
|
||||||
.CodeMirror-linenumbers {}
|
|
||||||
.CodeMirror-linenumber {
|
|
||||||
padding: 0 3px 0 5px;
|
|
||||||
min-width: 20px;
|
|
||||||
text-align: right;
|
|
||||||
color: #999;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* CURSOR */
|
|
||||||
|
|
||||||
.CodeMirror div.CodeMirror-cursor {
|
|
||||||
border-left: 1px solid black;
|
|
||||||
}
|
|
||||||
/* Shown when moving in bi-directional text */
|
|
||||||
.CodeMirror div.CodeMirror-secondarycursor {
|
|
||||||
border-left: 1px solid silver;
|
|
||||||
}
|
|
||||||
.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
|
|
||||||
width: auto;
|
|
||||||
border: 0;
|
|
||||||
background: transparent;
|
|
||||||
background: rgba(0, 200, 0, .4);
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
|
|
||||||
}
|
|
||||||
/* Kludge to turn off filter in ie9+, which also accepts rgba */
|
|
||||||
.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor:not(#nonsense_id) {
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
|
||||||
}
|
|
||||||
/* Can style cursor different in overwrite (non-insert) mode */
|
|
||||||
.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
|
|
||||||
|
|
||||||
/* DEFAULT THEME */
|
|
||||||
|
|
||||||
.cm-s-default .cm-keyword {color: #708;}
|
|
||||||
.cm-s-default .cm-atom {color: #219;}
|
|
||||||
.cm-s-default .cm-number {color: #164;}
|
|
||||||
.cm-s-default .cm-def {color: #00f;}
|
|
||||||
.cm-s-default .cm-variable {color: black;}
|
|
||||||
.cm-s-default .cm-variable-2 {color: #05a;}
|
|
||||||
.cm-s-default .cm-variable-3 {color: #085;}
|
|
||||||
.cm-s-default .cm-property {color: black;}
|
|
||||||
.cm-s-default .cm-operator {color: black;}
|
|
||||||
.cm-s-default .cm-comment {color: #a50;}
|
|
||||||
.cm-s-default .cm-string {color: #a11;}
|
|
||||||
.cm-s-default .cm-string-2 {color: #f50;}
|
|
||||||
.cm-s-default .cm-meta {color: #555;}
|
|
||||||
.cm-s-default .cm-error {color: #f00;}
|
|
||||||
.cm-s-default .cm-qualifier {color: #555;}
|
|
||||||
.cm-s-default .cm-builtin {color: #30a;}
|
|
||||||
.cm-s-default .cm-bracket {color: #997;}
|
|
||||||
.cm-s-default .cm-tag {color: #170;}
|
|
||||||
.cm-s-default .cm-attribute {color: #00c;}
|
|
||||||
.cm-s-default .cm-header {color: blue;}
|
|
||||||
.cm-s-default .cm-quote {color: #090;}
|
|
||||||
.cm-s-default .cm-hr {color: #999;}
|
|
||||||
.cm-s-default .cm-link {color: #00c;}
|
|
||||||
|
|
||||||
.cm-negative {color: #d44;}
|
|
||||||
.cm-positive {color: #292;}
|
|
||||||
.cm-header, .cm-strong {font-weight: bold;}
|
|
||||||
.cm-em {font-style: italic;}
|
|
||||||
.cm-emstrong {font-style: italic; font-weight: bold;}
|
|
||||||
.cm-link {text-decoration: underline;}
|
|
||||||
|
|
||||||
.cm-invalidchar {color: #f00;}
|
|
||||||
|
|
||||||
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
|
|
||||||
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
|
|
||||||
|
|
||||||
/* STOP */
|
|
||||||
|
|
||||||
/* The rest of this file contains styles related to the mechanics of
|
|
||||||
the editor. You probably shouldn't touch them. */
|
|
||||||
|
|
||||||
.CodeMirror {
|
|
||||||
line-height: 1;
|
|
||||||
position: relative;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-scroll {
|
|
||||||
/* 30px is the magic margin used to hide the element's real scrollbars */
|
|
||||||
/* See overflow: hidden in .CodeMirror, and the paddings in .CodeMirror-sizer */
|
|
||||||
margin-bottom: -30px; margin-right: -30px;
|
|
||||||
padding-bottom: 30px; padding-right: 30px;
|
|
||||||
height: 100%;
|
|
||||||
outline: none; /* Prevent dragging from highlighting the element */
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
.CodeMirror-sizer {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The fake, visible scrollbars. Used to force redraw during scrolling
|
|
||||||
before actuall scrolling happens, thus preventing shaking and
|
|
||||||
flickering artifacts. */
|
|
||||||
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 6;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.CodeMirror-vscrollbar {
|
|
||||||
right: 0; top: 0;
|
|
||||||
overflow-x: hidden;
|
|
||||||
overflow-y: scroll;
|
|
||||||
}
|
|
||||||
.CodeMirror-hscrollbar {
|
|
||||||
bottom: 0; left: 0;
|
|
||||||
overflow-y: hidden;
|
|
||||||
overflow-x: scroll;
|
|
||||||
}
|
|
||||||
.CodeMirror-scrollbar-filler {
|
|
||||||
right: 0; bottom: 0;
|
|
||||||
z-index: 6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-gutters {
|
|
||||||
position: absolute; left: 0; top: 0;
|
|
||||||
height: 100%;
|
|
||||||
padding-bottom: 30px;
|
|
||||||
z-index: 3;
|
|
||||||
}
|
|
||||||
.CodeMirror-gutter {
|
|
||||||
height: 100%;
|
|
||||||
display: inline-block;
|
|
||||||
/* Hack to make IE7 behave */
|
|
||||||
*zoom:1;
|
|
||||||
*display:inline;
|
|
||||||
}
|
|
||||||
.CodeMirror-gutter-elt {
|
|
||||||
position: absolute;
|
|
||||||
cursor: default;
|
|
||||||
z-index: 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-lines {
|
|
||||||
cursor: text;
|
|
||||||
}
|
|
||||||
.CodeMirror pre {
|
|
||||||
/* Reset some styles that the rest of the page might have set */
|
|
||||||
-moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; border-radius: 0;
|
|
||||||
border-width: 0;
|
|
||||||
background: transparent;
|
|
||||||
font-family: inherit;
|
|
||||||
font-size: inherit;
|
|
||||||
margin: 0;
|
|
||||||
white-space: pre;
|
|
||||||
word-wrap: normal;
|
|
||||||
line-height: inherit;
|
|
||||||
color: inherit;
|
|
||||||
z-index: 2;
|
|
||||||
position: relative;
|
|
||||||
overflow: visible;
|
|
||||||
}
|
|
||||||
.CodeMirror-wrap pre {
|
|
||||||
word-wrap: break-word;
|
|
||||||
white-space: pre-wrap;
|
|
||||||
word-break: normal;
|
|
||||||
}
|
|
||||||
.CodeMirror-linebackground {
|
|
||||||
position: absolute;
|
|
||||||
left: 0; right: 0; top: 0; bottom: 0;
|
|
||||||
z-index: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-linewidget {
|
|
||||||
position: relative;
|
|
||||||
z-index: 2;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-widget {
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-wrap .CodeMirror-scroll {
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-measure {
|
|
||||||
position: absolute;
|
|
||||||
width: 100%; height: 0px;
|
|
||||||
overflow: hidden;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
.CodeMirror-measure pre { position: static; }
|
|
||||||
|
|
||||||
.CodeMirror div.CodeMirror-cursor {
|
|
||||||
position: absolute;
|
|
||||||
visibility: hidden;
|
|
||||||
border-right: none;
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
.CodeMirror-focused div.CodeMirror-cursor {
|
|
||||||
visibility: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
.CodeMirror-selected { background: #d9d9d9; }
|
|
||||||
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
|
|
||||||
|
|
||||||
.cm-searching {
|
|
||||||
background: #ffa;
|
|
||||||
background: rgba(255, 255, 0, .4);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
|
|
||||||
.CodeMirror span { *vertical-align: text-bottom; }
|
|
||||||
|
|
||||||
@media print {
|
|
||||||
/* Hide the cursor when printing */
|
|
||||||
.CodeMirror div.CodeMirror-cursor {
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
1
lib/codemirror.min.css
vendored
Normal file
1
lib/codemirror.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
5
lib/codemirror.min.js
vendored
5
lib/codemirror.min.js
vendored
File diff suppressed because one or more lines are too long
4
lib/jquery.min.js
vendored
Normal file
4
lib/jquery.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -1,9 +1,3 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2014 by Jamie Peabody, http://www.mergely.com
|
|
||||||
* All rights reserved.
|
|
||||||
* Version: 3.3.7 2014-08-17
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* required */
|
/* required */
|
||||||
.mergely-column textarea { width: 80px; height: 200px; }
|
.mergely-column textarea { width: 80px; height: 200px; }
|
||||||
.mergely-column { float: left; }
|
.mergely-column { float: left; }
|
||||||
@ -12,22 +6,26 @@
|
|||||||
|
|
||||||
/* resizeable */
|
/* resizeable */
|
||||||
.mergely-resizer { width: 100%; height: 100%; }
|
.mergely-resizer { width: 100%; height: 100%; }
|
||||||
|
.mergely-full-screen-0 { position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow: hidden; }
|
||||||
|
.mergely-full-screen-8 { position: absolute; top: 8px; bottom: 8px; left: 8px; right: 8px; overflow: hidden; }
|
||||||
|
|
||||||
/* style configuration */
|
/* style configuration */
|
||||||
.mergely-column { border: 1px solid #ccc; }
|
.mergely-column { border: 1px solid #ccc; }
|
||||||
.mergely-active { border: 1px solid #a3d1ff; }
|
.mergely-active { border: 1px solid #a3d1ff; }
|
||||||
|
|
||||||
|
.mergely.a,.mergely.d,.mergely.c { color: #000; }
|
||||||
|
|
||||||
.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
|
.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
|
||||||
.mergely.a.lhs.start.end,
|
.mergely.a.lhs.start.end,
|
||||||
.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
|
.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
|
||||||
.mergely.a.rhs { background-color: #ddeeff; }
|
.mergely.a.rhs { background-color: #ddeeff; }
|
||||||
.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }
|
.mergely.a.lhs.start.end.first { border-bottom-width: 0; border-top: 1px solid #a3d1ff; }
|
||||||
|
|
||||||
.mergely.d.lhs { background-color: #edc0c0; }
|
.mergely.d.lhs { background-color: #ffe9e9; }
|
||||||
.mergely.d.lhs.end,
|
.mergely.d.lhs.end,
|
||||||
.mergely.d.rhs.start.end { border-bottom: 1px solid #ff7f7f; }
|
.mergely.d.rhs.start.end { border-bottom: 1px solid #f8e8e8; }
|
||||||
.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ff7f7f; }
|
.mergely.d.rhs.start.end.first { border-bottom-width: 0; border-top: 1px solid #f8e8e8; }
|
||||||
.mergely.d.lhs.start { border-top: 1px solid #ff7f7f; }
|
.mergely.d.lhs.start { border-top: 1px solid #f8e8e8; }
|
||||||
|
|
||||||
.mergely.c.lhs,
|
.mergely.c.lhs,
|
||||||
.mergely.c.rhs { background-color: #fafafa; }
|
.mergely.c.rhs { background-color: #fafafa; }
|
||||||
@ -37,4 +35,17 @@
|
|||||||
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
|
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
|
||||||
|
|
||||||
.mergely.ch.a.rhs { background-color: #ddeeff; }
|
.mergely.ch.a.rhs { background-color: #ddeeff; }
|
||||||
.mergely.ch.d.lhs { background-color: #edc0c0; text-decoration: line-through; color: #888; }
|
.mergely.ch.d.lhs { background-color: #ffe9e9; text-decoration: line-through; color: red !important; }
|
||||||
|
|
||||||
|
.mergely.current.start { border-top: 1px solid #000 !important; }
|
||||||
|
.mergely.current.end { border-bottom: 1px solid #000 !important; }
|
||||||
|
.mergely.current.lhs.a.start.end,
|
||||||
|
.mergely.current.rhs.d.start.end { border-top-width: 0 !important; }
|
||||||
|
|
||||||
|
.mergely.current.lhs.a.start.end.empty,
|
||||||
|
.mergely.current.rhs.d.start.end.empty { border-top-width: 1px !important; border-bottom-width: 0px !important; }
|
||||||
|
|
||||||
|
.mergely.current.CodeMirror-linenumber { color: #F9F9F9; font-weight: bold; background-color: #777; }
|
||||||
|
.CodeMirror-linenumber { cursor: pointer; }
|
||||||
|
.CodeMirror-code { color: #717171; }
|
||||||
|
span.CodeMirror-selectedtext { background: none !important; }
|
||||||
|
|||||||
7
lib/mergely.min.js
vendored
7
lib/mergely.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user