From 473d21f8a445e5c357cc8d0a22f3261448f18fbc Mon Sep 17 00:00:00 2001
From: "Alexander.Trofimov" <Alexander.Trofimov@onlyoffice.com>
Date: Thu, 21 Apr 2016 15:06:43 +0300
Subject: [PATCH] common/Drawings/Format/Shape to function-closure

---
 apps/documenteditor/main/index.html     | 21 +++++++++++++--------
 apps/presentationeditor/main/index.html | 15 ++++++++++-----
 apps/spreadsheeteditor/main/index.html  | 14 +++++++++-----
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index ec791a623..b3cdb6feb 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -250,16 +250,26 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
+	
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
+	
+	<!-- For chart editor -->
+	<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
+	
+	<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Scrolls/iscroll.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
 	
-	<!-- For chart editor -->
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
@@ -293,14 +303,11 @@
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Joined.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Math.js"></script>
 
-    <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
@@ -358,7 +365,6 @@
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Scrolls/iscroll.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
@@ -370,7 +376,6 @@
 	<script type="text/javascript" src="../../../../sdkjs/word/api.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/apiExport.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/word/document/empty.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
 
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 87f308a0a..c591502ae 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -247,6 +247,16 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
+	
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
+	
+	<!-- For chart editor -->
+	<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
+	
+	<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
@@ -267,7 +277,6 @@
     <script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
 
-    <script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
@@ -290,7 +299,6 @@
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
 
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
 
@@ -314,7 +322,6 @@
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/HtmlPage.js"></script>
 
-    <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/themes/Themes.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
@@ -329,11 +336,9 @@
     <script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
     <script src="../../../../sdkjs/slide/Editor/DrawingObjectsController.js"></script>
 
-    <script src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
-    <script src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index eedc277b0..183101ae8 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -250,15 +250,22 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
+	
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
+	
+	<!-- For chart editor -->
+	<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
 	
+	<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
 	
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
 
@@ -348,12 +355,9 @@
 
     <script src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
 	
-    <script src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
-    <script src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
-    <script src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
     <script src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>