1
0
mirror of synced 2025-12-09 07:18:18 +08:00
Commit Graph

220 Commits

Author SHA1 Message Date
Christopher Varakliotis
0a069a061a Removed resize handler on teardown 2015-01-26 17:31:20 +02:00
Jamie Peabody
3615267899 Updated to 3.3.9 2014-12-07 09:31:41 +00:00
Niklas Walter
548d8ce24c Fixed scrollbar positions for synced scrolling 2014-12-04 11:39:49 +01:00
Jamie Peabody
9876a3c841 Changed import order. 2014-10-19 21:20:53 +01:00
Jamie Peabody
0df0ef694d Fixes 3.3.8 merge function with new CM 4.6. Now uses uses strict. 2014-10-19 21:15:43 +01:00
Jamie Peabody
d501d5656a Now uses CodeMirror 4.6 2014-10-19 14:11:28 +01:00
Jamie Peabody
3494afa89e Added cm to debug 2014-10-19 14:09:53 +01:00
Jamie Peabody
64988c1341 Mergely 3.3.7 2014-08-17 16:13:57 +01:00
Jamie Peabody
e54a7941f4 Fixed indent. 2014-08-17 15:48:56 +01:00
Jamie Peabody
cd38c10ac9 Use release version. 2014-08-17 15:46:40 +01:00
Jamie Peabody
1b96990b1f Fixed typo. 2014-08-17 15:39:30 +01:00
Jamie Peabody
e9e0a9d41b Merge branch 'master' of https://github.com/kljh/Mergely
Conflicts:
	lib/mergely.js
2014-08-17 15:35:16 +01:00
Jamie Peabody
456da5f2c8 Added 'debug' option to editor to make it easier to switch. 2014-08-17 12:11:03 +01:00
Kljh
3c4fe71683 Editors cursor are now moved to currently selected difference. 2014-08-17 09:14:55 +01:00
Kljh
4f8c91c28a Morning clean up.
Restrict keyboard handler for the Mergely div to play nicely with other element on the page.
Darker grey for active difference.
2014-08-17 08:25:16 +01:00
Kljh
572eb08aaa Morning clean up.
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).
2014-08-17 08:11:13 +01:00
Kljh
4128796bfa Played with ajax.html.
It's probably no longer simple enough as an example. On the other hand it has a nice drag and drop feature. I couldn't make the "ignorews" checkbos work.

I had to update codemirror.css to have the texteditor height match the container. I tested using Opera browser and there seems to be no autosizing.
2014-08-17 00:17:39 +01:00
Kljh
6308a6926a Added auto scrolling.
Current difference is now always in viewport.

