git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51466 954022d7-b5bf-4e40-9824-e11837661b57

Common/Charts/DrawingObjects.js

@@ -4722,6 +4722,8 @@ function DrawingObjects() {
 	}
 	
 	_this.graphicObjectMouseUp = function(e, x, y) {
+		if ( e.fromWindow && !CheckIdTrackState(_this.controller.curState.id) )
+			return;
 		_this.controller.onMouseUp( e, pxToMm(x - scrollOffset.getX()), pxToMm(y - scrollOffset.getY()) );
 	}
 	

Excel/model/DrawingObjects/States.js

@@ -61,11 +61,27 @@ ADD_SHAPE_ID_MAP[STATES_ID_ADD_PPOLY_LINE2] = true;
 ADD_SHAPE_ID_MAP[STATES_ID_ADD_PPOLY_LINE22] = true;
 ADD_SHAPE_ID_MAP[STATES_ID_ADD_PPOLY_LINE23] = true;
 
+var TRACK_SHAPE_MAP = {};
+TRACK_SHAPE_MAP[STATES_ID_ROTATE] = true;
+TRACK_SHAPE_MAP[STATES_ID_RESIZE] = true;
+TRACK_SHAPE_MAP[STATES_ID_MOVE] = true;
+TRACK_SHAPE_MAP[STATES_ID_CHANGE_ADJ] = true;
+TRACK_SHAPE_MAP[STATES_ID_CHANGE_ADJ_IN_GROUP] = true;
+TRACK_SHAPE_MAP[STATES_ID_ROTATE_IN_GROUP] = true;
+TRACK_SHAPE_MAP[STATES_ID_RESIZE_IN_GROUP] = true;
+TRACK_SHAPE_MAP[STATES_ID_MOVE_IN_GROUP] = true;
+TRACK_SHAPE_MAP[STATES_ID_MOVE_INTERNAL_CHART_OBJECT] = true;
+
 function CheckIdSatetShapeAdd(id)
 {
 	return ADD_SHAPE_ID_MAP[id] === true;
 }
 
+function CheckIdTrackState(id)
+{
+	return CheckIdSatetShapeAdd(id) || (TRACK_SHAPE_MAP[id] === true);
+}
+
 var asc = window["Asc"] ? window["Asc"] : (window["Asc"] = {});
 
 function NullState(drawingObjectsController, drawingObjects)

Excel/view/EventsController.js

@@ -990,6 +990,7 @@
 				// Shapes
 				var coord = this._getCoordinates(event);
 				if ( asc["editor"].isStartAddShape ) {
+					event.fromWindow = true;
 					this.handlers.trigger("graphicObjectMouseUp", event, coord.x, coord.y);
 					this._changeSelectionDone(event);
 					return true;