keyboard events

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

Common/Charts/DrawingObjects.js

@@ -2062,6 +2062,7 @@ function DrawingObjects() {
 	
 	var trackOverlay = null;
 	var autoShapeTrack = null;
+	var hitCanvasContext = null;
 	var scrollOffset = { x: 0, y: 0 };
 	
 	var aObjects = null;
@@ -2129,6 +2130,26 @@ function DrawingObjects() {
 				window.attachEvent("onmessage", this._uploadMessage);
 			}
 		}
+		
+		/*var hitCanvasId = "ws-hit-canvas";
+		var hitCanvas = document.getElementById(hitCanvasId);
+		
+		if ( !hitCanvas ) {
+			var wbWidget = $("#wb-widget");
+			var hitCanvas = document.createElement('canvas');
+			
+			$(hitCanvas).attr("id", hitCanvasId);			
+			$(hitCanvas).css( "top", wbWidget.css("top") );
+			$(hitCanvas).css( "left", wbWidget.css("left") );
+			$(hitCanvas).css( "width", wbWidget.css("width") );
+			$(hitCanvas).css( "height", wbWidget.css("height") );
+			$(hitCanvas).css( "position", wbWidget.css("position") );
+			
+			$("#wb-widget").append($(hitCanvas));
+			hitCanvasContext = hitCanvas.getContext("2d");
+		}
+		else
+			hitCanvasContext = hitCanvas.getContext("2d");*/
 	}
 	
 	_this.getWorkbook = function() {
@@ -2137,6 +2158,7 @@ function DrawingObjects() {
 	
 	_this.getCanvasContext = function() {
         return shapeCtx.m_oContext;
+		//return hitCanvasContext;
     }
 	
 	_this.getDrawingObjects = function() {
@@ -2593,6 +2615,7 @@ function DrawingObjects() {
 
         _t.getCanvasContext = function() {
             return shapeCtx.m_oContext;
+			//return hitCanvasContext;
         }
 
 		// Считаем From/To исходя из graphicObject
@@ -3978,16 +4001,16 @@ function DrawingObjects() {
 		
 		if ( shapeCtx || shapeOverlayCtx ) {
 		
-			scrollOffset.x = x_px;
-			scrollOffset.y = y_px;
+			scrollOffset.x -= x_px;
+			scrollOffset.y -= y_px;
 			
 			shapeCtx.m_oCoordTransform.tx -= x_px;
 			shapeCtx.m_oCoordTransform.ty -= y_px;
 			shapeCtx.CalculateFullTransform();
 			
-			//shapeOverlayCtx.m_oCoordTransform.tx -= x_px;
-			//shapeOverlayCtx.m_oCoordTransform.ty -= y_px;
-			//shapeOverlayCtx.CalculateFullTransform();
+			shapeOverlayCtx.m_oCoordTransform.tx -= x_px;
+			shapeOverlayCtx.m_oCoordTransform.ty -= y_px;
+			shapeOverlayCtx.CalculateFullTransform();
 			
 			autoShapeTrack.Graphics.m_oCoordTransform.tx -= x_px;
 			autoShapeTrack.Graphics.m_oCoordTransform.ty -= y_px;
@@ -4002,6 +4025,15 @@ function DrawingObjects() {
 		return val * ascCvtRatio(from, to);
 	}
 	
+	_this.getSelectedGraphicObjects = function() {
+		var selArray = [];
+		for (var i = 0; i < aObjects.length; i++) {
+			if ( aObjects[i].isGraphicObject() && aObjects[i].graphicObject.selected )
+				selArray.push(aObjects[i]);
+		}
+		return selArray;
+	}
+	
 	//-----------------------------------------------------------------------------------
 	// Graphic object mouse events
 	//-----------------------------------------------------------------------------------

Excel/SpreadsheetTestMenu.html

@@ -161,6 +161,7 @@
 		<script src="model/DrawingObjects/Overlay.js"></script>
 		<script src="model/DrawingObjects/Controls.js"></script>
 		<script src="model/DrawingObjects/DrawingObjectsController.js"></script>
+		<script src="model/DrawingObjects/DrawingDocument.js"></script>
 		<script src="model/DrawingObjects/States.js"></script>
 		<script src="model/DrawingObjects/GlobalLoaders.js"></script>
 		

Excel/menu/styles/MenuStyle.css

@@ -972,7 +972,7 @@ input, textarea {outline:none;}
 	background-position: 0px 0px;
 }
 
-.FixedArea { background: url(../img/Table_Merge.png) no-repeat scroll 0 0 transparent); }
+.FixedArea { background: url(../img/Table_Merge.png) no-repeat scroll 0 0 transparent; }
 
 .FixedAreaClean { background: url(../img/Table_MergeDisable.png) no-repeat scroll 0 0 transparent; }
 

Excel/view/EventsController.js

@@ -614,6 +614,12 @@
 				if (event.which === 18) {
 					t.lastKeyCode = event.which;
 				}
+				
+				var graphicObjects = t.handlers.trigger("getSelectedGraphicObjects");
+				if ( graphicObjects.length ) {
+					t.handlers.trigger("shapeWindowKeyDown", event);
+					return true;
+				}
 
 				// Двигаемся ли мы в выделенной области
 				var selectionActivePointChanged = false;

Excel/view/WorkbookView.js

@@ -199,10 +199,12 @@
 					"isGlobalLockEditCell":		function () {return self.collaborativeEditing.getGlobalLockEditCell();},
 					
 					// shapes
-					"shapeMouseDown":			function () {self._onShapeMouseDown.apply(self, arguments);},
-					"shapeMouseMove":			function () {self._onShapeMouseMove.apply(self, arguments);},
-					"shapeMouseUp":				function () {self._onShapeMouseUp.apply(self, arguments);},
-					"getGraphicsInfo":			function () {return self._onGetGraphicsInfo.apply(self, arguments);}
+					"shapeMouseDown":				function () {self._onShapeMouseDown.apply(self, arguments);},
+					"shapeMouseMove":				function () {self._onShapeMouseMove.apply(self, arguments);},
+					"shapeMouseUp":					function () {self._onShapeMouseUp.apply(self, arguments);},
+					"shapeWindowKeyDown":			function () {self._onShapeWindowKeyDown.apply(self, arguments);},
+					"getGraphicsInfo":				function () {return self._onGetGraphicsInfo.apply(self, arguments);},
+					"getSelectedGraphicObjects":	function () {return self._onGetSelectedGraphicObjects.apply(self, arguments);},
 				});
 
 				this.model.handlers.add("cleanCellCache", function (wsId, range, canChangeColWidth) {
@@ -672,11 +674,21 @@
 				ws.objectRender.shapeMouseUp(e, x, y);
 			},
 			
+			_onShapeWindowKeyDown: function (e) {
+				var ws = this.getWorksheet();
+				ws.objectRender.controller.onKeyDown(e);
+			},
+			
 			_onGetGraphicsInfo: function (x, y) {
 				var ws = this.getWorksheet();
 				return ws.objectRender.checkCursorDrawingObject(x, y);
 			},
 			
+			_onGetSelectedGraphicObjects: function () {
+				var ws = this.getWorksheet();
+				return ws.objectRender.getSelectedGraphicObjects();
+			},
+			
 			_onMouseDblClick: function (x, y, isHideCursor, isCoord, callback) {
 				var res = false;
 				var ws = this.getWorksheet();