- Скролл

- ClickCount
- Copy/Paste картинок

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

Excel/api.js

@@ -2101,7 +2101,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			
 			asyncImageEndLoaded: function(_image) {
 				var ws = this.wb.getWorksheet();
-				ws.objectRender.asyncImageLoadedEvent(_image);
+				if ( ws.objectRender.asyncImageLoadedEvent )
+					ws.objectRender.asyncImageLoadedEvent(_image);
 			},
 			
 			// Cell interface

Excel/view/EventsController.js

@@ -1060,10 +1060,14 @@
 				
 				// shapes
 				var graphicsInfo = t.handlers.trigger("getGraphicsInfo", coord.x, coord.y);
-				if ( graphicsInfo && graphicsInfo.isShape )
+				if ( graphicsInfo && graphicsInfo.isShape ) {
 					asc["editor"].isStartAddShape = true;
+					t.isFocusDrawingObject = true;
+					t.isSelectDrawingObject = true;
+				}
 				
 				if ( asc["editor"].isStartAddShape ) {
+					event.ClickCount = 1;
 					t.handlers.trigger("shapeMouseDown", event, coord.x, coord.y);
 					return;
 				}
@@ -1334,6 +1338,20 @@
 
 			/** @param event {jQuery.Event} */
 			_onMouseDblClick: function (event) {
+				var t = this;
+				var coord = t._getCoordinates(event);
+			
+				// shapes
+				var graphicsInfo = t.handlers.trigger("getGraphicsInfo", coord.x, coord.y);
+				if ( graphicsInfo && graphicsInfo.isShape )
+					asc["editor"].isStartAddShape = true;
+				
+				if ( asc["editor"].isStartAddShape ) {
+					event.ClickCount = 2;
+					t.handlers.trigger("shapeMouseDown", event, coord.x, coord.y);
+					return;
+				}
+			
 				if (this.handlers.trigger("isGlobalLockEditCell"))
 					return false;
 

Excel/view/WorksheetView.js

@@ -4802,6 +4802,8 @@
 				var oldH = ctxH - this.cellsTop - Math.abs(dy);
 				var y    = this.cellsTop + (dy > 0 && oldH > 0 ? dy : 0);
 				var oldW, x, dx;
+				
+				this.objectRender.setScrollOffset(0, dy * asc_getcvt(1, 0, this._getPPIX()) );
 
 				var widthChanged = Math.max(calcDecades(vr.r2 + 1), 3) !== oldDec;
 				if (widthChanged) {
@@ -4887,7 +4889,9 @@
 				if (this.isCellEditMode && editor) {editor.move(-dx, 0);}
 
 				vr.c1 = start;
-				this._updateVisibleColsCount();
+				this._updateVisibleColsCount();
+				
+				this.objectRender.setScrollOffset( dx * asc_getcvt(1, 0, this._getPPIX()), 0 );
 
 				var oldW = ctxW - this.cellsLeft - Math.abs(dx);
 				var x = this.cellsLeft + (dx > 0 && oldW > 0 ? dx : 0);