GlobalLoaders.js берётся из Excel\model\DrawingObjects\

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47874 954022d7-b5bf-4e40-9824-e11837661b57

Build/sdk_configs/webexcel.json

@@ -32,7 +32,6 @@
                 "../Word/Drawing/Graphics.js",
                 "../Word/Drawing/Metafile.js",
                 "../Word/Drawing/AllFonts.js",
-                "../Word/Drawing/GlobalLoaders.js",
                 "../Common/FontsFreeType/FontExport.js",
                 "../Excel/offlinedocs/test-workbook9/Editor.js",
                 "../Excel/offlinedocs/empty-workbook.js",
@@ -129,6 +128,7 @@
 				"../Excel/model/DrawingObjects/Graphics.js",
 				"../Excel/model/DrawingObjects/Overlay.js",
 				"../Excel/model/DrawingObjects/GlobalCounters.js",
+				"../Excel/model/DrawingObjects/GlobalLoaders.js",
 				"../Excel/model/DrawingObjects/DrawingDocument.js",
                 "../Word/apiCommon.js",
                 "../Excel/.build/Log/apiCommonExport.js",

Common/Charts/DrawingObjects.js

@@ -3256,9 +3256,8 @@ function DrawingObjects() {
 			
 				if ( !_image.Image ) {
 					worksheet.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.UplImageUrl, c_oAscError.Level.NoCritical);
-					return;
 				}
-
+				else {
 					var obj = _this.createDrawingObject();
 					obj.id = generateId();
 					obj.worksheet = worksheet;
@@ -3298,10 +3297,11 @@ function DrawingObjects() {
 					_this.showDrawingObjects(false);
 					
 					// History.Create_NewPoint();
-				// var copyObject = _this.cloneDrawingObject(obj);
-				// History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Add, worksheet.model.getId(), null, copyObject);
+					// History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Add, worksheet.model.getId(), null, obj);
 					
 					_this.lockDrawingObject(obj.id, bPackage ? false : true, bPackage ? false : true);
+				}
+				
 				worksheet.model.workbook.handlers.trigger("asc_onEndAction", c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
 			}
 			

Excel/index.html

@@ -120,7 +120,7 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Externals.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Metafile.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/AllFonts.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/GlobalLoaders.js"></script>
+	<!--<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/GlobalLoaders.js"></script>-->
 
 	<script type="text/javascript" src="../../../../OfficeWeb/Excel/utils/utils.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/ConditionalFormatting.js"></script>
@@ -227,6 +227,7 @@
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/DrawingObjectsController.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/DrawingDocument.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/States.js"></script>
+	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/GlobalLoaders.js"></script>
 		
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/GroupShape.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Image.js"></script>