patch bililiteRange to use selectionTracker, hopefully corrrectly thi…

…s time

bililiteRange.ex.js

@@ -82,7 +82,6 @@ newline: function(line, select){
 bililiteRange.ex = {}; // namespace for exporting utility functions
 
 bililiteRange.fn.ex = function (commandstring, defaultaddress){
-	console.log('ex ',commandstring, this.bounds());
 	this.exMessage = '';
 	var state = this.exState();
 	// default address is generally the current line; 'bounds' means use the current bounds. '%' means the entire text
@@ -98,7 +97,6 @@ bililiteRange.fn.ex = function (commandstring, defaultaddress){
 		parsed.command.call(this, parsed.parameter, parsed.variant);
 		this.dispatch({type: 'excommand', command: command, range: this});
 	}, this);	
-	console.log('after ex ', this.bounds());
 	return this; // allow for chaining
 };
 

jquery.sendkeys.js

@@ -122,29 +122,33 @@ $.fn.selectionTracker = function(bounds){
 		});
 	}
 	if (arguments.length > 0) rng.bounds(bounds); // change the saved selection without actually selecting
-	console.log(rng.bounds());
 	if (document.activeElement == this[0]) rng.select(); // explicitly select it if already active
 	return rng;
 }
 
 // monkey patch bililiteRange to reflect the saved range
-var select = bililiteRange.fn.select;
+var oldselect = bililiteRange.fn.select;
 bililiteRange.fn.select = function(){
 	var $el = $(this.element());
-	if ($el.data('selectionTracker')) $el.selectionTracker(this.bounds());
-	return select.apply(this, arguments);
+	if (
+		$el.data('selectionTracker') && 
+		document.activeElement != $el[0]
+	){
+		$el.selectionTracker(this.bounds());
+	}
+	return oldselect.apply(this, arguments);
 };
-var bounds = bililiteRange.fn.bounds;
+var oldbounds = bililiteRange.fn.bounds;
 bililiteRange.fn.bounds = function(bounds){
 	var $el = $(this.element());
 	if (
 		$el.data('selectionTracker') && // if we are tracking the selection
 		document.activeElement != $el[0] && // and the real selection isn't here
 		bounds == 'selection' // and we want the selection anyway
 	){
-		return this.bounds($el.selectionTracker().bounds()); // use the saved selection
+		bounds = $el.selectionTracker().bounds(); // use the saved selection
 	}
-	return bounds.apply(this, arguments);
+	return oldbounds.call(this, bounds);
 }
 
 // monkey patch focus to actually focus the element, on the saved range

jquery.vi.js

@@ -24,8 +24,7 @@ $.fn.vi = function(statusbar){
 function executeCommand (rng, command){
 	// returns a function that will run command (if not defined, then will run whatever command is passed in when executed)
 	return function (text){
-		rng.selectionTracker().ex(command || text, 'bounds').scrollIntoView();
-		console.log('after executeCommand', rng.bounds());
+		rng.bounds('selection').ex(command || text, 'bounds').scrollIntoView();
 		return rng.exMessage;
 	};
 }