Merge remote-tracking branch 'remotes/origin/develop' into feature/sparklines

# Conflicts:
#	cell/view/WorksheetView.js
#	common/Charts/DrawingObjects.js

Makefile

 GRUNT = grunt
-GRUNT_FLAGS = --private=true --no-color -v 
+GRUNT_FLAGS = --no-color -v 
 
 OUTPUT_DIR = deploy
 OUTPUT = $(OUTPUT_DIR)

build/Gruntfile.js

@@ -23,17 +23,15 @@
  *
 */
 module.exports = function(grunt) {
-	require('google-closure-compiler').grunt(grunt);
-    var revision="unknown", defaultConfig, packageFile;
+	require('google-closure-compiler').grunt(grunt, ['-Xms2048m']);
+    var defaultConfig, packageFile;
 	var path = grunt.option('src') || './configs';
 	var level = grunt.option('level') || 'ADVANCED';
 	var formatting = grunt.option('formatting') || '';
 	var nomap = grunt.option('nomap') || '';
-
+
 	grunt.loadNpmTasks('grunt-contrib-clean');
 	grunt.loadNpmTasks('grunt-contrib-concat');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-exec');
 	grunt.loadNpmTasks('grunt-replace');
 	
 	grunt.registerTask('build_webword_init', 'Initialize build WebWord SDK.', function(){
@@ -89,70 +87,24 @@ module.exports = function(grunt) {
 	
 	grunt.registerTask('build_webword',     ['build_webword_init', 'build_sdk']);
 	grunt.registerTask('build_nativeword', ['build_nativeword_init', 'build_sdk']);
-    grunt.registerTask('build_webexcel',  ['build_webexcel_init', 'build_sdk']);
-    grunt.registerTask('build_webpowerpoint', ['build_webpowerpoint_init', 'build_sdk']);
-		
-	grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']);
-
-	grunt.registerTask('up_sdk_src_init', 'Update SDK source', function() {
-		grunt.initConfig({
-			exec: {
-				update_sources: {
-					command: 'svn.exe up -q --non-interactive -r ' + packageFile['update_src']['revision'] + ' ' + packageFile['update_src']['src'],
-					stdout: true
-				},				
-				update_logs: {
-					command: 'svn.exe up -q --non-interactive -r HEAD ' + packageFile['compile']['sdk']['log'],
-					stdout: true
-				}
-			}
-		});
-    });
-	
-	grunt.registerTask('update_sources_webword', ['build_webword_init', 'up_sdk_src_init', 'exec']);
-	grunt.registerTask('update_sources_webexcel', ['build_webexcel_init', 'up_sdk_src_init', 'exec']);
-	grunt.registerTask('update_sources_webpowerpoint', ['build_webpowerpoint_init', 'up_sdk_src_init', 'exec']);
-
-	grunt.registerTask('update_sources', ['update_sources_webword', 'update_sources_webexcel', 'update_sources_webpowerpoint']);
-		
-    grunt.registerTask('increment_build', function() {
-		var pkg = grunt.file.readJSON(defaultConfig);
-		pkg.info.build = parseInt(pkg.info.build) + 1;
-
-		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['SVN_REVISION'] || revision;
-		grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4));
-    });
-	
-	grunt.registerTask('create_map_file', function() {
-		//      ,    .	
-		var map_file_path = packageFile['compile']['sdk']['dst'] + '.map';	
-		var map_record = '//@ sourceMappingURL=' + packageFile['compile']['source_map']['url'] + '/' + map_file_path;
+	grunt.registerTask('build_webexcel',  ['build_webexcel_init', 'build_sdk']);
+	grunt.registerTask('build_webpowerpoint', ['build_webpowerpoint_init', 'build_sdk']);
 
-		var map_record_file_path = map_file_path + '.tmp';
-		grunt.file.write(map_record_file_path, map_record);
-	});
-	
+	grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']);
+	
 	grunt.registerTask('compile_sdk_init', function(compilation_level) {
-		grunt.file.mkdir( packageFile['compile']['sdk']['log'] );
-		var map_file_path = packageFile['compile']['sdk']['dst'] + '.map';
-		var map_record_file_path = map_file_path + '.tmp';
-		var concat_res = {};
-		concat_res[packageFile['compile']['sdk']['dst']] = [
-					packageFile['compile']['sdk']['dst'],
-					packageFile['compile']['defines']['dst'],
-					map_record_file_path ];
+		grunt.file.mkdir( packageFile['compile']['sdk']['log'] );
+		var map_file_path = packageFile['compile']['sdk']['dst'] + '.map';
+		var map_record_file_path = map_file_path + '.tmp';
+		var concat_src = [
+			packageFile['compile']['sdk']['dst'],
+			packageFile['compile']['defines']['dst'],
+			map_record_file_path ];
 		var srcFiles = packageFile['compile']['sdk']['common'];
 		var sdkOpt = {
 			compilation_level: compilation_level,
 			warning_level: 'QUIET',
-			externs: packageFile['compile']['sdk']['externs']/*,
-			create_source_map: map_file_path,
-			source_map_format: "V3"*/
+			externs: packageFile['compile']['sdk']['externs']
 		};
 		var definesOpt = {
 			compilation_level: 'ADVANCED' === compilation_level ? 'SIMPLE' : compilation_level,
@@ -166,7 +118,7 @@ module.exports = function(grunt) {
 			sdkOpt['property_renaming_report'] = packageFile['compile']['sdk']['log'] + '/property.map';
 		}		
 		
-		if (grunt.option('mobile')) {				
+		if (grunt.option('mobile')) {
 			var excludeFiles = packageFile['compile']['sdk']['exclude_mobile']
 			srcFiles = srcFiles.filter(function(item) {
 				return -1 === excludeFiles.indexOf(item);
@@ -177,16 +129,12 @@ module.exports = function(grunt) {
 			}
 		}
 		
-		if (grunt.option('private')) {
+		if (!grunt.option('noprivate')) {
 			srcFiles = srcFiles.concat(packageFile['compile']['sdk']['private']);
 		}
 		if (grunt.option('desktop')) {
 			srcFiles = srcFiles.concat(packageFile['compile']['sdk']['desktop']);
 		}
-	
-		
-		var cc = require('google-closure-compiler').compiler;
-		cc.prototype.spawnOptions = {env: {'JAVA_OPTS': '-Xms2048m'}};
 
 		grunt.initConfig({
 			pkg: packageFile,
@@ -203,20 +151,27 @@ module.exports = function(grunt) {
 					},
 					options: definesOpt
 				}
-			},
-			create_map_file: {},
-			concat: concat_res,
-			clean: [ 
-				packageFile['compile']['defines']['dst'],
-				map_record_file_path
+			},
+			concat: {
+				options: {
+					banner: '(function(window, undefined) {',
+					footer: '})(window);'
+				},
+				dist: {
+					src: concat_src,
+					dest: '<%= pkg.compile.sdk.dst %>'
+				}
+			},
+			clean: [ 
+				packageFile['compile']['defines']['dst'],
+				map_record_file_path
 			],
 			replace: {
 				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/build-desktop.bat

 CD /D %~dp0
 call npm install -g grunt-cli
 call npm install
-call grunt --level=WHITESPACE_ONLY --nomap=true --private=true --desktop=true --formatting=PRETTY_PRINT
-rem call grunt --level=ADVANCED --nomap=true --private=true --desktop=true
+call grunt --level=WHITESPACE_ONLY --nomap=true --desktop=true --formatting=PRETTY_PRINT
+rem call grunt --level=ADVANCED --nomap=true --desktop=true
 pause
\ No newline at end of file

build/build-mobile.bat

 CD /D %~dp0
 call npm install -g grunt-cli
 call npm install
-call grunt --level=WHITESPACE_ONLY --nomap=true --private=true --mobile=true --formatting=PRETTY_PRINT
+call grunt --level=WHITESPACE_ONLY --nomap=true --mobile=true --formatting=PRETTY_PRINT
 pause
\ No newline at end of file

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": [
@@ -180,14 +172,12 @@
                 "../../web-apps/vendor/xregexp/xregexp-all-min.js",
                 "../../web-apps/vendor/jszip/jszip.min.js",
                 "../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
-                "../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js",
-                "../../web-apps/vendor/perfect-scrollbar/src/jquery.mousewheel.js",
-                "../../web-apps/vendor/perfect-scrollbar/src/perfect-scrollbar.js"
+                "../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
             ],
             "map": "sdk-all.js.map",
             "log": "../cell/Build/Log"
         },
-        "defines": {
+		"defines": {
             "src": [
                 "../common/Shapes/EditorSettings.js",
                 "../common/commonDefines.js",

build/configs/webpowerpoint.json

 {
-    "info": {
-        "version": "3.8.0",
-        "build": 158
-    },
-    "update_src": {
-        "revision": "HEAD",
-        "src": "../common ../word ../slide"
-    },
     "compile": {
         "sdk": {
             "common": [

build/configs/webword.json

 {
-    "info": {
-        "version": "3.8.0",
-        "build": 167
-    },
-    "update_src": {
-        "revision": "HEAD",
-        "src": "../common ../word"
-    },
     "compile": {
         "sdk": {
             "common": [

build/package.json

@@ -4,12 +4,10 @@
   "homepage": "http://www.teamlab.com",
   "private": true,
   "dependencies": {
-    "google-closure-compiler": "^20160315.0.0",
+    "google-closure-compiler": "20160315.2.0",
     "grunt": "0.4.5",
-    "grunt-contrib-clean": "0.5.0",
+	"grunt-contrib-clean": "0.5.0",
     "grunt-contrib-concat": "0.3.0",
-    "grunt-contrib-copy": "0.5.0",
-    "grunt-exec": "0.4.5",
     "grunt-replace": "0.7.3"
   }
 }

cell/.unit-tests/FormulaTests.html

@@ -5,11 +5,11 @@
 
 		<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>
-		<script type="text/javascript" src="../../../Office/vendor/xregexp/xregexp-all-min.js"></script>
+		<script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
 
         <script type="text/javascript">
             //<![CDATA[

cell/.unit-tests/FormulaTests.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.
+ *
+*/
 $( function () {
 
     function toFixed( n ) {
@@ -265,9 +265,9 @@ $( function () {
 
     function _getprice( nSettle, nMat, fRate, fYield, fRedemp, nFreq, nBase ){
 
-        var fdays = getcoupdays( new Date(nSettle), new Date(nMat), nFreq, nBase ),
-            fdaybs = getcoupdaybs( new Date(nSettle), new Date(nMat), nFreq, nBase ),
-            fnum = getcoupnum( new Date(nSettle), (nMat), nFreq, nBase ),
+        var fdays = AscCommonExcel.getcoupdays( new Date(nSettle), new Date(nMat), nFreq, nBase ),
+            fdaybs = AscCommonExcel.getcoupdaybs( new Date(nSettle), new Date(nMat), nFreq, nBase ),
+            fnum = AscCommonExcel.getcoupnum( new Date(nSettle), (nMat), nFreq, nBase ),
             fdaysnc = ( fdays - fdaybs ) / fdays,
             fT1 = 100 * fRate / nFreq,
             fT2 = 1 + fYield / nFreq,
@@ -371,9 +371,9 @@ $( function () {
     }
 
     function _duration( settlement, maturity, coupon, yld, frequency, basis ){
-        var dbc = getcoupdaybs(new Date( settlement ),new Date( maturity ),frequency,basis),
-            coupD = getcoupdays(new Date( settlement ),new Date( maturity ),frequency,basis),
-            numCoup = getcoupnum(new Date( settlement ),new Date( maturity ),frequency);
+        var dbc = AscCommonExcel.getcoupdaybs(new Date( settlement ),new Date( maturity ),frequency,basis),
+            coupD = AscCommonExcel.getcoupdays(new Date( settlement ),new Date( maturity ),frequency,basis),
+            numCoup = AscCommonExcel.getcoupnum(new Date( settlement ),new Date( maturity ),frequency);
 
         if ( settlement >= maturity || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) || yld < 0 || coupon < 0 ){
             return "#NUM!";
@@ -3888,7 +3888,7 @@ $( function () {
             if( settlement >= maturity || pr <= 0 || redemption <= 0 || basis < 0 || basis > 4 )
                 return "#NUM!"
 
-            return ( 1.0 - pr / redemption ) / yearFrac( settlement, maturity, basis );
+            return ( 1.0 - pr / redemption ) / AscCommonExcel.yearFrac( settlement, maturity, basis );
 
         }
 
@@ -3967,7 +3967,7 @@ $( function () {
             if( settlement >= maturity || investment <= 0 || discount <= 0 || basis < 0 || basis > 4 )
                 return "#NUM!"
 
-            return investment / ( 1 - ( discount * yearFrac( settlement, maturity, basis) ) )
+            return investment / ( 1 - ( discount * AscCommonExcel.yearFrac( settlement, maturity, basis) ) )
 
         }
 
@@ -4084,7 +4084,7 @@ $( function () {
             if( settlement >= maturity || investment <= 0 || redemption <= 0 || basis < 0 || basis > 4 )
                 return "#NUM!"
 
-            return ( ( redemption / investment ) - 1 ) / yearFrac( settlement, maturity, basis )
+            return ( ( redemption / investment ) - 1 ) / AscCommonExcel.yearFrac( settlement, maturity, basis )
 
         }
 
@@ -4128,7 +4128,7 @@ $( function () {
             var d1 = settlement
             var d2 = maturity
 
-            var fFraction = yearFrac(d1, d2, 0);
+            var fFraction = AscCommonExcel.yearFrac(d1, d2, 0);
 
             if( fFraction - Math.floor( fFraction ) == 0 )
                 return "#NUM!"
@@ -4533,8 +4533,8 @@ $( function () {
             if( fv == undefined ) fv = 0;
             if( type == undefined ) type = 0;
 
-            var res = getPMT(rate, nper, pv, fv, type);
-            res = getIPMT(rate, per, pv, type, res);
+            var res = AscCommonExcel.getPMT(rate, nper, pv, fv, type);
+            res = AscCommonExcel.getIPMT(rate, per, pv, type, res);
 
             return res;
 

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/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

-/*
- *
- * (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";
 
 /////////////////////////////////////////////////////////
@@ -52,7 +52,7 @@
 		g_oIdCounter.m_sUserId = window["AscDesktopEditor"]["CheckUserId"]();
 		if (_data == "")
 		{
-			this.sendEvent("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.Critical);
+			this.sendEvent("asc_onError", Asc.c_oAscError.ID.ConvertationError, Asc.c_oAscError.Level.Critical);
 			return;
 		}
 	
@@ -242,7 +242,7 @@ window["DesktopOfflineAppDocumentEndSave"] = function(error)
 	window["Asc"]["editor"].LastUserSavedIndex = undefined;
 	
 	if (2 == error)
-		window["Asc"]["editor"].sendEvent("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.NoCritical);
+		window["Asc"]["editor"].sendEvent("asc_onError", Asc.c_oAscError.ID.ConvertationError, Asc.c_oAscError.Level.NoCritical);
 };
 
 window["Asc"]['spreadsheet_api'].prototype["asc_addImageDrawingObject"] = window["Asc"]['spreadsheet_api'].prototype.asc_addImageDrawingObject;

cell/Private/comments.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.
- *
-*/
-"use strict";
+/*
+ *
+ * (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";
 
 /* 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,37 +45,37 @@
 
   prot = asc['spreadsheet_api'].prototype;
   prot['asc_addComment'] = prot.asc_addComment;
-})(jQuery, window);
 
-CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) {
-  var t = this;
-  var oComment = comment;
-  var bChange = false;
-  oComment.wsId = this.worksheet.model.getId();
-  oComment.setId();
+  AscCommonExcel.CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) {
+    var t = this;
+    var oComment = comment;
+    var bChange = false;
+    oComment.wsId = this.worksheet.model.getId();
+    oComment.setId();
 
-  if (!oComment.bDocument) {
-    if (!bIsNotUpdate) {
-      oComment.asc_putCol(this.worksheet.getSelectedColumnIndex());
-      oComment.asc_putRow(this.worksheet.getSelectedRowIndex());
-    }
+    if (!oComment.bDocument) {
+      if (!bIsNotUpdate) {
+        oComment.asc_putCol(this.worksheet.getSelectedColumnIndex());
+        oComment.asc_putRow(this.worksheet.getSelectedRowIndex());
+      }
 
-    var existComments = this.getComments(oComment.nCol, oComment.nRow);
-    if (existComments.length) {
-      oComment = existComments[0];
-      bChange = true;
-    } else {
-      if ((oComment.nCol != null) && (oComment.nRow != null)) {
-        var cellAddress = new CellAddress(oComment.nRow, oComment.nCol, 0);
-        oComment.sQuoteText = cellAddress.getID() + " : " + this.worksheet.model.getCell(cellAddress).getValueWithFormat();
+      var existComments = this.getComments(oComment.nCol, oComment.nRow);
+      if (existComments.length) {
+        oComment = existComments[0];
+        bChange = true;
+      } else {
+        if ((oComment.nCol != null) && (oComment.nRow != null)) {
+          var cellAddress = new CellAddress(oComment.nRow, oComment.nCol, 0);
+          oComment.sQuoteText = cellAddress.getID() + " : " + this.worksheet.model.getCell(cellAddress).getValueWithFormat();
+        }
       }
     }
-  }
 
-  var onAddCommentCallback = function (isSuccess) {
-    if (false === isSuccess)
-      return;
-    t._addComment(oComment, bChange, bIsNotUpdate);
+    var onAddCommentCallback = function (isSuccess) {
+      if (false === isSuccess)
+        return;
+      t._addComment(oComment, bChange, bIsNotUpdate);
+    };
+    this.isLockedComment(oComment, onAddCommentCallback);
   };
-  this.isLockedComment(oComment, onAddCommentCallback);
-};
+})(window);
\ No newline at end of file

cell/apiCommonExport.js

@@ -22,8 +22,6 @@
  * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
 */
-window['CAscTableStyle'] = CAscTableStyle;
 CAscTableStyle.prototype['get_Id'] = CAscTableStyle.prototype.get_Id;
 CAscTableStyle.prototype['get_Image'] = CAscTableStyle.prototype.get_Image;
 CAscTableStyle.prototype['get_Type'] = CAscTableStyle.prototype.get_Type;
-window['GenerateTableStyles'] = GenerateTableStyles;

cell/apiDefines.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.
- *
-*/
-"use strict";
-
+/*
+ *
+ * (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";
+
+(
+/**
+* @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 = {
@@ -208,22 +214,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,
@@ -251,11 +242,6 @@ var c_oAscPrintType = {
   EntireWorkbook: 1,	// Всю книгу
   Selection: 2		// Выделенный фрагмент
 };
-// Тип печати
-var c_oAscLayoutPageType = {
-  FitToWidth: 0,	// На всю ширину
-  ActualSize: 1		// По реальным размерам
-};
 
 /** @enum */
 var c_oAscCustomAutoFilter = {
@@ -345,7 +331,7 @@ var c_oAscCoAuthoringDottedWidth = 4;
 var c_oAscCoAuthoringDottedDistance = 2;
 
 var c_oAscFormulaRangeBorderColor = [
-  new window["CColor"](95, 140, 237), 
+  new window["CColor"](95, 140, 237),
   new window["CColor"](235, 94, 96),
   new window["CColor"](141, 97, 194),
   new window["CColor"](45, 150, 57),
@@ -378,3 +364,48 @@ var c_oAscPopUpSelectorType = {
   Range: 2,
   Table: 3
 };
+  //----------------------------------------------------------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_oAscError'] = window['Asc'].c_oAscError = c_oAscError;
+  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_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

@@ -22,14 +22,14 @@
  * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
 */
-"use strict";
+"use strict";
 
 /* DrawingContext.js
  *
  * Author: Dmitry.Sokolov@avsmedia.net
  * Date:   Nov 21, 2011
  */
-(function (/** jQuery */$, /** Window */window, undefined) {
+(function (/** Window */window, undefined) {
 
 	/*
 	 * Import
@@ -937,7 +937,9 @@
 			if (!_r && !_g && !_b) {
 				this.ctx.drawImage(pGlyph.oBitmap.oGlyphData.m_oCanvas, 0, 0, nW, nH, nX, nY, nW, nH);
 			} else {
-				var canvD = $("<canvas width='"+nW+"' height='"+nH+"'/>")[0];
+				var canvD = document.createElement('canvas');
+				canvD.width = nW;
+				canvD.height = nH;
 				var ctxD = canvD.getContext("2d");
 				var pixDst = ctxD.getImageData(0, 0, nW, nH);
 				var dstP = pixDst.data;
@@ -1050,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);
@@ -1071,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);
@@ -1271,4 +1273,4 @@
 	window["Asc"].DrawingContext   = DrawingContext;
 	window["Asc"].Matrix           = Matrix;
 
-})(jQuery, window);
+})(window);

cell/graphics/pdfprinter.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.
  *
 */
-"use strict";
+"use strict";
 
 function _rect()
 {