Merge branch 'develop' into feature/cell-formatastable

# Conflicts:
#	cell/apiDefines.js
#	cell/model/Workbook.js
#	cell/view/WorksheetView.js
#	common/editorscommon.js

build/Gruntfile.js

@@ -92,18 +92,6 @@ module.exports = function(grunt) {
 
 	grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']);
 	
-  grunt.registerTask('add_build_number', function() {
-    var pkg = grunt.file.readJSON(defaultConfig);
-
-    if(undefined !== process.env['BUILD_NUMBER']) {
-      grunt.log.ok('Use Jenkins build number as sdk-all build number!'.yellow);
-      packageFile['info']['build'] = parseInt(process.env['BUILD_NUMBER']);
-      pkg.info.build = packageFile['info']['build'];
-      packageFile['info']['rev'] = process.env['GIT_COMMIT'];
-      grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4));
-    }
-  });
-	
 	grunt.registerTask('compile_sdk_init', function(compilation_level) {
 		grunt.file.mkdir( packageFile['compile']['sdk']['log'] );
 		var map_file_path = packageFile['compile']['sdk']['dst'] + '.map';
@@ -182,9 +170,8 @@ module.exports = function(grunt) {
 				version: {
 					options: {
 						variables: {
-							Version: packageFile['info']['version'],
-							Build: packageFile['info']['build'].toString(),
-							Rev: (packageFile['info']['rev'] || 1).toString()
+							Version: process.env['PRODUCT_VERSION'],
+							Build: process.env['BUILD_NUMBER']
 						}
 					},
 					files: {

build/configs/nativeword.json

 {
-    "info": {
-        "version": "3.6.0",
-        "build": 163
-    },
-    "update_src": {
-        "revision": "HEAD",
-        "src": "../common ../word"
-    },
     "compile": {
         "sdk": {
             "src": [
@@ -184,7 +176,6 @@
     },
     "tasks": {
         "build": [
-            "increment_build",
             "compile_sdk_native"
         ]
     }

build/configs/webexcel.json

 {
-    "info": {
-        "version": "3.8.0",
-        "build": 148
-    },
-    "update_src": {
-        "revision": "HEAD",
-        "src": "../common ../word ../cell ../slide"
-    },
     "compile": {
         "sdk": {
             "common": [
                 "../common/Build/License.js",
                 "../common/browser.js",
+				"../common/commonDefines.js",
+				"../common/downloaderfiles.js",
                 "../common/docscoapicommon.js",
                 "../common/docscoapi.js",
-                "../common/downloaderfiles.js",
                 "../common/apiCommon.js",
-                "../common/commonDefines.js",
 				"../common/editorscommon.js",
+				
+				"../cell/apiDefines.js",
                 "../common/NumFormat.js",
                 "../common/Charts/charts.js",
                 "../common/Charts/DrawingArea.js",
@@ -33,9 +27,9 @@
                 "../word/Drawing/Externals.js",
                 "../word/Drawing/Metafile.js",
                 "../common/GlobalLoaders.js",
-                "../cell/apiDefines.js",
                 "../cell/document/empty-workbook.js",
                 "../cell/utils/utils.js",
+				"../cell/model/UndoRedo.js",
                 "../cell/model/clipboard.js",
                 "../cell/model/autofilters.js",
                 "../cell/graphics/DrawingContext.js",
@@ -61,7 +55,6 @@
                 "../cell/model/CellInfo.js",
                 "../common/AdvancedOptions.js",
                 "../cell/model/History.js",
-                "../cell/model/UndoRedo.js",
                 "../cell/model/CellComment.js",
                 "../cell/view/mobileTouch.js",
                 "../cell/view/iscroll.js",
@@ -199,7 +192,6 @@
     },
     "tasks": {
         "build": [
-            "add_build_number",
             "compile_sdk"
         ]
     }

build/configs/webpowerpoint.json

 {
-    "info": {
-        "version": "3.8.0",
-        "build": 158
-    },
-    "update_src": {
-        "revision": "HEAD",
-        "src": "../common ../word ../slide"
-    },
     "compile": {
         "sdk": {
             "common": [
                 "../common/Build/License.js",
                 "../common/browser.js",
+				"../common/commonDefines.js",
+				"../common/downloaderfiles.js",
+				"../common/docscoapicommon.js",
+                "../common/docscoapi.js",
+				"../common/apiCommon.js",
+				"../common/editorscommon.js",
+				
+				"../slide/apiDefines.js",
+				"../common/wordcopypaste.js",
                 "../common/FontsFreeType/font_engine.js",
                 "../common/FontsFreeType/FontFile.js",
                 "../common/FontsFreeType/FontManager.js",
                 "../common/FontsFreeType/font_map.js",
                 "../word/Drawing/Externals.js",
                 "../common/GlobalLoaders.js",
-                "../common/commonDefines.js",
-                "../common/apiCommon.js",
-                "../common/downloaderfiles.js",
-                "../common/docscoapicommon.js",
-                "../common/docscoapi.js",
-                "../common/wordcopypaste.js",
-                "../common/editorscommon.js",
                 "../slide/Drawing/ThemeLoader.js",
                 "../common/Charts/DrawingObjects.js",
                 "../common/SerializeCommonWordExcel.js",
@@ -70,7 +64,6 @@
                 "../slide/Drawing/Transitions.js",
                 "../slide/Drawing/DrawingDocument.js",
                 "../slide/Drawing/HtmlPage.js",
-                "../slide/apiDefines.js",
                 "../common/Drawings/Format/Constants.js",
                 "../common/Shapes/Serialize.js",
                 "../common/Shapes/SerializeWriter.js",
@@ -204,7 +197,6 @@
     },
     "tasks": {
         "build": [
-            "add_build_number",
             "compile_sdk"
         ]
     }

build/configs/webword.json

 {
-    "info": {
-        "version": "3.8.0",
-        "build": 167
-    },
-    "update_src": {
-        "revision": "HEAD",
-        "src": "../common ../word"
-    },
     "compile": {
         "sdk": {
             "common": [
                 "../common/Build/License.js",
                 "../common/browser.js",
+				"../common/commonDefines.js",
+				"../common/downloaderfiles.js",
                 "../common/docscoapicommon.js",
                 "../common/docscoapi.js",
                 "../common/apiCommon.js",
+				"../common/editorscommon.js",
+				
+				"../word/apiDefines.js",
                 "../common/spellcheckapi.js",
                 "../common/wordcopypaste.js",
                 "../common/spellCheckLanguage.js",
                 "../common/spellCheckLanguagesAll.js",
-                "../common/downloaderfiles.js",
-                "../common/commonDefines.js",
-                "../common/editorscommon.js",
                 "../common/Shapes/Serialize.js",
                 "../common/Shapes/SerializeWriter.js",
                 "../common/SerializeCommonWordExcel.js",
@@ -118,7 +112,6 @@
                 "../word/Drawing/documentrenderer.js",
                 "../common/scroll.js",
                 "../word/Editor/SerializeCommon.js",
-                "../word/apiDefines.js",
                 "../common/apiBase.js",
                 "../word/api.js",
                 "../word/apiCommon.js",
@@ -187,7 +180,6 @@
     },
     "tasks": {
         "build": [
-            "add_build_number",
             "compile_sdk"
         ]
     }

cell/.unit-tests/FormulaTests.html

@@ -5,7 +5,7 @@
 
 		<title>Unit Tests</title>
 
-		<script type="text/javascript" src="../jquery/jquery-1.7.1.js"></script>
+		<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
 
 		<link rel="stylesheet" href="qunit/qunit-1.11.0.css" type="text/css" media="screen" />
 		<script type="text/javascript" src="qunit/qunit-1.11.0.js"></script>
@@ -31,6 +31,7 @@
         <script type="text/javascript" src="../../Common/NumFormat.js"></script>
 		<script type="text/javascript" src="../../Common/editorscommon.js"></script>
 		<script type="text/javascript" src="../../Common/apiCommon.js"></script>
+		<script type="text/javascript" src="../apiDefines.js"></script>
 
 		<script type="text/javascript" src="../../Common/FontsFreeType/font_engine.js"></script>
 		<script type="text/javascript" src="../../Common/FontsFreeType/FontFile.js"></script>
@@ -42,8 +43,6 @@
 		<script type="text/javascript" src="../../Word/Drawing/Externals.js"></script>
 		<script type="text/javascript" src="../../Word/Drawing/Metafile.js"></script>
 
-		<script type="text/javascript" src="../apiDefines.js"></script>
-
 		<script type="text/javascript" src="../utils/utils.js"></script>
 		<script type="text/javascript" src="../model/clipboard.js"></script>
 		<script type="text/javascript" src="../model/autofilters.js"></script>
@@ -71,13 +70,13 @@
 		<script type="text/javascript" src="../model/FormulaObjects/logicalFunctions.js"></script>
 		<script type="text/javascript" src="../model/CellComment.js"></script>
 
+		<script type="text/javascript" src="../model/UndoRedo.js"></script>
 		<script type="text/javascript" src="../model/Serialize.js"></script>
 		<script type="text/javascript" src="../model/WorkbookElems.js"></script>
 		<script type="text/javascript" src="../model/Workbook.js"></script>
 		<script type="text/javascript" src="../model/CellInfo.js"></script>
 		<script type="text/javascript" src="../../Common/AdvancedOptions.js"></script>
 		<script type="text/javascript" src="../model/History.js"></script>
-		<script type="text/javascript" src="../model/UndoRedo.js"></script>
 
 
 		<script type="text/javascript" src="../../Common/scroll.js"></script>

cell/.unit-tests/RunCellFormatTests.html

@@ -5,12 +5,12 @@
 
 		<title>Unit Tests</title>
 
-		<script type="text/javascript" src="../jquery/jquery-1.7.1.js"></script>
+		<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
 
 		<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
 		<script type="text/javascript" src="qunit/qunit.js"></script>
 
-		<script type="text/javascript" src="../../Common/3rdparty/XregExp/xregexp-all.js"></script>
+		<script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
 
 		<script type="text/javascript" src="../utils/utils.js"></script>
 		<script type="text/javascript" src="../model/Workbook.js"></script>

cell/.unit-tests/RunTests.html

@@ -5,7 +5,7 @@
 
 		<title>Unit Tests</title>
 
-		<script type="text/javascript" src="../jquery/jquery-1.7.1.js"></script>
+		<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
 
 		<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
 		<script type="text/javascript" src="qunit/qunit.js"></script>

cell/.unit-tests/tests.js

@@ -22,7 +22,7 @@
  * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
 */
-$(function () {
+$(function () {
 
 	module("Utils");
 
@@ -124,7 +124,7 @@
 		strictEqual(Asc.round(-.1-.2-.9+.2), -1, "Asc.round(.1+.2+.9-.2)"); // -1.0000...2
 	});
 
-	test("Asc.extendClass", function test_extendClass() {
+	test("AscCommon.extendClass", function test_extendClass() {
 		function Base(b1) {
 			this.b1 = b1;
 		}
@@ -134,7 +134,7 @@
 			Child.superclass.constructor.call(this, b1);
 			this.c1 = c1;
 		}
-		Asc.extendClass(Child, Base);
+		AscCommon.extendClass(Child, Base);
 		Child.prototype.mc1 = function (c1) {this.c1=c1;};
 
 		var x = new Child(1, 2);
@@ -151,7 +151,7 @@
 		equal(x.c1, 4, "x.c1");
 	});
 
-	test("Asc.extendClass with fabric method", function test_extendClass2() {
+	test("AscCommon.extendClass with fabric method", function test_extendClass2() {
 		function Base(b1) {
 			if ( !(this instanceof Base) ) {return new Base(b1);}
 			this.b1 = b1;
@@ -165,7 +165,7 @@
 			this.c1 = c1;
 			return this;
 		}
-		Asc.extendClass(Child, Base);
+		AscCommon.extendClass(Child, Base);
 		Child.prototype.mc1 = function (c1) {this.c1=c1;};
 
 		var x = Child(1, 2);

cell/.unit-tests/testsForFWB.html

@@ -5,12 +5,12 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <title>Unit Test</title>
 
-        <script type="text/javascript" src="../jquery/jquery-1.7.1.js"></script>
+        <script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
 
         <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
         <script type="text/javascript" src="qunit/qunit.js"></script>
 
-		<script type="text/javascript" src="../../Common/3rdparty/XregExp/xregexp-all.js"></script>
+        <script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
 
 		<script type="text/javascript" src="../utils/utils.js"></script>
 		<script type="text/javascript" src="../model/Workbook.js"></script>

cell/Local/api.js

@@ -24,6 +24,9 @@
 */
 "use strict";
 
+// Import
+var c_oAscError = Asc.c_oAscError;
+
 /////////////////////////////////////////////////////////
 //////////////        OPEN       ////////////////////////
 /////////////////////////////////////////////////////////
@@ -49,7 +52,7 @@
 	
 	asc['spreadsheet_api'].prototype._OfflineAppDocumentEndLoad = function(_data)
 	{
-		g_oIdCounter.m_sUserId = window["AscDesktopEditor"]["CheckUserId"]();
+		AscCommon.g_oIdCounter.m_sUserId = window["AscDesktopEditor"]["CheckUserId"]();
 		if (_data == "")
 		{
 			this.sendEvent("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.Critical);
@@ -70,8 +73,8 @@
 	asc['spreadsheet_api'].prototype._onNeedParams = function(data) 
 	{
 		var cp = JSON.parse("{\"codepage\":46,\"delimiter\":1}");
-		cp['encodings'] = getEncodingParams();
-		this.handlers.trigger("asc_onAdvancedOptions", new asc.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.CSV, cp), c_oAscAdvancedOptionsAction.Open);
+		cp['encodings'] = AscCommon.getEncodingParams();
+		this.handlers.trigger("asc_onAdvancedOptions", new asc.asc_CAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, cp), AscCommon.c_oAscAdvancedOptionsAction.Open);
 	};
 	
 	asc['spreadsheet_api'].prototype.asc_addImageDrawingObject = function(url)
@@ -82,7 +85,7 @@
 		if (ws) 
 		{
 			var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
-			ws.objectRender.addImageDrawingObject(g_oDocumentUrls.getImageUrl(_url) , null);
+			ws.objectRender.addImageDrawingObject(AscCommon.g_oDocumentUrls.getImageUrl(_url) , null);
 		}
 	};
 	asc['spreadsheet_api'].prototype.asc_showImageFileDialog = function()
@@ -108,12 +111,12 @@ window["asc_initAdvancedOptions"] = function()
 
 window["DesktopOfflineAppDocumentEndLoad"] = function(_url, _data)
 {
-    g_oDocumentUrls.documentUrl = _url;
-	if (g_oDocumentUrls.documentUrl.indexOf("file:") != 0)
+	AscCommon.g_oDocumentUrls.documentUrl = _url;
+	if (AscCommon.g_oDocumentUrls.documentUrl.indexOf("file:") != 0)
 	{
-		if (g_oDocumentUrls.documentUrl.indexOf("/") != 0)
-			g_oDocumentUrls.documentUrl = "/" + g_oDocumentUrls.documentUrl;
-		g_oDocumentUrls.documentUrl = "file://" + g_oDocumentUrls.documentUrl;
+		if (AscCommon.g_oDocumentUrls.documentUrl.indexOf("/") != 0)
+			AscCommon.g_oDocumentUrls.documentUrl = "/" + AscCommon.g_oDocumentUrls.documentUrl;
+		AscCommon.g_oDocumentUrls.documentUrl = "file://" + AscCommon.g_oDocumentUrls.documentUrl;
 	}
 	
     window["Asc"]["editor"]._OfflineAppDocumentEndLoad(_data);
@@ -183,7 +186,7 @@ window["Asc"]['spreadsheet_api'].prototype.onUpdateDocumentModified = function(b
   
 window["Asc"]['spreadsheet_api'].prototype.asc_Save = function (isNoUserSave, isSaveAs)
 {
-	if (this.isChartEditor || c_oAscAdvancedOptionsAction.None !== this.advancedOptionsAction)
+	if (this.isChartEditor || AscCommon.c_oAscAdvancedOptionsAction.None !== this.advancedOptionsAction)
 		return;
     	
 	var t = this;
@@ -220,19 +223,19 @@ window["Asc"]['spreadsheet_api'].prototype.asc_isOffline = function()
 
 window["DesktopOfflineAppDocumentStartSave"] = function(isSaveAs)
 {
-	window["Asc"]["editor"].sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
+	window["Asc"]["editor"].sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.Save);
 	
 	var _param = "";
 	if (isSaveAs === true)
 		_param += "saveas=true;";
-	if (AscBrowser.isRetina)
+	if (AscCommon.AscBrowser.isRetina)
 		_param += "retina=true;";
 	
 	window["AscDesktopEditor"]["LocalFileSave"](_param);
 };
 window["DesktopOfflineAppDocumentEndSave"] = function(error)
 {
-	window["Asc"]["editor"].sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
+	window["Asc"]["editor"].sync_EndAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.Save);
 	if (0 == error)
 		DesktopOfflineUpdateLocalName(window["Asc"]["editor"]);
 	else
@@ -261,7 +264,7 @@ window["DesktopOfflineAppDocumentAddImageEnd"] = function(url)
     if (ws) 
 	{
 		var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
-        ws.objectRender.addImageDrawingObject(g_oDocumentUrls.getImageUrl(_url) , null);
+        ws.objectRender.addImageDrawingObject(AscCommon.g_oDocumentUrls.getImageUrl(_url) , null);
     }
 };
 

cell/Private/comments.js

@@ -30,11 +30,10 @@
  * Date:   Apr 23, 2015
  */
 (/**
- * @param {jQuery} $
  * @param {Window} window
  * @param {undefined} undefined
  */
-  function($, window, undefined) {
+  function(window, undefined) {
 
   var asc = window["Asc"];
   var prot;
@@ -46,9 +45,8 @@
 
   prot = asc['spreadsheet_api'].prototype;
   prot['asc_addComment'] = prot.asc_addComment;
-})(jQuery, window);
 
-CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) {
+  AscCommonExcel.CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) {
     var t = this;
     var oComment = comment;
     var bChange = false;
@@ -79,4 +77,5 @@ CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) {
       t._addComment(oComment, bChange, bIsNotUpdate);
     };
     this.isLockedComment(oComment, onAddCommentCallback);
-};
\ No newline at end of file
+  };
+})(window);

cell/apiDefines.js

@@ -24,78 +24,19 @@
 */
 "use strict";
 
+(
+/**
+* @param {Window} window
+* @param {undefined} undefined
+*/
+function (window, undefined) {
 // Используем [] вместо new Array() для ускорения (http://jsperf.com/creation-array)
 // Используем {} вместо new Object() для ускорения (http://jsperf.com/creation-object)
-var c_oAscError = {
-  Level: {
-    Critical: -1,
-    NoCritical: 0
-  },
-  ID: {
-    ServerSaveComplete: 3,
-    ConvertationProgress: 2,
-    DownloadProgress: 1,
-    No: 0,
-    Unknown: -1,
-    ConvertationTimeout: -2,
-    ConvertationError: -3,
-    DownloadError: -4,
-    UnexpectedGuid: -5,
-    Database: -6,
-    FileRequest: -7,
-    FileVKey: -8,
-    UplImageSize: -9,
-    UplImageExt: -10,
-    UplImageFileCount: -11,
-    NoSupportClipdoard: -12,
-    PastInMergeAreaError: -13,
-    StockChartError: -14,
-    DataRangeError: -15,
-    CannotMoveRange: -16,
-    UplImageUrl: -17,
-    CoAuthoringDisconnect: -18,
-    ConvertationPassword: -19,
-
-    VKeyEncrypt: -20,
-    KeyExpire: -21,
-    UserCountExceed: -22,
-
-    /* для формул */
-    FrmlWrongCountParentheses: -300,
-    FrmlWrongOperator: -301,
-    FrmlWrongMaxArgument: -302,
-    FrmlWrongCountArgument: -303,
-    FrmlWrongFunctionName: -304,
-    FrmlAnotherParsingError: -305,
-    FrmlWrongArgumentRange: -306,
-    FrmlOperandExpected: -307,
-    FrmlParenthesesCorrectCount: -308,
-    FrmlWrongReferences: -309,
-
-    InvalidReferenceOrName: -310,
-    LockCreateDefName: -311,
-
-
-    AutoFilterDataRangeError: -50,
-    AutoFilterChangeFormatTableError: -51,
-    AutoFilterChangeError: -52,
-    AutoFilterMoveToHiddenRangeError: -53,
-    LockedAllError: -54,
-    LockedWorksheetRename: -55,
-    FTChangeTableRangeError: -56,
-    FTRangeIncludedOtherTables: -57,
-
-    PasteMaxRangeError: -65,
-
-    MaxDataSeriesError: -80,
-    CannotFillRange: -81,
-
-    UserDrop: -100,
-    Warning: -101,
-
-    OpenWarning: 500
-  }
-};
+
+
+  // Import
+  var CColor = AscCommon.CColor;
+
 var c_oAscConfirm = {
   ConfirmReplaceRange: 0
 };
@@ -215,22 +156,7 @@ var c_oAscMouseMoveLockedObjectType = {
   Sheet: 2
 };
 
-// Print default options (in mm)
-var c_oAscPrintDefaultSettings = {
-  // Размеры страницы при печати
-  PageWidth: 210,
-  PageHeight: 297,
-  PageOrientation: c_oAscPageOrientation.PagePortrait,
-
-  // Поля для страницы при печати
-  PageLeftField: 17.8,
-  PageRightField: 17.8,
-  PageTopField: 19.1,
-  PageBottomField: 19.1,
 
-  PageGridLines: 0,
-  PageHeadings: 0
-};
 
 var c_oAscLockTypeElem = {
   Range: 1,
@@ -357,20 +283,20 @@ var c_oAscAutoFilterTypes = {
   Filters: 4
 };
 
-var c_oAscCoAuthoringMeBorderColor = new window["CColor"](22, 156, 0);
-var c_oAscCoAuthoringOtherBorderColor = new window["CColor"](238, 53, 37);
-var c_oAscCoAuthoringLockTablePropertiesBorderColor = new window["CColor"](255, 144, 0);
+var c_oAscCoAuthoringMeBorderColor = new CColor(22, 156, 0);
+var c_oAscCoAuthoringOtherBorderColor = new CColor(238, 53, 37);
+var c_oAscCoAuthoringLockTablePropertiesBorderColor = new CColor(255, 144, 0);
 var c_oAscCoAuthoringDottedWidth = 4;
 var c_oAscCoAuthoringDottedDistance = 2;
 
 var c_oAscFormulaRangeBorderColor = [
-  new window["CColor"](95, 140, 237), 
-  new window["CColor"](235, 94, 96),
-  new window["CColor"](141, 97, 194),
-  new window["CColor"](45, 150, 57),
-  new window["CColor"](191, 76, 145),
-  new window["CColor"](227, 130, 34),
-  new window["CColor"](55, 127, 158)
+  new CColor(95, 140, 237),
+  new CColor(235, 94, 96),
+  new CColor(141, 97, 194),
+  new CColor(45, 150, 57),
+  new CColor(191, 76, 145),
+  new CColor(227, 130, 34),
+  new CColor(55, 127, 158)
 ];
 
 var c_oAscLockNameFrozenPane = "frozenPane";
@@ -398,30 +324,49 @@ var c_oAscPopUpSelectorType = {
   Table: 3
 };
 
-//------------------------------------------------------------export---------------------------------------------------
-if (undefined === window['Asc']) {
-  window['Asc'] = {};
-}
-window['Asc']['c_oAscError'] = c_oAscError;
-window['Asc']['c_oAscConfirm'] = c_oAscConfirm;
-window['Asc']['c_oAscMergeOptions'] = c_oAscMergeOptions;
-window['Asc']['c_oAscInsertOptions'] = c_oAscInsertOptions;
-window['Asc']['c_oAscDeleteOptions'] = c_oAscDeleteOptions;
-window['Asc']['c_oAscBorderOptions'] = c_oAscBorderOptions;
-window['Asc']['c_oAscCleanOptions'] = c_oAscCleanOptions;
-window['Asc']['c_oAscSelectionType'] = c_oAscSelectionType;
-window['Asc']['c_oAscSelectionDialogType'] = c_oAscSelectionDialogType;
-window['Asc']['c_oAscHyperlinkType'] = c_oAscHyperlinkType;
-window['Asc']['c_oAscMouseMoveType'] = c_oAscMouseMoveType;
-window['Asc']['c_oAscMouseMoveLockedObjectType'] = c_oAscMouseMoveLockedObjectType;
-window['Asc']['c_oAscPrintType'] = c_oAscPrintType;
-window['Asc']['c_oAscCustomAutoFilter'] = c_oAscCustomAutoFilter;
-window['Asc']['c_oAscChangeFilterOptions'] = c_oAscChangeFilterOptions;
-window['Asc']['c_oAscCellEditorState'] = c_oAscCellEditorState;
-window['Asc']['c_oAscAutoFilterTypes'] = c_oAscAutoFilterTypes;
-window['Asc']['c_oAscFindLookIn'] = c_oAscFindLookIn;
-window['Asc']['c_oAscGetDefinedNamesList'] = c_oAscGetDefinedNamesList;
-window['Asc']['c_oAscDefinedNameReason'] = c_oAscDefinedNameReason;
-window['Asc']['c_oAscPopUpSelectorType'] = c_oAscPopUpSelectorType;
-window['Asc']['c_oAscChangeSelectionFormatTable'] = c_oAscChangeSelectionFormatTable;
-window['Asc']['c_oAscChangeTableStyleInfo'] = c_oAscChangeTableStyleInfo;
+  //----------------------------------------------------------export----------------------------------------------------
+  window['AscCommonExcel'] = window['AscCommonExcel'] || {};
+  window['AscCommonExcel'].c_oAscAlignType = c_oAscAlignType;
+  window['AscCommonExcel'].c_oAscSortOptions = c_oAscSortOptions;
+  window['AscCommonExcel'].c_oAscDrawDepOptions = c_oAscDrawDepOptions;
+  window['AscCommonExcel'].c_oAscGraphicOption = c_oAscGraphicOption;
+  window['AscCommonExcel'].c_oAscLockTypeElem = c_oAscLockTypeElem;
+  window['AscCommonExcel'].c_oAscLockTypeElemSubType = c_oAscLockTypeElemSubType;
+  window['AscCommonExcel'].c_oAscRecalcIndexTypes = c_oAscRecalcIndexTypes;
+  window['AscCommonExcel'].c_oAscCellEditorSelectState = c_oAscCellEditorSelectState;
+  window['AscCommonExcel'].c_oAscCanChangeColWidth = c_oAscCanChangeColWidth;
+  window['AscCommonExcel'].c_oAscPaneState = c_oAscPaneState;
+  window['AscCommonExcel'].c_oTargetType = c_oTargetType;
+  window['AscCommonExcel'].c_oAscCoAuthoringMeBorderColor = c_oAscCoAuthoringMeBorderColor;
+  window['AscCommonExcel'].c_oAscCoAuthoringOtherBorderColor = c_oAscCoAuthoringOtherBorderColor;
+  window['AscCommonExcel'].c_oAscCoAuthoringLockTablePropertiesBorderColor = c_oAscCoAuthoringLockTablePropertiesBorderColor;
+  window['AscCommonExcel'].c_oAscCoAuthoringDottedWidth = c_oAscCoAuthoringDottedWidth;
+  window['AscCommonExcel'].c_oAscCoAuthoringDottedDistance = c_oAscCoAuthoringDottedDistance;
+  window['AscCommonExcel'].c_oAscFormulaRangeBorderColor = c_oAscFormulaRangeBorderColor;
+  window['AscCommonExcel'].c_oAscLockNameFrozenPane = c_oAscLockNameFrozenPane;
+  window['AscCommonExcel'].c_oAscLockNameTabColor = c_oAscLockNameTabColor;
+
+  window['Asc'] = window['Asc'] || {};
+  window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm;
+  window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;
+  window['Asc']['c_oAscInsertOptions'] = window['Asc'].c_oAscInsertOptions = c_oAscInsertOptions;
+  window['Asc']['c_oAscDeleteOptions'] = window['Asc'].c_oAscDeleteOptions = c_oAscDeleteOptions;
+  window['Asc']['c_oAscBorderOptions'] = window['Asc'].c_oAscBorderOptions = c_oAscBorderOptions;
+  window['Asc']['c_oAscCleanOptions'] = window['Asc'].c_oAscCleanOptions = c_oAscCleanOptions;
+  window['Asc']['c_oAscSelectionType'] = window['Asc'].c_oAscSelectionType = c_oAscSelectionType;
+  window['Asc']['c_oAscSelectionDialogType'] = window['Asc'].c_oAscSelectionDialogType = c_oAscSelectionDialogType;
+  window['Asc']['c_oAscHyperlinkType'] = window['Asc'].c_oAscHyperlinkType = c_oAscHyperlinkType;
+  window['Asc']['c_oAscMouseMoveType'] = window['Asc'].c_oAscMouseMoveType = c_oAscMouseMoveType;
+  window['Asc']['c_oAscMouseMoveLockedObjectType'] = window['Asc'].c_oAscMouseMoveLockedObjectType = c_oAscMouseMoveLockedObjectType;
+  window['Asc']['c_oAscPrintType'] = window['Asc'].c_oAscPrintType = c_oAscPrintType;
+  window['Asc']['c_oAscCustomAutoFilter'] = window['Asc'].c_oAscCustomAutoFilter = c_oAscCustomAutoFilter;
+  window['Asc']['c_oAscChangeFilterOptions'] = window['Asc'].c_oAscChangeFilterOptions = c_oAscChangeFilterOptions;
+  window['Asc']['c_oAscCellEditorState'] = window['Asc'].c_oAscCellEditorState = c_oAscCellEditorState;
+  window['Asc']['c_oAscChangeSelectionFormatTable'] = window['Asc'].c_oAscChangeSelectionFormatTable = c_oAscChangeSelectionFormatTable;
+  window['Asc']['c_oAscChangeTableStyleInfo'] = window['Asc'].c_oAscChangeTableStyleInfo = c_oAscChangeTableStyleInfo;
+  window['Asc']['c_oAscAutoFilterTypes'] = window['Asc'].c_oAscAutoFilterTypes = c_oAscAutoFilterTypes;
+  window['Asc']['c_oAscFindLookIn'] = window['Asc'].c_oAscFindLookIn = c_oAscFindLookIn;
+  window['Asc']['c_oAscGetDefinedNamesList'] = window['Asc'].c_oAscGetDefinedNamesList = c_oAscGetDefinedNamesList;
+  window['Asc']['c_oAscDefinedNameReason'] = window['Asc'].c_oAscDefinedNameReason = c_oAscDefinedNameReason;
+  window['Asc']['c_oAscPopUpSelectorType'] = window['Asc'].c_oAscPopUpSelectorType = c_oAscPopUpSelectorType;
+})(window);

cell/graphics/DrawingContext.js

@@ -72,17 +72,17 @@
 			}
 			if(bTheme)
 			{
-				oRes = new asc_CColor();
+				oRes = new Asc.asc_CColor();
 				oRes.r = r;
 				oRes.g = g;
 				oRes.b = b;
 				oRes.a = 255;
-				oRes.type = c_oAscColor.COLOR_TYPE_SCHEME;
+				oRes.type = Asc.c_oAscColor.COLOR_TYPE_SCHEME;
 				oRes.value = themePresentation;
 			}
 		}
 		if(false == bTheme)
-			oRes = CreateAscColorCustom(r, g, b);
+			oRes = AscCommon.CreateAscColorCustom(r, g, b);
 		return oRes;
 	}
 
@@ -420,7 +420,7 @@
 		this.ppiX = 96;
 		this.ppiY = 96;
 
-		if (AscBrowser.isRetina) {
+		if (AscCommon.AscBrowser.isRetina) {
 			this.ppiX <<= 1;
 			this.ppiY <<= 1;
 		}
@@ -449,8 +449,8 @@
 			throw "Can not set font in DrawingContext";
 		}
 
-		// CColor
-		this.fillColor = new CColor(255, 255, 255);
+		// AscCommon.CColor
+		this.fillColor = new AscCommon.CColor(255, 255, 255);
 		return this;
 	}
 
@@ -735,7 +735,7 @@
 	};
 
 	/**
-	 * @param {RgbColor || ThemeColor || CColor} val
+	 * @param {RgbColor || ThemeColor || AscCommon.CColor} val
 	 * @returns {DrawingContext}
 	 */
 	DrawingContext.prototype.setFillStyle = function (val) {
@@ -743,7 +743,7 @@
 		var _g = val.getG();
 		var _b = val.getB();
 		var _a = val.getA();
-		this.fillColor = new CColor(_r, _g, _b, _a);
+		this.fillColor = new AscCommon.CColor(_r, _g, _b, _a);
 		this.ctx.fillStyle = "rgba(" + _r + "," + _g + "," + _b + "," + _a + ")";
 		return this;
 	};
@@ -754,7 +754,7 @@
 	};
 
 	/**
-	 * @param {RgbColor || ThemeColor || CColor} val
+	 * @param {RgbColor || ThemeColor || AscCommon.CColor} val
 	 * @returns {DrawingContext}
 	 */
 	DrawingContext.prototype.setStrokeStyle = function (val) {
@@ -931,7 +931,7 @@
 		var _g = this.fillColor.g;
 		var _b = this.fillColor.b;
 
-		if (AscBrowser.isMobileVersion) {
+		if (AscCommon.AscBrowser.isMobileVersion) {
 			// Special for iPad (5.1)
 
 			if (!_r && !_g && !_b) {
@@ -1052,7 +1052,7 @@
 	};
 
 	DrawingContext.prototype.dashLineCleverHor = function (x1, y, x2) {
-		var w_dot = c_oAscCoAuthoringDottedWidth, w_dist = c_oAscCoAuthoringDottedDistance;
+		var w_dot = AscCommonExcel.c_oAscCoAuthoringDottedWidth, w_dist = AscCommonExcel.c_oAscCoAuthoringDottedDistance;
 		var _x1 = this._mct.transformPointX(x1, y);
 		var _y  = this._mct.transformPointY(x1, y) - 1;
 		var _x2 = this._mct.transformPointX(x2, y);
@@ -1073,7 +1073,7 @@
 		}
 	};
 	DrawingContext.prototype.dashLineCleverVer = function (x, y1, y2) {
-		var w_dot = c_oAscCoAuthoringDottedWidth, w_dist = c_oAscCoAuthoringDottedDistance;
+		var w_dot = AscCommonExcel.c_oAscCoAuthoringDottedWidth, w_dist = AscCommonExcel.c_oAscCoAuthoringDottedDistance;
 		var _y1 = this._mct.transformPointY(x, y1);
 		var _x  = this._mct.transformPointX(x, y1) - 1;
 		var _y2 = this._mct.transformPointY(x, y2);

cell/graphics/pdfprinter.js

@@ -174,7 +174,7 @@ CPdfPrinter.prototype =
         return "miter";
     },
 	/**
-	 * @param {RgbColor || ThemeColor || CColor} val
+	 * @param {RgbColor || ThemeColor || AscCommon.CColor} val
 	 * @returns {CPdfPrinter}
 	 */
     setFillStyle : function(val)
@@ -193,7 +193,7 @@ CPdfPrinter.prototype =
         return this;
     },
 	/**
-	 * @param {RgbColor || ThemeColor || CColor} val
+	 * @param {RgbColor || ThemeColor || AscCommon.CColor} val
 	 * @returns {CPdfPrinter}
 	 */
     setStrokeStyle : function(val)
@@ -382,7 +382,7 @@ CPdfPrinter.prototype =
     {
         if (this.bIsSimpleCommands)
             return this.DocumentRenderer.drawImage(_src, sx, sy, sw, sh, dx, dy);
-        var srcLocal = g_oDocumentUrls.getLocal(_src);
+        var srcLocal = AscCommon.g_oDocumentUrls.getLocal(_src);
         if (srcLocal){
             _src = srcLocal;
         }