common/Drawings/Format/Image to function-closure

build/configs/webexcel.json

@@ -18,6 +18,7 @@
 		"../common/Drawings/Format/Format.js",
 		"../common/Drawings/Format/Shape.js",
 		"../common/Drawings/Format/Path.js",
+		"../common/Drawings/Format/Image.js",
         "../common/Charts/charts.js",
 		
 		"../common/scroll.js",
@@ -95,7 +96,6 @@
         "../common/Drawings/TrackObjects/MoveTracks.js",
         "../common/Drawings/CommonController.js",
         "../common/Drawings/Format/GroupShape.js",
-        "../common/Drawings/Format/Image.js",
         "../common/Drawings/Format/ChartSpace.js",
         "../common/Drawings/Format/ChartFormat.js",
         "../common/Drawings/Format/TextBody.js",

build/configs/webpowerpoint.json

@@ -18,6 +18,7 @@
 		"../common/Drawings/Format/Format.js",
 		"../common/Drawings/Format/Shape.js",
 		"../common/Drawings/Format/Path.js",
+		"../common/Drawings/Format/Image.js",
         "../common/Charts/charts.js",
 		
 		"../common/scroll.js",
@@ -82,7 +83,6 @@
         "../common/Drawings/CommonController.js",
         "../cell/view/DrawingObjectsController.js",
         "../slide/Editor/DrawingObjectsController.js",
-        "../common/Drawings/Format/Image.js",
         "../common/Drawings/Format/GroupShape.js",
         "../common/Drawings/Format/ChartSpace.js",
         "../common/Drawings/Format/ChartFormat.js",

build/configs/webword.json

@@ -21,6 +21,7 @@
 		"../common/Drawings/Format/Format.js",
 		"../common/Drawings/Format/Shape.js",
 		"../common/Drawings/Format/Path.js",
+		"../common/Drawings/Format/Image.js",
         "../common/Charts/charts.js",
 		
 		"../common/scroll.js",
@@ -57,7 +58,6 @@
         "../common/Drawings/DrawingObjectsHandlers.js",
         "../common/Drawings/Hit.js",
         "../common/Drawings/Joined.js",
-        "../common/Drawings/Format/Image.js",
         "../common/Drawings/Format/GroupShape.js",
         "../common/Drawings/Format/ChartSpace.js",
         "../common/Drawings/Format/ChartFormat.js",

cell/model/DrawingObjects/Format/ImagePrototype.js

@@ -2,6 +2,7 @@
 
 // Import
 var CShape = AscFormat.CShape;
+var CImageShape = AscFormat.CImageShape;
 
 CImageShape.prototype.addToDrawingObjects =  CShape.prototype.addToDrawingObjects;
 CImageShape.prototype.setDrawingObjects = CShape.prototype.setDrawingObjects;

common/Charts/DrawingObjects.js

