From eaf41856faf45b71a6f5100582eaf5eb22fc9371 Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Sun, 3 Feb 2013 21:00:30 +0000 Subject: [PATCH] Fixed rendering issue where changes were skipped. Upgraded to work with jquery 1.9.0. --- doc/index.html | 2 +- editor/editor.js | 4 +- editor/jquery.upload.js | 2 +- examples/example1.html | 6 +- examples/example2.html | 6 +- examples/example3.html | 6 +- examples/jquery.corner.js | 249 -------------------------------------- lib/mergely.js | 137 +++++++++++---------- test/index.html | 2 +- 9 files changed, 84 insertions(+), 330 deletions(-) delete mode 100644 examples/jquery.corner.js diff --git a/doc/index.html b/doc/index.html index 2450768..ddb3a3d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -48,7 +48,7 @@ 

 <script type="text/javascript"
- src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+ src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 
 <script type="text/javascript" src="../lib/codemirror.min.js"></script>
 <link type="text/css" rel="stylesheet" href="../lib/codemirror.css" />
diff --git a/editor/editor.js b/editor/editor.js
index 3c577a2..fa2b2dc 100755
--- a/editor/editor.js
+++ b/editor/editor.js
@@ -19,14 +19,14 @@ $(document).ready(function () {
 	$('.button-share').button({icons:{primary:'ui-icon-triangle-1-s'}, text:true});
 	$('.button-download-diff').button({icons:{primary:'ui-icon-script'}, text:false});
 	
-	$('#share').live({
+	$('#share').on({
 		mouseenter: function () { $('#share-menu').fadeIn(500); },
 		mouseleave: function () {
 			if (hover_timeout) clearTimeout(hover_timeout);
 			hover_timeout = setTimeout(function(){$('#share-menu').hide();}, 100);
 		}
 	});
-	$('#share-menu').live({
+	$('#share-menu').on({
 		mouseenter: function () { if (hover_timeout) clearTimeout(hover_timeout); },
 		mouseleave: function () { 
 			if (hover_timeout) clearTimeout(hover_timeout);
diff --git a/editor/jquery.upload.js b/editor/jquery.upload.js
index a5524e2..0ce9727 100755
--- a/editor/jquery.upload.js
+++ b/editor/jquery.upload.js
@@ -20,7 +20,7 @@
                     if (options) $.extend(settings, options);
 					var container = $('
');
 					var input = $('');
-					if ($.browser.mozilla) {
+					if (navigator && navigator.appCodeName == 'Mozilla') {
 						input.css({'left':'-190px','height':'16px'});
 					}
 					var button = tthis.clone();
diff --git a/examples/example1.html b/examples/example1.html
index 2a81bf7..ca3f0a2 100644
--- a/examples/example1.html
+++ b/examples/example1.html
@@ -12,11 +12,9 @@ This example demonstrates the minimum amount of code required to use Mergely.
 	
 
 	
-	
-	
-	
+	
 	
-	
+	
 	
 	
 	
diff --git a/examples/example2.html b/examples/example2.html
index 1683e8b..dbc1c89 100644
--- a/examples/example2.html
+++ b/examples/example2.html
@@ -12,11 +12,9 @@ This example demonstrates how to set left and right editors using ajax.
 	
 
 	
-	
-	
-	
+	
 	
-	
+	
 	
 	
 	
diff --git a/examples/example3.html b/examples/example3.html
index d58587c..ba9f012 100644
--- a/examples/example3.html
+++ b/examples/example3.html
@@ -12,11 +12,9 @@ This example demonstrates how to enable line wrapping
 	
 
 	
-	
-	
-	
+	
 	
-	
+	
 	
 	
 	
diff --git a/examples/jquery.corner.js b/examples/jquery.corner.js
deleted file mode 100644
index c416613..0000000
--- a/examples/jquery.corner.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/*!
- * jQuery corner plugin: simple corner rounding
- * Examples and documentation at: http://jquery.malsup.com/corner/
- * version 2.12 (23-MAY-2011)
- * Requires jQuery v1.3.2 or later
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * Authors: Dave Methvin and Mike Alsup
- */
-
-/**
- *  corner() takes a single string argument:  $('#myDiv').corner("effect corners width")
- *
- *  effect:  name of the effect to apply, such as round, bevel, notch, bite, etc (default is round). 
- *  corners: one or more of: top, bottom, tr, tl, br, or bl.  (default is all corners)
- *  width:   width of the effect; in the case of rounded corners this is the radius. 
- *           specify this value using the px suffix such as 10px (yes, it must be pixels).
- */
-;(function($) { 
-
-var style = document.createElement('div').style,
-    moz = style['MozBorderRadius'] !== undefined,
-    webkit = style['WebkitBorderRadius'] !== undefined,
-    radius = style['borderRadius'] !== undefined || style['BorderRadius'] !== undefined,
-    mode = document.documentMode || 0,
-    noBottomFold = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8),
-
-    expr = $.browser.msie && (function() {
-        var div = document.createElement('div');
-        try { div.style.setExpression('width','0+0'); div.style.removeExpression('width'); }
-        catch(e) { return false; }
-        return true;
-    })();
-
-$.support = $.support || {};
-$.support.borderRadius = moz || webkit || radius; // so you can do:  if (!$.support.borderRadius) $('#myDiv').corner();
-
-function sz(el, p) { 
-    return parseInt($.css(el,p))||0; 
-};
-function hex2(s) {
-    s = parseInt(s).toString(16);
-    return ( s.length < 2 ) ? '0'+s : s;
-};
-function gpc(node) {
-    while(node) {
-        var v = $.css(node,'backgroundColor'), rgb;
-        if (v && v != 'transparent' && v != 'rgba(0, 0, 0, 0)') {
-            if (v.indexOf('rgb') >= 0) { 
-                rgb = v.match(/\d+/g); 
-                return '#'+ hex2(rgb[0]) + hex2(rgb[1]) + hex2(rgb[2]);
-            }
-            return v;
-        }
-        if (node.nodeName.toLowerCase() == 'html')
-            break;
-        node = node.parentNode; // keep walking if transparent
-    }
-    return '#ffffff';
-};
-
-function getWidth(fx, i, width) {
-    switch(fx) {
-    case 'round':  return Math.round(width*(1-Math.cos(Math.asin(i/width))));
-    case 'cool':   return Math.round(width*(1+Math.cos(Math.asin(i/width))));
-    case 'sharp':  return width-i;
-    case 'bite':   return Math.round(width*(Math.cos(Math.asin((width-i-1)/width))));
-    case 'slide':  return Math.round(width*(Math.atan2(i,width/i)));
-    case 'jut':    return Math.round(width*(Math.atan2(width,(width-i-1))));
-    case 'curl':   return Math.round(width*(Math.atan(i)));
-    case 'tear':   return Math.round(width*(Math.cos(i)));
-    case 'wicked': return Math.round(width*(Math.tan(i)));
-    case 'long':   return Math.round(width*(Math.sqrt(i)));
-    case 'sculpt': return Math.round(width*(Math.log((width-i-1),width)));
-    case 'dogfold':
-    case 'dog':    return (i&1) ? (i+1) : width;
-    case 'dog2':   return (i&2) ? (i+1) : width;
-    case 'dog3':   return (i&3) ? (i+1) : width;
-    case 'fray':   return (i%2)*width;
-    case 'notch':  return width; 
-    case 'bevelfold':
-    case 'bevel':  return i+1;
-    case 'steep':  return i/2 + 1;
-    case 'invsteep':return (width-i)/2+1;
-    }
-};
-
-$.fn.corner = function(options) {
-    // in 1.3+ we can fix mistakes with the ready state
-    if (this.length == 0) {
-        if (!$.isReady && this.selector) {
-            var s = this.selector, c = this.context;
-            $(function() {
-                $(s,c).corner(options);
-            });
-        }
-        return this;
-    }
-
-    return this.each(function(index){
-        var $this = $(this),
-            // meta values override options
-            o = [$this.attr($.fn.corner.defaults.metaAttr) || '', options || ''].join(' ').toLowerCase(),
-            keep = /keep/.test(o),                       // keep borders?
-            cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]),  // corner color
-            sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]),  // strip color
-            width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10, // corner width
-            re = /round|bevelfold|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dogfold|dog|invsteep|steep/,
-            fx = ((o.match(re)||['round'])[0]),
-            fold = /dogfold|bevelfold/.test(o),
-            edges = { T:0, B:1 },
-            opts = {
-                TL:  /top|tl|left/.test(o),       TR:  /top|tr|right/.test(o),
-                BL:  /bottom|bl|left/.test(o),    BR:  /bottom|br|right/.test(o)
-            },
-            // vars used in func later
-            strip, pad, cssHeight, j, bot, d, ds, bw, i, w, e, c, common, $horz;
-        
-        if ( !opts.TL && !opts.TR && !opts.BL && !opts.BR )
-            opts = { TL:1, TR:1, BL:1, BR:1 };
-            
-        // support native rounding
-        if ($.fn.corner.defaults.useNative && fx == 'round' && (radius || moz || webkit) && !cc && !sc) {
-            if (opts.TL)
-                $this.css(radius ? 'border-top-left-radius' : moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px');
-            if (opts.TR)
-                $this.css(radius ? 'border-top-right-radius' : moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px');
-            if (opts.BL)
-                $this.css(radius ? 'border-bottom-left-radius' : moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px');
-            if (opts.BR)
-                $this.css(radius ? 'border-bottom-right-radius' : moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px');
-            return;
-        }
-            
-        strip = document.createElement('div');
-        $(strip).css({
-            overflow: 'hidden',
-            height: '1px',
-            minHeight: '1px',
-            fontSize: '1px',
-            backgroundColor: sc || 'transparent',
-            borderStyle: 'solid'
-        });
-    
-        pad = {
-            T: parseInt($.css(this,'paddingTop'))||0,     R: parseInt($.css(this,'paddingRight'))||0,
-            B: parseInt($.css(this,'paddingBottom'))||0,  L: parseInt($.css(this,'paddingLeft'))||0
-        };
-
-        if (typeof this.style.zoom != undefined) this.style.zoom = 1; // force 'hasLayout' in IE
-        if (!keep) this.style.border = 'none';
-        strip.style.borderColor = cc || gpc(this.parentNode);
-        cssHeight = $(this).outerHeight();
-
-        for (j in edges) {
-            bot = edges[j];
-            // only add stips if needed
-            if ((bot && (opts.BL || opts.BR)) || (!bot && (opts.TL || opts.TR))) {
-                strip.style.borderStyle = 'none '+(opts[j+'R']?'solid':'none')+' none '+(opts[j+'L']?'solid':'none');
-                d = document.createElement('div');
-                $(d).addClass('jquery-corner');
-                ds = d.style;
-
-                bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild);
-
-                if (bot && cssHeight != 'auto') {
-                    if ($.css(this,'position') == 'static')
-                        this.style.position = 'relative';
-                    ds.position = 'absolute';
-                    ds.bottom = ds.left = ds.padding = ds.margin = '0';
-                    if (expr)
-                        ds.setExpression('width', 'this.parentNode.offsetWidth');
-                    else
-                        ds.width = '100%';
-                }
-                else if (!bot && $.browser.msie) {
-                    if ($.css(this,'position') == 'static')
-                        this.style.position = 'relative';
-                    ds.position = 'absolute';
-                    ds.top = ds.left = ds.right = ds.padding = ds.margin = '0';
-                    
-                    // fix ie6 problem when blocked element has a border width
-                    if (expr) {
-                        bw = sz(this,'borderLeftWidth') + sz(this,'borderRightWidth');
-                        ds.setExpression('width', 'this.parentNode.offsetWidth - '+bw+'+ "px"');
-                    }
-                    else
-                        ds.width = '100%';
-                }
-                else {
-                    ds.position = 'relative';
-                    ds.margin = !bot ? '-'+pad.T+'px -'+pad.R+'px '+(pad.T-width)+'px -'+pad.L+'px' : 
-                                        (pad.B-width)+'px -'+pad.R+'px -'+pad.B+'px -'+pad.L+'px';                
-                }
-
-                for (i=0; i < width; i++) {
-                    w = Math.max(0,getWidth(fx,i, width));
-                    e = strip.cloneNode(false);
-                    e.style.borderWidth = '0 '+(opts[j+'R']?w:0)+'px 0 '+(opts[j+'L']?w:0)+'px';
-                    bot ? d.appendChild(e) : d.insertBefore(e, d.firstChild);
-                }
-                
-                if (fold && $.support.boxModel) {
-                    if (bot && noBottomFold) continue;
-                    for (c in opts) {
-                        if (!opts[c]) continue;
-                        if (bot && (c == 'TL' || c == 'TR')) continue;
-                        if (!bot && (c == 'BL' || c == 'BR')) continue;
-                        
-                        common = { position: 'absolute', border: 'none', margin: 0, padding: 0, overflow: 'hidden', backgroundColor: strip.style.borderColor };
-                        $horz = $('
').css(common).css({ width: width + 'px', height: '1px' });
-                        switch(c) {
-                        case 'TL': $horz.css({ bottom: 0, left: 0 }); break;
-                        case 'TR': $horz.css({ bottom: 0, right: 0 }); break;
-                        case 'BL': $horz.css({ top: 0, left: 0 }); break;
-                        case 'BR': $horz.css({ top: 0, right: 0 }); break;
-                        }
-                        d.appendChild($horz[0]);
-                        
-                        var $vert = $('
').css(common).css({ top: 0, bottom: 0, width: '1px', height: width + 'px' });
-                        switch(c) {
-                        case 'TL': $vert.css({ left: width }); break;
-                        case 'TR': $vert.css({ right: width }); break;
-                        case 'BL': $vert.css({ left: width }); break;
-                        case 'BR': $vert.css({ right: width }); break;
-                        }
-                        d.appendChild($vert[0]);
-                    }
-                }
-            }
-        }
-    });
-};
-
-$.fn.uncorner = function() { 
-    if (radius || moz || webkit)
-        this.css(radius ? 'border-radius' : moz ? '-moz-border-radius' : '-webkit-border-radius', 0);
-    $('div.jquery-corner', this).remove();
-    return this;
-};
-
-// expose options
-$.fn.corner.defaults = {
-    useNative: true, // true if plugin should attempt to use native browser support for border radius rounding
-    metaAttr:  'data-corner' // name of meta attribute to use for options
-};
-    
-})(jQuery);
diff --git a/lib/mergely.js b/lib/mergely.js
index d3bcc96..85a1306 100644
--- a/lib/mergely.js
+++ b/lib/mergely.js
@@ -366,7 +366,7 @@ jQuery.extend(Mgly.mergely.prototype, {
 				var content_height = h;
 				var self = jQuery(el);
 				self.find('.mergely-column').css({ 'width': content_width + 'px' });
-				self.find('.mergely-column, .mergely-canvas, .mergely-margin, .mergely-column textarea, .CodeMirror-scroll').css({ 'height': content_height + 'px' });
+				self.find('.mergely-column, .mergely-canvas, .mergely-margin, .mergely-column textarea, .CodeMirror-scroll, .cm-s-default').css({ 'height': content_height + 'px' });
 				self.find('.mergely-canvas').css({ 'height': content_height + 'px' });
 				self.find('.mergely-column textarea').css({ 'width': content_width + 'px' });
 				self.css({ 'width': w + 'px', 'height': h + 'px' });
@@ -384,7 +384,8 @@ jQuery.extend(Mgly.mergely.prototype, {
 			mode: 'text/plain',
 			readOnly: false,
 			lineWrapping: false,
-			lineNumbers: true
+			lineNumbers: true,
+			gutters: ['merge', 'CodeMirror-linenumbers']
 		}
 		this.lhs_cmsettings = {};
 		this.rhs_cmsettings = {};
@@ -562,14 +563,12 @@ jQuery.extend(Mgly.mergely.prototype, {
 		}
 		else {
 			// homebrew
-			var style = 'width:1em;height:1em;background-color:#888;cursor:pointer;text-align:center;color:#eee;border:1px solid: #222;margin-right:5px;';
+			var style = 'width:1em;height:1em;background-color:#888;cursor:pointer;text-align:center;color:#eee;border:1px solid: #222;margin-right:5px;border-radius:3px;';
 			merge_lhs_button = '
<
';
 			merge_rhs_button = '
>
';
 		}
 		this.merge_rhs_button = jQuery(merge_rhs_button);
 		this.merge_lhs_button = jQuery(merge_lhs_button);
-		if (this.merge_rhs_button.corner) this.merge_rhs_button.corner('3px');
-		if (this.merge_lhs_button.corner) this.merge_lhs_button.corner('3px');
 		
 		// create the textarea and canvas elements
 		jQuery(this.element).append(jQuery('
'));
@@ -590,58 +589,6 @@ jQuery.extend(Mgly.mergely.prototype, {
 		
 		// resize only after bind
 		this.settings.resize();
-		
-		// merge
-		var self = this;
-		var ed = {lhs:this.editor[this.id + '-lhs'], rhs:this.editor[this.id + '-rhs']};
-		jQuery('.merge-button').live('click', function(ev){
-			console.log('lhs hover over', ev, this);
-			// side of mouseenter
-			var side = 'rhs';
-			var oside = 'lhs';
-			var parent = jQuery(this).parents('#' + self.id + '-editor-lhs');
-			if (parent.length) {
-				side = 'lhs';
-				oside = 'rhs';
-			}
-			var pos = ed[side].coordsChar({x:ev.pageX, y:ev.pageY});
-			console.log('pos', side, pos);
-
-			// get the change id
-			var cid = null;
-			var info = ed[side].lineInfo(pos.line);
-			jQuery.each(info.bgClass.split(' '), function(i, clazz) {
-				console.log('clazz', i, clazz);
-				if (clazz.indexOf('cid-') == 0) {
-					cid = parseInt(clazz.split('-')[1]);
-					return false;
-				}
-			});
-			var change = self.changes[cid];
-			console.log('change', change);
-
-			var line = {lhs: ed['lhs'].lineInfo(change['lhs-line-to']), rhs: ed['rhs'].lineInfo(change['rhs-line-to'])};
-			var text = ed[side].getRange(
-				{ 'line': change[side + '-line-from'], 'ch': 0 },
-				{ 'line': change[side + '-line-to'], 'ch': line[side].text.length });
-			
-			if (change['op'] == 'c') {
-				ed[oside].replaceRange( text,
-					{ 'line': change[oside + '-line-from'], 'ch': 0 },
-					{ 'line': change[oside + '-line-to'], 'ch': line[oside].text.length });
-			}
-			else {// 'a' or 'd'
-				var from = parseInt(change[oside + '-line-from']);
-				var to = parseInt(change[oside + '-line-to']);
-				for (var i = to; i >= from; --i) {
-					ed[oside].removeLine(i);
-				}
-			}
-			//reset
-			ed['lhs'].setValue(ed['lhs'].getValue());
-			ed['rhs'].setValue(ed['rhs'].getValue());
-			return false;
-		});
 	},
 	
 	_scrolling: function(editor_name) {
@@ -896,8 +843,20 @@ jQuery.extend(Mgly.mergely.prototype, {
 					cl = clazz + 'lhs end';
 					led.setLineClass(change['lhs-line-to'], null, cl);
 				}
-				
-				if (change['op'] == 'd') {
+
+				if (change['op'] == 'a') {
+					var cl = clazz + 'rhs start';
+					red.setLineClass(change['rhs-line-from'], null, cl);
+					if (change['rhs-line-from'] == change['rhs-line-to']) {
+						cl += ' end';
+						red.setLineClass(change['rhs-line-to'], null, cl);
+					}
+					else {
+						cl = clazz + 'rhs end';
+						red.setLineClass(change['rhs-line-to'], null, cl);
+					}
+				}
+				else if (change['op'] == 'd') {
 					// apply delete to cross-out
 					var from = change['lhs-line-from'];
 					var to = change['lhs-line-to'];
@@ -909,17 +868,17 @@ jQuery.extend(Mgly.mergely.prototype, {
 				}
 				else if (change['op'] == 'c') {
 					// apply LCS changes to each line
-					for (var j = change['lhs-line-from'], k = change['rhs-line-from'], i = 0; 
+					for (var j = change['lhs-line-from'], k = change['rhs-line-from'], p = 0; 
 						 ((j >= 0) && (j <= change['lhs-line-to'])) || ((k >= 0) && (k <= change['rhs-line-to']));
 						 ++j, ++k) {
-						if (k + i > change['rhs-line-to']) {
+						if (k + p > change['rhs-line-to']) {
 							// lhs continues past rhs, mark lhs as deleted
 							var lhs_line = led.getLine( j );
 							var func = led.markText({line:j, ch:0}, {line:j, ch:lhs_line.length}, 'mergely ch d lhs');
 							self.change_funcs.push(func);
 							continue;
 						}
-						if (j + i > change['lhs-line-to']) {
+						if (j + p > change['lhs-line-to']) {
 							// rhs continues past lhs, mark rhs as added
 							var rhs_line = red.getLine( k );
 							var func = led.markText({line:k, ch:0}, {line:k, ch:lhs_line.length}, 'mergely ch a rhs');
@@ -998,9 +957,9 @@ jQuery.extend(Mgly.mergely.prototype, {
 				}
 				
 				// for each line in-between the changed lines, from and to, apply 'bg' class
-				for (var i = change['lhs-line-from'] + 1; i < change['lhs-line-to']; ++i) {
+				for (var j = change['lhs-line-from'] + 1; j < change['lhs-line-to']; ++j) {
 					var cl = clazz + 'lhs';
-					led.setLineClass(i, null, cl);
+					led.setLineClass(j, null, cl);
 				}
 				 
 				// add widgets
@@ -1081,6 +1040,56 @@ jQuery.extend(Mgly.mergely.prototype, {
 				}
 			}
 		});
+		
+		var ed = {lhs:this.editor[this.id + '-lhs'], rhs:this.editor[this.id + '-rhs']};
+		jQuery('.merge-button').on('click', function(ev){
+			// side of mouseenter
+			var side = 'rhs';
+			var oside = 'lhs';
+			var parent = jQuery(this).parents('#' + self.id + '-editor-lhs');
+			if (parent.length) {
+				side = 'lhs';
+				oside = 'rhs';
+			}
+			var pos = ed[side].coordsChar({x:ev.pageX, y:ev.pageY});
+			console.log('pos', side, pos);
+
+			// get the change id
+			var cid = null;
+			var info = ed[side].lineInfo(pos.line);
+			jQuery.each(info.bgClass.split(' '), function(i, clazz) {
+				console.log('clazz', i, clazz);
+				if (clazz.indexOf('cid-') == 0) {
+					cid = parseInt(clazz.split('-')[1]);
+					return false;
+				}
+			});
+			var change = self.changes[cid];
+			console.log('change', change);
+
+			var line = {lhs: ed['lhs'].lineInfo(change['lhs-line-to']), rhs: ed['rhs'].lineInfo(change['rhs-line-to'])};
+			var text = ed[side].getRange(
+				{ 'line': change[side + '-line-from'], 'ch': 0 },
+				{ 'line': change[side + '-line-to'], 'ch': line[side].text.length });
+			
+			if (change['op'] == 'c') {
+				ed[oside].replaceRange( text,
+					{ 'line': change[oside + '-line-from'], 'ch': 0 },
+					{ 'line': change[oside + '-line-to'], 'ch': line[oside].text.length });
+			}
+			else {// 'a' or 'd'
+				var from = parseInt(change[oside + '-line-from']);
+				var to = parseInt(change[oside + '-line-to']);
+				for (var i = to; i >= from; --i) {
+					ed[oside].removeLine(i);
+				}
+			}
+			//reset
+			ed['lhs'].setValue(ed['lhs'].getValue());
+			ed['rhs'].setValue(ed['rhs'].getValue());
+			return false;
+		});
+		
 	},
 	_draw_diff: function(editor_name1, editor_name2, changes) {
 		var visible_page_height = jQuery(this.editor[editor_name1].getScrollerElement()).height();
diff --git a/test/index.html b/test/index.html
index 588dfd1..ac0a951 100755
--- a/test/index.html
+++ b/test/index.html
@@ -3,7 +3,7 @@
     
     
     Tests
-    
+