From 72c6cb59e8e2c55aef6f26c2aff4ca42f57cf4f7 Mon Sep 17 00:00:00 2001
From: Alexis Deveria <adeveria@gmail.com>
Date: Mon, 18 Jan 2010 21:18:46 +0000
Subject: [PATCH] Fixed bug where certain positioned elements could not be
 de-selected

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1242 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svg-editor.js |  5 -----
 editor/svgcanvas.js  | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 1cbe5512..098aabee 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -250,13 +250,10 @@ function svg_edit_setup() {
 		var zoomlevel = z_info.zoom;
 		var bb = z_info.bbox;
 		$('#zoom').val(Math.round(zoomlevel*100));
-		// setResolution(res.w * zoomlevel, res.h * zoomlevel);
-// 		console.log('zoomlevel',zoomlevel)
 		
 		if(autoCenter) {
 			updateCanvas();
 		} else {
-			console.log(bb.x, bb.x * zoomlevel);
 			updateCanvas(false, {x: bb.x * zoomlevel + (bb.width * zoomlevel)/2, y: bb.y * zoomlevel + (bb.height * zoomlevel)/2});
 		}
 
@@ -578,8 +575,6 @@ function svg_edit_setup() {
 		var zoom = svgCanvas.getZoom();
 		var w_area = workarea;
 		
-// 		console.log('y',zoom,(w_area[0].scrollTop + w_area.height()/2)/zoom);
-		
 		zoomChanged(window, {
 			width: 0,
 			height: 0,
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 1b286f85..01b3fcb0 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -998,6 +998,7 @@ function BatchCommand(text) {
 			});
 			var i = curBBoxes.length;
 			while (i--) {
+				if(!rubberBBox.width || !rubberBBox.width) continue;
 				if (Utils.rectsIntersect(rubberBBox, curBBoxes[i].bbox))  {
 					resultList.push(curBBoxes[i].elem);
 				}
@@ -2383,6 +2384,7 @@ function BatchCommand(text) {
 				case "select":
 					started = true;
 					current_resize_mode = "none";
+					
 					if (mouse_target != svgroot) {
 						// if this element is not yet selected, clear selection and select it
 						if (selectedElements.indexOf(mouse_target) == -1) {
@@ -3228,6 +3230,7 @@ function BatchCommand(text) {
 		var current_path_oldd = null;
 		var current_ctrl_pt_drag = -1;
 		var link_control_pts = false;
+		var selected_pts = [];
 	
 		var resetPointGrips = function() {
 			if(!current_path) return;
@@ -3297,10 +3300,15 @@ function BatchCommand(text) {
 		};
 		
 		
-	var addNodeToSelection = function(point) {
+		var addNodeToSelection = function(points) {
 			// Currently only one node can be selected at a time, should allow more later
 			// Should point be the index or the grip element?
 			
+// 			if(!$.isArray(points)) points = [points];
+// 			
+// 			$.merge(selected_pts, points);
+// 			$.unique(selected_pts);
+			
 			var is_closed = pathIsClosed(); 
 			var last_pt = current_path_pts.length/2 - 1;
 			
@@ -3867,6 +3875,11 @@ function BatchCommand(text) {
 					current_path_pt_drag = parseInt(id.substr(14));
 					addNodeToSelection(current_path_pt_drag);
 					updateSegLine();
+					
+// 					if(evt.shiftKey) {
+// 						if(current_path_pt)
+// 					}
+					
 				} else if(id.indexOf("ctrlpointgrip_") == 0) {
 					current_ctrl_pt_drag = id.split('_')[1];
 					var node_num = current_ctrl_pt_drag.split('c')[0]-0;