lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-20 09:38:39 +08:00
Code Issues Projects Releases Wiki Activity

Mergely 3.3.7

Browse Source
This commit is contained in:
Jamie Peabody
2014-08-17 16:13:57 +01:00
parent e54a7941f4
commit 64988c1341
5 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
doc/index.html
View File

@@ -146,44 +146,56 @@ $(document).ready(function () {
The following methods are available after initialization:
<p>
<dl>
<dt>$(selector).mergely('lhs', value)</dt>
<dd>Set the value of the left-hand editor. Best used with ajax.</dd>
<dt>$(selector).mergely('rhs', value)</dt>
<dd>Set the value of the right-hand editor. Best used with ajax.</dd>
<dt>$(selector).mergely('swap')</dt>
<dd>Swap the content of the left and right editors.</dd>
<dt>$(selector).mergely('merge', side)</dt>
<dd>Merge from <span class="code">side</span> to the opposite side.</dd>
<dt>$(selector).mergely('get', side)</dt>
<dd>Gets the editor contents.</dd>
<dt>$(selector).mergely('clear', side)</dt>
<dt id="mergely-clear">$(selector).mergely('clear', side)</dt>
<dd>Clears the editor contents.</dd>
<dt>$(selector).mergely('unmarkup')</dt>
<dd>Clears the editor markup.</dd>
<dt id="mergely-cm">$(selector).mergely('cm', side)</dt>
<dd>Gets the CodeMirror editor from <span class="code">side</span>.</dd>
<dt>$(selector).mergely('search', side, text)</dt>
<dd>Search the editor for <span class="code">text</span>. Repeating the call will find the next available token.</dd>
<dt id="mergely-diff">$(selector).mergely('diff')</dt>
<dd>Returns the current .diff file.</dd>
<dt>$(selector).mergely('resize')</dt>
<dd>Resize the editor.</dd>
<dt id="mergely-get">$(selector).mergely('get', side)</dt>
<dd>Gets the editor contents.</dd>
<dt>$(selector).mergely('update')</dt>
<dd>Manual update; recalculates diff and applies new settings.</dd>
<dt id="mergely-lhs">$(selector).mergely('lhs', value)</dt>
<dd>Set the value of the left-hand editor. Best used with ajax.</dd>
<dt>$(selector).mergely('options', options)</dt>
<dt id="mergely-merge">$(selector).mergely('merge', side)</dt>
<dd>Merges whole file from <span class="code">side</span> to the opposite side.</dd>
<dt id="mergely-mergeCurrentChange">$(selector).mergely('mergeCurrentChange', side)</dt>
<dd>Merges current cahnge from <span class="code">side</span> to the opposite side.</dd>
<dt id="mergely-set-options">$(selector).mergely('options', options)</dt>
<dd>Sets the editor options. After setting, call "update".</dd>
<dt>$(selector).mergely('options')</dt>
<dt id="mergely-get-options">$(selector).mergely('options')</dt>
<dd>Gets the current editor options.</dd>
<dt>$(selector).mergely('cm', side)</dt>
<dd>Gets the CodeMirror editor from <span class="code">side</span>.</dd>
<dt id="mergely-resize">$(selector).mergely('resize')</dt>
<dd>Resize the editor.</dd>
<dt id="mergely-rhs">$(selector).mergely('rhs', value)</dt>
<dd>Set the value of the right-hand editor. Best used with ajax.</dd>
<dt id="mergely-scrollTo">$(selector).mergely('scrollTo', side, num)</dt>
<dd>Scrolls the <span class="code">side</span> to line number <span class="code">num</span>.</dd>
<dt id="mergely-scrollToDiff">$(selector).mergely('scrollToDiff', direction)</dt>
<dd>Scrolls to the next change specified by <span class="code">direction</span>, where <span class="code">direction</span> is either <span class="code">prev</span> or <span class="code">next</span>.</dd>
<dt id="mergely-search">$(selector).mergely('search', side, text)</dt>
<dd>Search the editor for <span class="code">text</span>. Repeating the call will find the next available token.</dd>
<dt id="mergely-swap">$(selector).mergely('swap')</dt>
<dd>Swap the content of the left and right editors.</dd>
<dt id="mergely-unmarkup">$(selector).mergely('unmarkup')</dt>
<dd>Clears the editor markup.</dd>
<dt id="mergely-update">$(selector).mergely('update')</dt>
<dd>Manual update; recalculates diff and applies new settings.</dd>
</dl>
<h2>Styles</h2>

4
editor/editor.js
View File

@@ -249,7 +249,7 @@ $(document).ready(function() {
handleFind(ed.find('#mergely-editor-lhs'));
}
else if (id == 'edit-left-merge-right') {
ed.mergely('mergeCurrentDiff', 'rhs');
ed.mergely('mergeCurrentChange', 'rhs');
}
else if (id == 'edit-left-merge-right-file') {
ed.mergely('merge', 'rhs');
@@ -275,7 +275,7 @@ $(document).ready(function() {
handleFind(ed.find('#mergely-editor-rhs'));
}
else if (id == 'edit-right-merge-left') {
ed.mergely('mergeCurrentDiff', 'lhs');
ed.mergely('mergeCurrentChange', 'lhs');
}
else if (id == 'edit-right-merge-left-file') {
ed.mergely('merge', 'lhs');

4
editor/editor.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/mergely.js
View File

@@ -493,7 +493,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
this._scroll_to_change(this.changes[this._current_diff]);
this._changed(this.id + '-lhs', this.id + '-rhs');
},
mergeCurrentDiff: function(side) {
mergeCurrentChange: function(side) {
if (!this.changes.length) return;
if (side == 'lhs' && !this.lhs_cmsettings.readOnly) {
this._merge_change(this.changes[this._current_diff], 'rhs', 'lhs');

4
lib/mergely.min.js vendored
View File

File diff suppressed because one or more lines are too long