common/Drawings/Hit to function-closure

build/configs/webexcel.json

@@ -12,6 +12,7 @@
         "../common/editorscommon.js",
         "../common/NumFormat.js",
 		
+		"../common/Drawings/Hit.js",
 		"../common/Drawings/ArcTo.js",
 		"../common/Drawings/ColorArray.js",
 
@@ -90,7 +91,6 @@
         "../common/Shapes/SerializeWriter.js",
         "../common/SerializeCommonWordExcel.js",
         "../common/SerializeChart.js",
-        "../common/Drawings/Hit.js",
         "../common/Drawings/States.js",
         "../common/Drawings/DrawingObjectsHandlers.js",
         "../common/Drawings/TrackObjects/AdjustmentTracks.js",

build/configs/webpowerpoint.json

@@ -12,6 +12,7 @@
         "../common/editorscommon.js",
         "../common/NumFormat.js",
 		
+		"../common/Drawings/Hit.js",
 		"../common/Drawings/ArcTo.js",
 		"../common/Drawings/ColorArray.js",
 
@@ -65,7 +66,6 @@
         "../word/Editor/Common.js",
         "../word/Editor/Sections.js",
         "../word/Editor/History.js",
-        "../common/Drawings/Hit.js",
         "../common/Drawings/States.js",
         "../common/Drawings/DrawingObjectsHandlers.js",
         "../common/Drawings/TrackObjects/AdjustmentTracks.js",

build/configs/webword.json

@@ -15,6 +15,7 @@
         "../common/editorscommon.js",
         "../common/NumFormat.js",
 		
+		"../common/Drawings/Hit.js",
 		"../common/Drawings/ArcTo.js",
 		"../common/Drawings/ColorArray.js",
 
@@ -61,7 +62,6 @@
         "../common/Drawings/TrackObjects/RotateTracks.js",
         "../common/Drawings/TrackObjects/Spline.js",
         "../common/Drawings/DrawingObjectsHandlers.js",
-        "../common/Drawings/Hit.js",
         "../common/Drawings/Joined.js",
         "../common/Drawings/TextDrawer.js",
         "../word/Editor/GraphicObjects/Format/ShapePrototype.js",

common/Drawings/ArcTo.js

 "use strict";
 
 (function(){
+    // Import
+    var HitInBezier4 = AscFormat.HitInBezier4;
+    
     // arcTo new version
     function Arc3(ctx, fX, fY, fWidth, fHeight, fStartAngle, fSweepAngle)
     {

common/Drawings/Format/Path.js

@@ -18,6 +18,9 @@ var cToRad = AscFormat.cToRad;
 var HitToArc = AscFormat.HitToArc;
 var ArcToCurvers = AscFormat.ArcToCurvers;
 var ArcToOnCanvas = AscFormat.ArcToOnCanvas;
+var HitInLine = AscFormat.HitInLine;
+var HitInBezier4 = AscFormat.HitInBezier4;
+var HitInBezier3 = AscFormat.HitInBezier3;
 
 var cToRad2 = (Math.PI/60000)/180;
 

common/Drawings/Format/Shape.js

@@ -11,7 +11,8 @@ function (window, undefined) {
 var c_oAscSizeRelFromH = AscCommon.c_oAscSizeRelFromH;
 var c_oAscSizeRelFromV = AscCommon.c_oAscSizeRelFromV;
 
-    var checkNormalRotate = AscFormat.checkNormalRotate;
+var checkNormalRotate = AscFormat.checkNormalRotate;
+var HitInLine = AscFormat.HitInLine;
 
 var c_oAscFill = Asc.c_oAscFill;
 

common/Drawings/Hit.js

 "use strict";
 
-
+(function(){
 function HitInLine(context, px, py, x0, y0, x1, y1)
 {
    /* var l = Math.min(x0, x1);
@@ -112,5 +112,9 @@ function HitInBezier3(context, px, py, x0, y0, x1, y1, x2, y2)
     return context.isPointInPath(px, py);
 }
 
-
-
+    //--------------------------------------------------------export----------------------------------------------------
+    window['AscFormat'] = window['AscFormat'] || {};
+    window['AscFormat'].HitInLine = HitInLine;
+    window['AscFormat'].HitInBezier4 = HitInBezier4;
+    window['AscFormat'].HitInBezier3 = HitInBezier3;
+})();

slide/Editor/Format/GraphicFrame.js

@@ -2,6 +2,7 @@
 
 // Import
 var CShape = AscFormat.CShape;
+var HitInLine = AscFormat.HitInLine;
 
 function CGraphicFrame()
 {

word/Editor/ParagraphContent.js

@@ -22,6 +22,8 @@
 // Import
 var g_oTableId = AscCommon.g_oTableId;
 
+var HitInLine = AscFormat.HitInLine;
+
 var c_oAscRelativeFromH = Asc.c_oAscRelativeFromH;
 var c_oAscRelativeFromV = Asc.c_oAscRelativeFromV;