@@ -1777,7 +1777,7 @@ function DrawingObjects() {
 
         if ( graphicObject && ctx ) {
             // Image
-            if ( graphicObject instanceof CImageShape )
+            if ( graphicObject instanceof AscFormat.CImageShape )
                 printImage(graphicObject, ctx, top, left);
             // Shape
             else if ( graphicObject instanceof AscFormat.CShape )
@@ -1793,7 +1793,7 @@ function DrawingObjects() {
         // Print functions
         function printImage(graphicObject, ctx, top, left) {
 
-            if ( (graphicObject instanceof CImageShape) && graphicObject && ctx ) {
+            if ( (graphicObject instanceof AscFormat.CImageShape) && graphicObject && ctx ) {
                 // Save
                 var tx = graphicObject.transform.tx;
                 var ty = graphicObject.transform.ty;
@@ -1872,7 +1872,7 @@ function DrawingObjects() {
                 for ( var i = 0; i < graphicObject.arrGraphicObjects.length; i++ ) {
                     var graphicItem = graphicObject.arrGraphicObjects[i];
 
-                    if ( graphicItem instanceof CImageShape )
+                    if ( graphicItem instanceof AscFormat.CImageShape )
                         printImage(graphicItem, ctx, top, left);
 
                     else if ( graphicItem instanceof AscFormat.CShape )

common/Drawings/CommonController.js

@@ -7011,7 +7011,7 @@ DrawingObjectsController.prototype =
 
     createImage: function(rasterImageId, x, y, extX, extY)
     {
-        var image = new CImageShape();
+        var image = new AscFormat.CImageShape();
         image.setSpPr(new AscFormat.CSpPr());
         image.spPr.setParent(image);
         image.spPr.setGeometry(AscFormat.CreateGeometry("rect"));

common/Drawings/Format/Image.js

 "use strict";
 
+(
+/**
+* @param {Window} window
+* @param {undefined} undefined
+*/
+function (window, undefined) {
 // Import
 var CShape = AscFormat.CShape;
 
@@ -1016,3 +1022,8 @@ CImageShape.prototype =
     {
     }
 };
+
+    //--------------------------------------------------------export----------------------------------------------------
+    window['AscFormat'] = window['AscFormat'] || {};
+    window['AscFormat'].CImageShape = CImageShape;
+})(window);

common/Shapes/Serialize.js

@@ -5168,7 +5168,7 @@ function BinaryPPTYLoader()
     {
         var s = this.stream;
 
-        var pic = new CImageShape(this.TempMainObject);
+        var pic = new AscFormat.CImageShape(this.TempMainObject);
 
         pic.setBDeleted(false);
 

common/editorscommon.js

@@ -2080,7 +2080,7 @@ CTableId.prototype.Read_Class_FromBinary = function(Reader)
         case AscDFH.historyitem_type_Shape                    : Element = new AscFormat.CShape(); break;
         case AscDFH.historyitem_type_DispUnits                : Element = new CDispUnits(); break;
         case AscDFH.historyitem_type_GroupShape               : Element = new CGroupShape(); break;
-        case AscDFH.historyitem_type_ImageShape               : Element = new CImageShape(); break;
+        case AscDFH.historyitem_type_ImageShape               : Element = new AscFormat.CImageShape(); break;
         case AscDFH.historyitem_type_Geometry                 : Element = new AscFormat.Geometry(); break;
         case AscDFH.historyitem_type_Path                     : Element = new AscFormat.Path(); break;
         case AscDFH.historyitem_type_TextBody                 : Element = new CTextBody(); break;

common/wordcopypaste.js

@@ -2014,7 +2014,7 @@ CopyProcessor.prototype =
             {
                 this.oPresentationWriter.WriteShape(oGraphicObj);
             }
-            else if(oGraphicObj instanceof CImageShape)
+            else if(oGraphicObj instanceof AscFormat.CImageShape)
             {
                 this.oPresentationWriter.WriteImage(oGraphicObj);
             }

slide/Editor/Format/ImagePrototype.js

@@ -2,6 +2,7 @@
 
 // Import
 var CShape = AscFormat.CShape;
+var CImageShape = AscFormat.CImageShape;
 
 CImageShape.prototype.addToDrawingObjects =  CShape.prototype.addToDrawingObjects;
 CImageShape.prototype.setDrawingObjects = CShape.prototype.setDrawingObjects;

slide/Editor/Format/Slide.js

@@ -221,7 +221,7 @@ Slide.prototype =
                     _index = _glyph.nvSpPr.nvPr.ph.idx;
                     _type = _glyph.nvSpPr.nvPr.ph.type;
                 }
-                if(_glyph instanceof CImageShape)
+                if(_glyph instanceof AscFormat.CImageShape)
                 {
                     _index = _glyph.nvPicPr.nvPr.ph.idx;
                     _type = _glyph.nvPicPr.nvPr.ph.type;
@@ -284,7 +284,7 @@ Slide.prototype =
                     {
                         _type = _glyph.nvSpPr.nvPr.ph.type;
                     }
-                    if(_glyph instanceof CImageShape)
+                    if(_glyph instanceof AscFormat.CImageShape)
                     {
                         _type = _glyph.nvPicPr.nvPr.ph.type;
                     }

word/Editor/GraphicObjects/Format/ImagePrototype.js

@@ -2,6 +2,7 @@
 
 // Import
 var CShape = AscFormat.CShape;
+var CImageShape = AscFormat.CImageShape;
 
 CImageShape.prototype.Get_Theme = CShape.prototype.Get_Theme;
 CImageShape.prototype.Get_ColorMap = CShape.prototype.Get_ColorMap;

word/Editor/SerializeCommon.js

@@ -436,7 +436,7 @@ function CPPTXContentLoader()
     {
         var s = this.stream;
 
-        var pic = new CImageShape();
+        var pic = new AscFormat.CImageShape();
         pic.setBDeleted(false);
         pic.setParent(this.TempMainObject == null ? this.ParaDrawing : null);