Перенес Overlay.js в common

build/configs/nativeword.json

@@ -112,7 +112,7 @@
                 "../word/Editor/FontClassification.js",
                 "../word/Editor/Spelling.js",
                 "../word/Drawing/Graphics.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../word/Drawing/HatchPattern.js",
 
                 "../word/Drawing/Metafile.js",

build/configs/webexcel.json

@@ -107,7 +107,7 @@
                 "../common/wordcopypaste.js",
                 "../cell/view/DrawingObjectsController.js",
                 "../cell/model/DrawingObjects/Graphics.js",
-                "../cell/model/DrawingObjects/Overlay.js",
+                "../common/Overlay.js",
                 "../common/Controls.js",
                 "../cell/model/DrawingObjects/ShapeDrawer.js",
                 "../cell/model/DrawingObjects/DrawingDocument.js",

build/configs/webpowerpoint.json

@@ -65,7 +65,7 @@
                 "../common/Drawings/TrackObjects/MoveTracks.js",
                 "../word/Drawing/HatchPattern.js",
                 "../word/Drawing/Graphics.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../word/Drawing/ShapeDrawer.js",
                 "../slide/Drawing/Transitions.js",
                 "../slide/Drawing/DrawingDocument.js",
@@ -171,7 +171,7 @@
             "exclude_mobile": [
                 "../common/browser.js",
                 "../word/Drawing/ShapeDrawer.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../slide/Drawing/HtmlPage.js",
                 "../slide/Drawing/DrawingDocument.js"
             ],

build/configs/webword.json

@@ -103,7 +103,7 @@
                 "../word/Editor/FontClassification.js",
                 "../word/Editor/Spelling.js",
                 "../word/Drawing/Graphics.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../word/Drawing/HatchPattern.js",
                 "../word/Drawing/ShapeDrawer.js",
                 "../word/Drawing/Metafile.js",
@@ -158,8 +158,7 @@
                 "../common/Local/common.js",
                 "../word/Local/api.js"
             ],
-            "exclude_mobile": [
-            ],
+            "exclude_mobile": [],
             "dst": "../word/sdk-all.js",
             "externs": [
                 "../common/Build/Externs.js",

cell/model/DrawingObjects/DrawingDocument.js

@@ -4866,4 +4866,26 @@ function CDrawingDocument(drawingObjects)
         if (this.m_oWordControl && this.m_oWordControl.MobileTouchManager)
             this.m_oWordControl.MobileTouchManager.CheckSelectEnd(false);
     }
-}
\ No newline at end of file
+}
+
+// заглушка
+function CHtmlPage()
+{
+    this.drawingPage = { top: 0, left: 0, right: 0, bottom: 0 };
+    this.width_mm = 0;
+    this.height_mm = 0;
+}
+
+CHtmlPage.prototype.init = function(x, y, w_pix, h_pix, w_mm, h_mm) {
+    this.drawingPage.top = y;
+    this.drawingPage.left = x;
+    this.drawingPage.right = w_pix;
+    this.drawingPage.bottom = h_pix;
+    this.width_mm = w_mm;
+    this.height_mm = h_mm;
+};
+
+CHtmlPage.prototype.GetDrawingPageInfo = function() {
+
+    return { drawingPage: this.drawingPage, width_mm: this.width_mm, height_mm: this.height_mm };
+};
\ No newline at end of file

common/Charts/DrawingArea.js

-"use strict";
+"use strict";
 
 //-----------------------------------------------------------------------------------
 // Drawing area manager
@@ -536,7 +536,7 @@ function FrozenPlace(ws, type) {
 		_this.restore(canvas.shapeCtx);
 	};
 	
-	_this.setTransform = function(shapeCtx, shapeOverlayCtx, autoShapeTrack) {
+	_this.setTransform = function(shapeCtx, shapeOverlayCtx, autoShapeTrack, trackOverlay) {
 		
 		if ( shapeCtx && shapeOverlayCtx && autoShapeTrack ) {
 			
@@ -556,6 +556,15 @@ function FrozenPlace(ws, type) {
 			autoShapeTrack.Graphics.CalculateFullTransform();
             _this.worksheet.objectRender.controller.recalculateCurPos();
 		}
+        if(trackOverlay && trackOverlay.m_oHtmlPage)
+        {
+            var width = trackOverlay.m_oHtmlPage.drawingPage.right -  trackOverlay.m_oHtmlPage.drawingPage.left;
+            var height = trackOverlay.m_oHtmlPage.drawingPage.bottom -  trackOverlay.m_oHtmlPage.drawingPage.top;
+            trackOverlay.m_oHtmlPage.drawingPage.left = x;
+            trackOverlay.m_oHtmlPage.drawingPage.top  = y;
+            trackOverlay.m_oHtmlPage.drawingPage.right = x + width;
+            trackOverlay.m_oHtmlPage.drawingPage.bottom  = y + height;
+        }
 	};
 	
 	// Range constructor	
@@ -658,7 +667,7 @@ DrawingArea.prototype.drawSelection = function(drawingDocument) {
     }
     for ( var i = 0; i < this.frozenPlaces.length; i++ ) {
 
-        this.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack);
+        this.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack, trackOverlay);
 
         // Clip
         this.frozenPlaces[i].clip(shapeOverlayCtx);