common/Drawings/ArcTo to function-closure

build/configs/webexcel.json

@@ -11,6 +11,8 @@
         "../common/apiCommon.js",
         "../common/editorscommon.js",
         "../common/NumFormat.js",
+		
+		"../common/Drawings/ArcTo.js",
 
         "../common/Drawings/Format/Constants.js",
 		"../common/Drawings/CommonController.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

@@ -11,6 +11,8 @@
         "../common/apiCommon.js",
         "../common/editorscommon.js",
         "../common/NumFormat.js",
+		
+		"../common/Drawings/ArcTo.js",
 
         "../common/Drawings/Format/Constants.js",
 		"../common/Drawings/CommonController.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

@@ -14,6 +14,8 @@
         "../common/apiCommon.js",
         "../common/editorscommon.js",
         "../common/NumFormat.js",
+		
+		"../common/Drawings/ArcTo.js",
 
         "../common/Drawings/Format/Constants.js",
 		"../common/Drawings/CommonController.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

-/*
- *
- * (c) Copyright Ascensio System Limited 2010-2016
- *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
- *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
- *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
- *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
- *
-*/
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2016
+ *
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ *
+ * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ *
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ *
+ * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic 
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
+ * in every copy of the program you distribute. 
+ * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+*/
 "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;
\ No newline at end of file
+    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;