liuxm/Mergely
1
0
Fork 0
forked from lxm_front/Mergely
Code Issues Pull Requests Projects Releases Wiki Activity

Morning clean up.

Browse Source 
Removed useless function get_changes. Moved current_diff out of this.settings (and along this.changes)
Handle the case where comparing identical files (e.g. changes.length==0).

ajax.html uses https for jquery so that it can be hosted on a https server.
ajax.html uses full available screen width, auto height is trickier (note that call to _auto_height is commented out in mergely.js).
This commit is contained in:
Kljh
2014-08-17 08:11:13 +01:00
parent 4128796bfa
commit 572eb08aaa
3 changed files with 30 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/ajax.html
View File

@@ -12,7 +12,7 @@ This example demonstrates how to set left and right editors using ajax.
<meta name="author" content="Jamie Peabody" />
<!-- Requires jQuery -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
<!-- Requires CodeMirror -->
<script type="text/javascript" src="../lib/codemirror.js"></script>
@@ -37,6 +37,8 @@ This example demonstrates how to set left and right editors using ajax.
$(document).ready(function () {
$('#compare').mergely({
width: 'auto',
height: 'auto', // containing div must be given a height
cmsettings: { readOnly: false },
});
var lhs_url = 'lhs.txt';
@@ -112,7 +114,7 @@ This example demonstrates how to set left and right editors using ajax.
});
</script>
</head>
<body>
<body style="width: 100%;">
<table style="width: 100%;"><tr>
<td style="width: 50%;"><div id="drop_zone" class="drop_zone">Drop files here</div></td>
<td style="width: 50%;"><input type="checkbox" id="ignorews">ignore witespaces</td>
@@ -123,7 +125,8 @@ This example demonstrates how to set left and right editors using ajax.
<td style="width: 50%;"><tt id="path-lhs"></tt> &nbsp; <a id="save-lhs" class="save-link" href="#">save</a></td>
<td style="width: 50%;"><tt id="path-rhs"></tt> &nbsp; <a id="save-rhs" class="save-link" href="#">save</a></td>
</tr></table>
<div id="mergely-resizer">
<div id="mergely-resizer" style="height: 450px;"">
<div id="compare">
</div>
</div>