common/Drawings/ArcTo to function-closure

build/configs/webexcel.json

@@ -12,6 +12,8 @@
         "../common/editorscommon.js",
         "../common/NumFormat.js",
 		
+		"../common/Drawings/ArcTo.js",
+
         "../common/Drawings/Format/Constants.js",
 		"../common/Drawings/CommonController.js",
 		"../common/Drawings/Format/CreateGeometry.js",
@@ -83,7 +85,6 @@
         "../cell/view/EventsController.js",
         "../cell/view/WorkbookView.js",
         "../word/Editor/SerializeCommon.js",
-        "../common/Drawings/ArcTo.js",
         "../common/Drawings/ColorArray.js",
         "../common/Shapes/Serialize.js",
         "../common/Shapes/SerializeWriter.js",

build/configs/webpowerpoint.json

@@ -12,6 +12,8 @@
         "../common/editorscommon.js",
         "../common/NumFormat.js",
 		
+		"../common/Drawings/ArcTo.js",
+
         "../common/Drawings/Format/Constants.js",
 		"../common/Drawings/CommonController.js",
 		"../common/Drawings/Format/CreateGeometry.js",
@@ -82,7 +84,6 @@
         "../common/Shapes/Serialize.js",
         "../common/Shapes/SerializeWriter.js",
         "../word/Editor/SerializeCommon.js",
-        "../common/Drawings/ArcTo.js",
         "../common/Drawings/ColorArray.js",
         "../slide/Editor/Format/Presentation.js",
         "../cell/view/DrawingObjectsController.js",

build/configs/webword.json

@@ -15,6 +15,8 @@
         "../common/editorscommon.js",
         "../common/NumFormat.js",
 		
+		"../common/Drawings/ArcTo.js",
+
         "../common/Drawings/Format/Constants.js",
 		"../common/Drawings/CommonController.js",
 		"../common/Drawings/Format/CreateGeometry.js",
@@ -57,7 +59,6 @@
         "../common/Drawings/TrackObjects/ResizeTracks.js",
         "../common/Drawings/TrackObjects/RotateTracks.js",
         "../common/Drawings/TrackObjects/Spline.js",
-        "../common/Drawings/ArcTo.js",
         "../common/Drawings/ColorArray.js",
         "../common/Drawings/DrawingObjectsHandlers.js",
         "../common/Drawings/Hit.js",

common/Drawings/ArcTo.js

@@ -24,9 +24,6 @@
 */
 "use strict";
 
-var ArcToCurvers = null;
-var ArcToOnCanvas = null;
-var HitToArc = null;
 (function(){
     // arcTo new version
     function Arc3(ctx, fX, fY, fWidth, fHeight, fStartAngle, fSweepAngle)
@@ -213,8 +210,6 @@ var HitToArc = null;
         }
     }
 
-    ArcToCurvers = Arc3;
-
     // ----------------------------------------------------------------------- //
 
     function _ArcToOnCanvas(context, start_x, start_y, width_r, height_r, start_ang, sweep_ang)
@@ -563,7 +558,9 @@ var HitToArc = null;
         }
     }
 
-    ArcToOnCanvas = _ArcToOnCanvas;
-    HitToArc = _HitToArc;
-    // ----------------------------------------------------------------------- //
+    //--------------------------------------------------------export----------------------------------------------------
+    window['AscFormat'] = window['AscFormat'] || {};
+    window['AscFormat'].ArcToCurvers = Arc3;
+    window['AscFormat'].HitToArc = _HitToArc;
+    window['AscFormat'].ArcToOnCanvas = _ArcToOnCanvas;
 })();

common/Drawings/Format/Geometry.js

@@ -30,6 +30,8 @@
 * @param {undefined} undefined
 */
 function (window, undefined) {
+    // Import
+    var ArcToCurvers = AscFormat.ArcToCurvers;
 
 var EPSILON_TEXT_AUTOFIT = 0.001;
 var FORMULA_TYPE_MULT_DIV = 0,

common/Drawings/Format/Path.js

@@ -39,6 +39,9 @@ var moveTo=0,
 
 // Import
 var cToRad = AscFormat.cToRad;
+var HitToArc = AscFormat.HitToArc;
+var ArcToCurvers = AscFormat.ArcToCurvers;
+var ArcToOnCanvas = AscFormat.ArcToOnCanvas;
 
 var cToRad2 = (Math.PI/60000)/180;