Added functions get_changes() and scroll_to_change(change) around line 767. Both new review.
We shouldn't need to rerun the full diff but I couldn't find how to retrieve the diff results.
Scrolling to a given change is quite tricky (musn't break the canvas graph, must have both pane nice).
2014-08-16 20:39:03 +01:00
Kljh
885fcd4e05 Added keyboard shortcuts à la WinMerge.
Alt + Up or Down arrow : go to previous or next difference
Alt + Left or Right arrow : merge difference using right or left content

Shift, Ctr, Alt or Meta keys can be used indifferntly (to cope with browser's idiosyncratics).
Event handler is now attached to text editor. This is clearly to review (does not capture all page events and too intrusive).

New state "current_diff" has been added.

Need to scroll the editor to center it on currently active state (scrollToChange function to add).
2014-08-16 17:31:15 +01:00
Kljh
e4c36f35ef Revert previous commit. Too many whitespace modification makes it painful to see the actual changes.
This reverts commit f1782d1933.
2014-08-16 16:38:32 +01:00
Kljh
f1782d1933 Added keyboard shortcuts à la WinMerge:
Alt + Up or Down arrow : go to previous or next difference
Alt + Left or Right arrow : merge difference using right or left content

Shift, Ctr, Alt or Meta keys can be used indifferntly (to cope with browser's idiosyncratics).
Event handler is now attached to text editor. This is clearly to review (does not capture all page events and too intrusive).

New state "current_diff" has been added.

Need to scroll the editor to center it on currently active state (scrollToChange function to add).
2014-08-16 15:55:47 +01:00
Jamie Peabody
8b3859de40 Merge branch 'master' of https://github.com/wickedest/Mergely 2014-03-10 20:30:37 +00:00
Jamie Peabody
ad10800fa3 Fixes parsing diffs that contains text that looks like a valid diff, but clearly is not. 2014-03-10 20:28:15 +00:00
wickedest
b73bbcffc5 Merge pull request #15 from alexbutum/master
Beautify README
2014-03-03 20:41:04 +00:00
Alex Butum
d899762787 Beautify README
Fixed typo in "It". Added new line. Uppercased Javascript
2014-03-03 16:43:55 +02:00
Jamie Peabody
bf96bc51a1 Fixes rendering issue. 2014-01-25 12:24:01 +00:00
Jamie Peabody
b436e6d5ff Fixes two download .diff problems - it did not contain text, and the /diff url did not work. downloading directly from browser now. 2013-11-24 19:32:31 +00:00
Jamie Peabody
1cb4b36b40 Fixes settings update. 2013-11-02 15:58:54 +00:00
Jamie Peabody
ddaf53b1af Merge branch 'master' of https://github.com/wickedest/Mergely 2013-11-02 15:08:08 +00:00
Jamie Peabody
900fea3edb Fixes problem where changes to options.ignorews did not cause update. 2013-11-02 15:05:55 +00:00
wickedest
068cf26c71 Merge pull request #12 from dbluestein/readjust-top-offset
Issue with misaligned canvas when editors move relative to top of document.
2013-10-22 00:06:54 -07:00
Dan Bluestein
cc2ca149be Fix issue with misaligned canvas when editors move relative to top of window.
(by recalculating draw_top_offset on resize)
2013-10-20 23:15:28 -07:00
Jamie Peabody
938acf5f36 A bit of refactoring. 2013-06-30 20:11:57 +01:00
Jamie Peabody
bdd060556b Tidy-up 2013-06-30 20:11:45 +01:00
Jamie Peabody
02b5df3d87 Fixes sidebar click. 2013-06-24 22:34:45 +01:00
Jamie Peabody
1b21779bcf Added url parameters, removed crap social code. 2013-06-24 22:27:06 +01:00
Jamie Peabody
290f7606c7 Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize. 2013-06-24 20:20:19 +01:00
wickedest
a2e06706cf Merge pull request #10 from eminence/fixclick
Fix clicking on the clhs and crhs elements
2013-06-21 14:49:58 -07:00
Andrew Chin
cbd61e600d Fix clicking on the clhs and crhs elements 2013-06-21 17:17:31 -04:00
Jamie Peabody
91f1a2158d Fixes autoupdate issue to ensure there is no update if scrolled or resized. 2013-06-20 22:36:01 +01:00
Jamie Peabody
f77a66c398 Added 'viewport' option to enable/disable the viewport. Updated documentation and editor options. 2013-06-13 20:22:46 +01:00
Jamie Peabody
09c9e31a0d Fixes issue where merge left, from added lines, were not being correctly inserted into the lhs. 2013-06-13 19:35:26 +01:00
Jamie Peabody
0cd70a833f Added 'rhs_margin' option that accepts 'left' or 'right' to indicate the side to render the margin. Defaults to 'right'. 2013-06-06 18:11:29 +01:00
Jamie Peabody
18bc465d90 Removed window height (was unused). 2013-05-12 20:03:46 +01:00
Jamie Peabody
eb3b45ff92 Removed debug code. 2013-05-12 19:56:41 +01:00
Jamie Peabody
ea2263ff29 New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize. 2013-05-12 19:52:47 +01:00
Jamie Peabody
a3e50f8d8e Initial fix for auto-height and multiple editors. 2013-03-09 13:48:46 +00:00
Jamie Peabody
c382afa2a5 Fixed setting lhs/rhs using CodeMirror's setValue. 2013-03-03 22:45:56 +00:00
Jamie Peabody
274d85bf05 Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.
Released with CodeMirror 3.1.
2013-02-24 21:57:25 +00:00
Jamie Peabody
49f57eb72b Major work to update Mergely to work with the head of codemirror git. 2013-02-10 20:19:35 +00:00