diff --git a/.hgignore b/.gitignore similarity index 94% rename from .hgignore rename to .gitignore index f4bc693b0..a42c9820e 100644 --- a/.hgignore +++ b/.gitignore @@ -1,5 +1,3 @@ -syntax: glob - .idea Thumbs.db .DS_Store diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index c9e29f643..c05990e5a 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -46,6 +46,7 @@ editorConfig: { mode: 'view or edit', lang: , + location: , canCoAuthoring: , canAutosave: , canBackToFolder: - deprecated. use "customization.goback" parameter, @@ -105,6 +106,62 @@ }, chat: false, comments: false + }, + plugins: { + url: '../../../../sdkjs-plugins/', + pluginsData: [{ + name : "chess (fen)", + guid : "asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}", + baseUrl: "", + variations : [ + { + description : "chess", + url : "chess/index.html", + + icons : ["chess/icon.png", "chess/icon@2x.png"], + isViewer : true, + EditorsSupport : ["word", "cell", "slide"], + + isVisual : true, + isModal : true, + isInsideMode : false, + + initDataType : "ole", + initData : "", + + isUpdateOleOnResize : true, + + buttons : [ { text: "Ok", primary: true }, + { text: "Cancel", primary: false } ] + } + ] + }, + { + name : "glavred", + guid : "asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", + baseUrl: "", + variations : [ + { + description : "glavred", + url : "glavred/index.html", + + icons : ["glavred/icon.png", "glavred/icon@2x.png"], + isViewer : true, + EditorsSupport : ["word", "cell", "slide"], + + isVisual : true, + isModal : true, + isInsideMode : false, + + initDataType : "text", + initData : "", + + isUpdateOleOnResize : false, + + buttons : [ { text: "Ok", primary: true } ] + } + ] + } } }, events: { diff --git a/apps/api/documents/cache-scripts.html b/apps/api/documents/cache-scripts.html index 59f3f4a00..872f665cb 100644 --- a/apps/api/documents/cache-scripts.html +++ b/apps/api/documents/cache-scripts.html @@ -10,15 +10,17 @@ - - - + + +
diff --git a/apps/api/documents/index.html b/apps/api/documents/index.html index fef62f56b..a3fb92ed1 100644 --- a/apps/api/documents/index.html +++ b/apps/api/documents/index.html @@ -165,7 +165,8 @@ { 'version': revision.data, 'url': 'http://isa2', - 'urlDiff': 'http://isa2' + 'urlDiff': 'http://isa2', + 'changesUrl': 'http://isa2' } ); } diff --git a/apps/common/Analytics.js b/apps/common/Analytics.js index b98f1ef55..e5dbe3bd9 100644 --- a/apps/common/Analytics.js +++ b/apps/common/Analytics.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index a9017fcae..8e79aa80a 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) { var Common = {}; } diff --git a/apps/common/IrregularStack.js b/apps/common/IrregularStack.js index d84f8e624..4e941e537 100644 --- a/apps/common/IrregularStack.js +++ b/apps/common/IrregularStack.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/locale.js b/apps/common/locale.js index 5a0b4b994..f0e52e301 100644 --- a/apps/common/locale.js +++ b/apps/common/locale.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) { var Common = {}; } diff --git a/apps/common/main/lib/collection/ChatMessages.js b/apps/common/main/lib/collection/ChatMessages.js index 2a5e12b87..c3b60f74b 100644 --- a/apps/common/main/lib/collection/ChatMessages.js +++ b/apps/common/main/lib/collection/ChatMessages.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ChatMessages.js * diff --git a/apps/common/main/lib/collection/Comments.js b/apps/common/main/lib/collection/Comments.js index ed22a882c..742460b0d 100644 --- a/apps/common/main/lib/collection/Comments.js +++ b/apps/common/main/lib/collection/Comments.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Comments.js * diff --git a/apps/common/main/lib/collection/Fonts.js b/apps/common/main/lib/collection/Fonts.js index a4836332e..7f4f8ad53 100644 --- a/apps/common/main/lib/collection/Fonts.js +++ b/apps/common/main/lib/collection/Fonts.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Fonts.js * diff --git a/apps/common/main/lib/collection/HistoryVersions.js b/apps/common/main/lib/collection/HistoryVersions.js index fd59e4fe4..f4d3a363a 100644 --- a/apps/common/main/lib/collection/HistoryVersions.js +++ b/apps/common/main/lib/collection/HistoryVersions.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 05.03.15 diff --git a/apps/common/main/lib/collection/Plugins.js b/apps/common/main/lib/collection/Plugins.js new file mode 100644 index 000000000..97deb6f42 --- /dev/null +++ b/apps/common/main/lib/collection/Plugins.js @@ -0,0 +1,54 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * User: Julia.Radzhabova + * Date: 17.05.16 + * Time: 15:54 + */ + +if (Common === undefined) + var Common = {}; + +Common.Collections = Common.Collections || {}; + +define([ + 'underscore', + 'backbone', + 'common/main/lib/model/Plugin' +], function(_, Backbone){ + 'use strict'; + + Common.Collections.Plugins = Backbone.Collection.extend({ + model: Common.Models.Plugin + }); +}); diff --git a/apps/common/main/lib/collection/ReviewChanges.js b/apps/common/main/lib/collection/ReviewChanges.js index 217542ff3..64c128ee7 100644 --- a/apps/common/main/lib/collection/ReviewChanges.js +++ b/apps/common/main/lib/collection/ReviewChanges.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ReviewChanges.js * diff --git a/apps/common/main/lib/collection/TextArt.js b/apps/common/main/lib/collection/TextArt.js index d931034b7..0a53dfaeb 100644 --- a/apps/common/main/lib/collection/TextArt.js +++ b/apps/common/main/lib/collection/TextArt.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Created by Julia.Radzhabova on 09.07.15 * Copyright (c) 2014 Ascensio System SIA. All rights reserved. diff --git a/apps/common/main/lib/collection/Users.js b/apps/common/main/lib/collection/Users.js index 1d96cd321..fccf3aabe 100644 --- a/apps/common/main/lib/collection/Users.js +++ b/apps/common/main/lib/collection/Users.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Users.js * diff --git a/apps/common/main/lib/component/BaseView.js b/apps/common/main/lib/component/BaseView.js index 49e9e996a..c5a6dda3e 100644 --- a/apps/common/main/lib/component/BaseView.js +++ b/apps/common/main/lib/component/BaseView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * BaseView.js * diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index ef470038d..0d11e6c0d 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Button.js * diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js index 2585f2093..29c173ca1 100644 --- a/apps/common/main/lib/component/CheckBox.js +++ b/apps/common/main/lib/component/CheckBox.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * CheckBox.js * @@ -97,6 +129,7 @@ define([ }, setDisabled: function(disabled) { + disabled = (disabled===true); if (disabled !== this.disabled) { this.$label.toggleClass('disabled', disabled); (disabled) ? this.$chk.attr({disabled: disabled}) : this.$chk.removeAttr('disabled'); diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js index 08551a9ed..e6eb4e0ab 100644 --- a/apps/common/main/lib/component/ColorButton.js +++ b/apps/common/main/lib/component/ColorButton.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/main/lib/component/ColorPalette.js b/apps/common/main/lib/component/ColorPalette.js index 07329c3c9..425246568 100644 --- a/apps/common/main/lib/component/ColorPalette.js +++ b/apps/common/main/lib/component/ColorPalette.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ColorPalette.js * diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js new file mode 100644 index 000000000..e69a4abd6 --- /dev/null +++ b/apps/common/main/lib/component/ColorPaletteExt.js @@ -0,0 +1,245 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * ColorPaletteExt.js + * + * Created by Julia Radzhabova on 07/21/15 + * Copyright (c) 2014 Ascensio System SIA. All rights reserved. + * + */ + +if (Common === undefined) + var Common = {}; + +define([ + 'common/main/lib/component/BaseView' +], function () { 'use strict'; + + Common.UI.ColorPaletteExt = Common.UI.BaseView.extend({ + options: { + dynamiccolors: 10, + allowReselect: true, + cls: '', + style: '' + }, + + template: + _.template([ + '
', + '<% var me = this; %>', + '<% $(colors).each(function(num, item) { %>', + '<% if (me.isColor(item)) { %>', + '
', + ' ', + '
', + '<% } else if (me.isTransparent(item)) { %>', + '
', + ' ', + '
', + '<% } else if (me.isEffect(item)) { %>', + '
', + ' ', + '
', + '<% } %>', + '<% }); %>', + '
'].join('')), + + colorRe: /(?:^|\s)color-(.{6})(?:\s|$)/, + selectedCls: 'selected', + + initialize : function(options) { + Common.UI.BaseView.prototype.initialize.call(this, options); + + this.id = this.options.id; + this.cls = this.options.cls; + this.style = this.options.style; + this.colors = this.options.colors || []; + this.value = this.options.value; + + if (this.options.el) + this.render(); + + if (this.options.value) + this.select(this.options.value, true); + }, + + render: function (parentEl) { + var me = this; + + if (!me.rendered) { + this.cmpEl = $(this.template({ + id : this.id, + cls : this.cls, + style : this.style, + colors : this.colors + })); + + if (parentEl) { + this.setElement(parentEl, false); + parentEl.html(this.cmpEl); + } else { + $(this.el).html(this.cmpEl); + } + + this.cmpEl.on('click', _.bind(this.handleClick, this)); + } else { + this.cmpEl = $(this.el); + } + + me.rendered = true; + return this; + }, + + isColor: function(v) { + return typeof(v) == 'string' && (/[0-9A-F]{6}/).test(v); + }, + + isTransparent: function(v) { + return typeof(v) == 'string' && (v=='transparent'); + }, + + isEffect: function(v) { + return (typeof(v) == 'object' && v.effectId !== undefined); + }, + + getColor: function() { + return this.value; + }, + + handleClick: function(e) { + var me = this; + var target = $(e.target).closest('div.palette-color-item'); + var color, cmp; + + if (target.length==0) return; + + if (target.hasClass('color-transparent') ) { + $(me.el).find('div.' + me.selectedCls).removeClass(me.selectedCls); + target.addClass(me.selectedCls); + me.value = 'transparent'; + me.trigger('select', me, 'transparent'); + } else { + if (!/^[a-fA-F0-9]{6}$/.test(me.value) || _.indexOf(me.colors, me.value)<0 ) + me.value = false; + + $(me.el).find('div.' + me.selectedCls).removeClass(me.selectedCls); + target.addClass(me.selectedCls); + + color = target[0].className.match(me.colorRe)[1]; + if ( target.hasClass('palette-color-effect') ) { + var effectId = parseInt(target.attr('effectid')); + if (color) { + me.value = color.toUpperCase(); + me.trigger('select', me, {color: color, effectId: effectId}); + } + } else { + if (/#?[a-fA-F0-9]{6}/.test(color)) { + color = /#?([a-fA-F0-9]{6})/.exec(color)[1].toUpperCase(); + me.value = color; + me.trigger('select', me, color); + } + } + } + }, + + select: function(color, suppressEvent) { + var el = $(this.el); + el.find('div.' + this.selectedCls).removeClass(this.selectedCls); + + if (!color) return; + + if (typeof(color) == 'object' ) { + var effectEl; + if (color.effectId !== undefined) { + effectEl = el.find('div[effectid="'+color.effectId+'"]').first(); + if (effectEl.length>0) { + effectEl.addClass(this.selectedCls); + this.value = effectEl[0].className.match(this.colorRe)[1].toUpperCase(); + } else + this.value = false; + } else if (color.effectValue !== undefined) { + effectEl = el.find('div[effectvalue="'+color.effectValue+'"].color-' + color.color.toUpperCase()).first(); + if (effectEl.length>0) { + effectEl.addClass(this.selectedCls); + this.value = effectEl[0].className.match(this.colorRe)[1].toUpperCase(); + } else + this.value = false; + } + } else { + if (/#?[a-fA-F0-9]{6}/.test(color)) { + color = /#?([a-fA-F0-9]{6})/.exec(color)[1].toUpperCase(); + this.value = color; + } + + if (/^[a-fA-F0-9]{6}|transparent$/.test(color) && _.indexOf(this.colors, color)>=0 ) { + if (_.indexOf(this.colors, this.value)<0) this.value = false; + + if (color != this.value || this.options.allowReselect) { + (color == 'transparent') ? el.find('div.color-transparent').addClass(this.selectedCls) : el.find('div.palette-color.color-' + color).first().addClass(this.selectedCls); + this.value = color; + if (suppressEvent !== true) { + this.fireEvent('select', this, color); + } + } + } else { + var co = el.find('#'+color).first(); + if (co.length==0) + co = el.find('div[color="'+color+'"]').first(); + if (co.length>0) { + co.addClass(this.selectedCls); + this.value = color.toUpperCase(); + } + } + } + }, + + updateColors: function(effectcolors) { + if (effectcolors===undefined) return; + + this.colors = effectcolors; + this.cmpEl = $(this.template({ + id : this.id, + cls : this.cls, + style : this.style, + colors : this.colors + })); + $(this.el).html(this.cmpEl); + this.cmpEl.on('click', _.bind(this.handleClick, this)); + }, + + clearSelection: function(suppressEvent) { + $(this.el).find('div.' + this.selectedCls).removeClass(this.selectedCls); + this.value = undefined; + } + }); +}); \ No newline at end of file diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js index 0c427f555..86a7f6f2a 100644 --- a/apps/common/main/lib/component/ComboBorderSize.js +++ b/apps/common/main/lib/component/ComboBorderSize.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ComboBorderSize.js * @@ -62,18 +94,20 @@ define([ ].join('')), initialize : function(options) { + var txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt); + Common.UI.ComboBox.prototype.initialize.call(this, _.extend({ editable: false, store: new Common.UI.BordersStore(), data: [ {displayValue: this.txtNoBorders, value: 0, pxValue: 0 }, - {displayValue: '0.5 pt', value: 0.5, pxValue: 0.5, offsety: 0}, - {displayValue: '1 pt', value: 1, pxValue: 1, offsety: 20}, - {displayValue: '1.5 pt', value: 1.5, pxValue: 2, offsety: 40}, - {displayValue: '2.25 pt', value: 2.25,pxValue: 3, offsety: 60}, - {displayValue: '3 pt', value: 3, pxValue: 4, offsety: 80}, - {displayValue: '4.5 pt', value: 4.5, pxValue: 5, offsety: 100}, - {displayValue: '6 pt', value: 6, pxValue: 6, offsety: 120} + {displayValue: '0.5 ' + txtPt, value: 0.5, pxValue: 0.5, offsety: 0}, + {displayValue: '1 ' + txtPt, value: 1, pxValue: 1, offsety: 20}, + {displayValue: '1.5 ' + txtPt, value: 1.5, pxValue: 2, offsety: 40}, + {displayValue: '2.25 ' + txtPt, value: 2.25,pxValue: 3, offsety: 60}, + {displayValue: '3 ' + txtPt, value: 3, pxValue: 4, offsety: 80}, + {displayValue: '4.5 ' + txtPt, value: 4.5, pxValue: 5, offsety: 100}, + {displayValue: '6 ' + txtPt, value: 6, pxValue: 6, offsety: 120} ], menuStyle: 'min-width: 150px;' }, options)); @@ -155,19 +189,20 @@ define([ initialize : function(options) { this.txtNoBorders = options.txtNoBorders || this.txtNoBorders; + var txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt); Common.UI.ComboBox.prototype.initialize.call(this, _.extend({ editable: true, store: new Common.UI.BordersStore(), data: [ {displayValue: this.txtNoBorders, value: 0, pxValue: 0 }, - {displayValue: '0.5 pt', value: 0.5, pxValue: 0.5, offsety: 0}, - {displayValue: '1 pt', value: 1, pxValue: 1, offsety: 20}, - {displayValue: '1.5 pt', value: 1.5, pxValue: 2, offsety: 40}, - {displayValue: '2.25 pt', value: 2.25,pxValue: 3, offsety: 60}, - {displayValue: '3 pt', value: 3, pxValue: 4, offsety: 80}, - {displayValue: '4.5 pt', value: 4.5, pxValue: 5, offsety: 100}, - {displayValue: '6 pt', value: 6, pxValue: 6, offsety: 120} + {displayValue: '0.5 ' + txtPt, value: 0.5, pxValue: 0.5, offsety: 0}, + {displayValue: '1 ' + txtPt, value: 1, pxValue: 1, offsety: 20}, + {displayValue: '1.5 ' + txtPt, value: 1.5, pxValue: 2, offsety: 40}, + {displayValue: '2.25 ' + txtPt, value: 2.25,pxValue: 3, offsety: 60}, + {displayValue: '3 ' + txtPt, value: 3, pxValue: 4, offsety: 80}, + {displayValue: '4.5 ' + txtPt, value: 4.5, pxValue: 5, offsety: 100}, + {displayValue: '6 ' + txtPt, value: 6, pxValue: 6, offsety: 120} ], menuStyle: 'min-width: 150px;' }, options)); diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 5ad4c4b4b..e451e0d7c 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ComboBox.js * diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 53c6b9dce..f27ee50e0 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ComboBoxFonts.js * @@ -18,12 +50,12 @@ define([ Common.UI.ComboBoxFonts = Common.UI.ComboBox.extend((function() { var iconWidth = 302, - iconHeight = FONT_THUMBNAIL_HEIGHT || 26, + iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, isRetina = window.devicePixelRatio > 1, thumbCanvas = document.createElement('canvas'), thumbContext = thumbCanvas.getContext('2d'), - thumbPath = '../../../sdk/Common/Images/fonts_thumbnail.png', - thumbPath2x = '../../../sdk/Common/Images/fonts_thumbnail@2x.png', + thumbPath = '../../../../sdkjs/common/Images/fonts_thumbnail.png', + thumbPath2x = '../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', listItemHeight = 36; if (typeof window['AscDesktopEditor'] === 'object') { @@ -158,10 +190,9 @@ define([ if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) { _.delay(function() { - var selected = me.cmpEl.find('ul li.selected a'); - - if (selected.length<=0) - selected = me.cmpEl.find('ul li:not(.divider):first a'); + var selected = (e.keyCode == Common.UI.Keys.DOWN) ? me.cmpEl.find('ul li.selected').nextAll('li:not(.divider)') : me.cmpEl.find('ul li.selected').prevAll('li:not(.divider)'); + selected = (selected.length>0) ? selected.eq(0) : ((e.keyCode == Common.UI.Keys.DOWN) ? me.cmpEl.find('ul li:not(.divider):first') : me.cmpEl.find('ul li:not(.divider):last')); + selected = selected.find('a'); me._skipInputChange = true; selected.focus(); @@ -228,10 +259,10 @@ define([ if (isRetina) { thumbContext.clearRect(0, 0, iconWidth * 2, iconHeight * 2); - thumbContext.drawImage(this.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * 2 * opts.imgidx); + thumbContext.drawImage(this.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * 2 * opts.imgidx); } else { thumbContext.clearRect(0, 0, iconWidth, iconHeight); - thumbContext.drawImage(this.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * opts.imgidx); + thumbContext.drawImage(this.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * opts.imgidx); } return thumbCanvas.toDataURL(); @@ -443,10 +474,10 @@ define([ if (isRetina) { context.clearRect(0, 0, iconWidth * 2, iconHeight * 2); - context.drawImage(me.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * 2 * index); + context.drawImage(me.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * 2 * index); } else { context.clearRect(0, 0, iconWidth, iconHeight); - context.drawImage(me.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * index); + context.drawImage(me.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * index); } me.tiles[j] = fontImage; diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js index f1f017b00..8c32b0996 100644 --- a/apps/common/main/lib/component/ComboDataView.js +++ b/apps/common/main/lib/component/ComboDataView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ComboDataView.js * diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 6b596b693..091a49fe7 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DataView.js * diff --git a/apps/common/main/lib/component/DimensionPicker.js b/apps/common/main/lib/component/DimensionPicker.js index f8db3c87e..7e5a475b5 100644 --- a/apps/common/main/lib/component/DimensionPicker.js +++ b/apps/common/main/lib/component/DimensionPicker.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DimensionPicker.js * diff --git a/apps/common/main/lib/component/HSBColorPicker.js b/apps/common/main/lib/component/HSBColorPicker.js index b3ff4c44a..e943b62f2 100644 --- a/apps/common/main/lib/component/HSBColorPicker.js +++ b/apps/common/main/lib/component/HSBColorPicker.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index 54ea49234..f7102cc6e 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/apps/common/main/lib/component/InputField.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * InputField.js * diff --git a/apps/common/main/lib/component/Layout.js b/apps/common/main/lib/component/Layout.js index 02c3de7ee..f3d161366 100644 --- a/apps/common/main/lib/component/Layout.js +++ b/apps/common/main/lib/component/Layout.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Layout.js * diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js index c90e920e8..a3a410a88 100644 --- a/apps/common/main/lib/component/ListView.js +++ b/apps/common/main/lib/component/ListView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ListView.js * diff --git a/apps/common/main/lib/component/LoadMask.js b/apps/common/main/lib/component/LoadMask.js index 8fbea64be..8bd74cdd0 100644 --- a/apps/common/main/lib/component/LoadMask.js +++ b/apps/common/main/lib/component/LoadMask.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * LoadMask.js * diff --git a/apps/common/main/lib/component/MaskedField.js b/apps/common/main/lib/component/MaskedField.js index a0c45e3af..f66544310 100644 --- a/apps/common/main/lib/component/MaskedField.js +++ b/apps/common/main/lib/component/MaskedField.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js index c326d2318..a68db2469 100644 --- a/apps/common/main/lib/component/Menu.js +++ b/apps/common/main/lib/component/Menu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Menu.js * diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js index fcfac31f1..a0afe4d35 100644 --- a/apps/common/main/lib/component/MenuItem.js +++ b/apps/common/main/lib/component/MenuItem.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * MenuItem.js * diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js index 35ad084b1..8611da192 100644 --- a/apps/common/main/lib/component/MetricSpinner.js +++ b/apps/common/main/lib/component/MetricSpinner.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * MetricSpinner.js * @@ -26,7 +58,7 @@ * * * @property {String} defaultUnit - * Name of the unit of measurement. Can be px|em|%|en|ex|pt|in|cm|mm|pc|s|ms. + * Name of the unit of measurement. Can be px|em|%|en|ex|pt|"|cm|mm|pc|s|ms|см|мм|пт|сек|мс. * * defaultUnit: 'px', * @@ -230,13 +262,13 @@ define([ var units = this.options.defaultUnit; if ( typeof value.match !== 'undefined'){ - var searchUnits = value.match(/(px|em|%|en|ex|pt|in|cm|mm|pc|s|ms)$/i); + var searchUnits = value.match(/(px|em|%|en|ex|pt|"|cm|mm|pc|s|ms|см|мм|пт|сек|мс)$/i); if (null !== searchUnits && searchUnits[0]!=='undefined') { units = searchUnits[0].toLowerCase(); } } - if (this.options.defaultUnit !== units) { + if (this.options.defaultUnit !== units && !showError) { number = this._recalcUnits(number, units); } if (number > this.options.maxValue) { number = this.options.maxValue; showError = true; } @@ -450,38 +482,38 @@ define([ }, _recalcUnits: function(value, fromUnit){ - if ( fromUnit.match(/(s|ms)$/i) && this.options.defaultUnit.match(/(s|ms)$/i) ) { + if ( fromUnit.match(/(s|ms|сек|мс)$/i) && this.options.defaultUnit.match(/(s|ms|сек|мс)$/i) ) { var v_out = value; // to sec - if (fromUnit=='ms') + if (fromUnit=='ms' || fromUnit=='мс') v_out = v_out/1000.; // from sec - if (this.options.defaultUnit=='ms') + if (this.options.defaultUnit=='ms' || this.options.defaultUnit=='мс') v_out = v_out*1000; return v_out; } - if ( fromUnit.match(/(pt|in|cm|mm|pc)$/i)===null || this.options.defaultUnit.match(/(pt|in|cm|mm|pc)$/i)===null) + if ( fromUnit.match(/(pt|"|cm|mm|pc|см|мм|пт)$/i)===null || this.options.defaultUnit.match(/(pt|"|cm|mm|pc|см|мм|пт)$/i)===null) return value; var v_out = value; // to mm - if (fromUnit=='cm') + if (fromUnit=='cm' || fromUnit=='см') v_out = v_out*10; - else if (fromUnit=='pt') + else if (fromUnit=='pt' || fromUnit=='пт') v_out = v_out * 25.4 / 72.0; - else if (fromUnit=='in') + else if (fromUnit=='\"') v_out = v_out * 25.4; else if (fromUnit=='pc') v_out = v_out * 25.4 / 6.0; // from mm - if (this.options.defaultUnit=='cm') + if (this.options.defaultUnit=='cm' || this.options.defaultUnit=='см') v_out = v_out/10.; - else if (this.options.defaultUnit=='pt') + else if (this.options.defaultUnit=='pt' || this.options.defaultUnit=='пт') v_out = parseFloat((v_out * 72.0 / 25.4).toFixed(3)); - else if (this.options.defaultUnit=='in') - v_out = v_out / 25.4; + else if (this.options.defaultUnit=='\"') + v_out = parseFloat((v_out / 25.4).toFixed(3)); else if (this.options.defaultUnit=='pc') v_out = v_out * 6.0 / 25.4; diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index 5e08576ad..07fd49f40 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * MultiSliderGradient.js * diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js index 0edc29be7..73f76d100 100644 --- a/apps/common/main/lib/component/RadioBox.js +++ b/apps/common/main/lib/component/RadioBox.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * RadioBox.js * diff --git a/apps/common/main/lib/component/Scroller.js b/apps/common/main/lib/component/Scroller.js index 0f667cffd..43ab242ea 100644 --- a/apps/common/main/lib/component/Scroller.js +++ b/apps/common/main/lib/component/Scroller.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Scroller.js * diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index 5361dadda..3279c75cb 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Slider.js * diff --git a/apps/common/main/lib/component/Switcher.js b/apps/common/main/lib/component/Switcher.js index 0924b3b0b..f9ae91e90 100644 --- a/apps/common/main/lib/component/Switcher.js +++ b/apps/common/main/lib/component/Switcher.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 26.02.15 diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index e51e47d67..4c20654a4 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 750a998ab..863dece1a 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Tab.js * diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 4acebe1a9..5487891c0 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TabBar.js * diff --git a/apps/common/main/lib/component/TableStyler.js b/apps/common/main/lib/component/TableStyler.js index a37ef069f..4736d4e1e 100644 --- a/apps/common/main/lib/component/TableStyler.js +++ b/apps/common/main/lib/component/TableStyler.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableStyler.js * diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js index 890ffff74..769419825 100644 --- a/apps/common/main/lib/component/ThemeColorPalette.js +++ b/apps/common/main/lib/component/ThemeColorPalette.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ThemeColorPalette.js * diff --git a/apps/common/main/lib/component/ToggleManager.js b/apps/common/main/lib/component/ToggleManager.js index ec9233150..f40d363cf 100644 --- a/apps/common/main/lib/component/ToggleManager.js +++ b/apps/common/main/lib/component/ToggleManager.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ToggleManager.js * diff --git a/apps/common/main/lib/component/Tooltip.js b/apps/common/main/lib/component/Tooltip.js index b2779c056..71e36dd4c 100644 --- a/apps/common/main/lib/component/Tooltip.js +++ b/apps/common/main/lib/component/Tooltip.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Tooltip.js * diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index c20af8b25..5b2a20195 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Window.js * @@ -269,9 +301,14 @@ define([ options.primary = 'ok'; var newBtns = {}; _.each(options.buttons, function(b){ - newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''}; - if (b=='custom') - newBtns[b].cls += ' custom'; + if (typeof(b) == 'object') { + if (b.value !== undefined) + newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')}; + } else { + newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''}; + if (b=='custom') + newBtns[b].cls += ' custom'; + } }); options.buttons = newBtns; diff --git a/apps/common/main/lib/controller/Chat.js b/apps/common/main/lib/controller/Chat.js index adc52a1e5..767f44742 100644 --- a/apps/common/main/lib/controller/Chat.js +++ b/apps/common/main/lib/controller/Chat.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Chat.js * diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 7cadd65f5..95545f8d9 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Comments.js * @@ -21,11 +53,11 @@ define([ // NOTE: временное решение function buildCommentData () { - if (typeof asc_CCommentDataWord !== 'undefined') { - return new asc_CCommentDataWord(null); + if (typeof Asc.asc_CCommentDataWord !== 'undefined') { + return new Asc.asc_CCommentDataWord(null); } - return new asc_CCommentData(null); + return new Asc.asc_CCommentData(null); } Common.Controllers.Comments = Backbone.Controller.extend(_.extend({ @@ -1111,7 +1143,9 @@ define([ this.isDummyComment = false; this.popoverComments.reset(); - + if (this.getPopover().isVisible()) { + this.getPopover().hide(); + } comment.asc_putText(commentVal); comment.asc_putTime(this.utcDateToString(new Date())); comment.asc_putUserId(this.currentUserId); diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js index fe1413239..876c5f6a5 100644 --- a/apps/common/main/lib/controller/ExternalDiagramEditor.js +++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ExternalDiagramEditor.js * @@ -18,6 +50,7 @@ define([ Common.Controllers.ExternalDiagramEditor = Backbone.Controller.extend(_.extend((function() { var appLang = 'en', customization = undefined, + targetApp = '', externalEditor = null; @@ -35,6 +68,7 @@ define([ }, editorConfig: { mode : 'editdiagram', + targetApp : targetApp, lang : appLang, canCoAuthoring : false, canBackToFolder : false, @@ -116,6 +150,7 @@ define([ if (data && data.config) { if (data.config.lang) appLang = data.config.lang; if (data.config.customization) customization = data.config.customization; + if (data.config.targetApp) targetApp = data.config.targetApp; } }, diff --git a/apps/common/main/lib/controller/ExternalMergeEditor.js b/apps/common/main/lib/controller/ExternalMergeEditor.js index 6658a4a90..e45e1518d 100644 --- a/apps/common/main/lib/controller/ExternalMergeEditor.js +++ b/apps/common/main/lib/controller/ExternalMergeEditor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ExternalDiagramEditor.js * @@ -18,6 +50,7 @@ define([ Common.Controllers.ExternalMergeEditor = Backbone.Controller.extend(_.extend((function() { var appLang = 'en', customization = undefined, + targetApp = '', externalEditor = null; @@ -35,6 +68,7 @@ define([ }, editorConfig: { mode : 'editmerge', + targetApp : targetApp, lang : appLang, canCoAuthoring : false, canBackToFolder : false, @@ -117,6 +151,7 @@ define([ if (data && data.config) { if (data.config.lang) appLang = data.config.lang; if (data.config.customization) customization = data.config.customization; + if (data.config.targetApp) targetApp = data.config.targetApp; } }, diff --git a/apps/common/main/lib/controller/Fonts.js b/apps/common/main/lib/controller/Fonts.js index bf688e69d..4f970e845 100644 --- a/apps/common/main/lib/controller/Fonts.js +++ b/apps/common/main/lib/controller/Fonts.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Fonts.js * diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 6d6d11927..334ccab31 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 06.03.15 @@ -100,18 +132,19 @@ define([ if (historyStore && data!==null) { var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); + var diff = opts.data.urlDiff || opts.data.changesUrl; if (revisions && revisions.length>0) { for(var i=0; i1 && arguments[1] instanceof jQuery.Event) { e = arguments[1]; - if ( /^(38|40|27|13|9)$/.test(e.keyCode)) { + if ( /^(38|40|27|13|9)$/.test(e.keyCode) && !e.ctrlKey && !e.altKey) { patchDropDownKeyDownAdditional.call(this, e); e.preventDefault(); e.stopPropagation(); } - } else if ( !$parent.hasClass('no-stop-propagate') || /^(38|40|27|13|9)$/.test(e.keyCode)) { + } else if ( !$parent.hasClass('no-stop-propagate') || /^(38|40|27|13|9)$/.test(e.keyCode) && !e.ctrlKey && !e.altKey) { patchDropDownKeyDown.call(this, e); e.preventDefault(); e.stopPropagation(); diff --git a/apps/common/main/lib/model/ChatMessage.js b/apps/common/main/lib/model/ChatMessage.js index edf3b95b1..b043b0aee 100644 --- a/apps/common/main/lib/model/ChatMessage.js +++ b/apps/common/main/lib/model/ChatMessage.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ChatMessage.js * diff --git a/apps/common/main/lib/model/Comment.js b/apps/common/main/lib/model/Comment.js index b57453a88..9045925ac 100644 --- a/apps/common/main/lib/model/Comment.js +++ b/apps/common/main/lib/model/Comment.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Comments.js * diff --git a/apps/common/main/lib/model/Font.js b/apps/common/main/lib/model/Font.js index d5ef1ecab..61450e31f 100644 --- a/apps/common/main/lib/model/Font.js +++ b/apps/common/main/lib/model/Font.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Font.js * diff --git a/apps/common/main/lib/model/HistoryVersion.js b/apps/common/main/lib/model/HistoryVersion.js index 1516811d3..2b3fff5aa 100644 --- a/apps/common/main/lib/model/HistoryVersion.js +++ b/apps/common/main/lib/model/HistoryVersion.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 05.03.15 diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js new file mode 100644 index 000000000..83308797f --- /dev/null +++ b/apps/common/main/lib/model/Plugin.js @@ -0,0 +1,86 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * User: Julia.Radzhabova + * Date: 17.05.16 + * Time: 15:56 + */ + +if (Common === undefined) + var Common = {}; + +Common.Models = Common.Models || {}; + +define([ + 'underscore', + 'backbone', + 'common/main/lib/component/BaseView' +], function(_, Backbone){ + 'use strict'; + + Common.Models.PluginVariation = Backbone.Model.extend({ + defaults: function() { + return { + description: "", + url: "", + index: 0, + icons: undefined, + isViewer: false, + EditorsSupport: ["word", "cell", "slide"], + isVisual: false, + isModal: false, + isInsideMode: false, + initDataType: 0, + initData: "", + isUpdateOleOnResize: false, + buttons: [] + } + } + }); + + Common.Models.Plugin = Backbone.Model.extend({ + defaults: function() { + return { + id: Common.UI.getId(), + name : '', + baseUrl : '', + guid: Common.UI.getId(), + variations: [], + currentVariation: 0, + pluginObj: undefined, + allowSelected: false, + selected: false + } + } + }); +}); diff --git a/apps/common/main/lib/model/ReviewChange.js b/apps/common/main/lib/model/ReviewChange.js index a9fcbf32d..a161ee25b 100644 --- a/apps/common/main/lib/model/ReviewChange.js +++ b/apps/common/main/lib/model/ReviewChange.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ReviewChange.js * diff --git a/apps/common/main/lib/model/User.js b/apps/common/main/lib/model/User.js index 07461d56b..55c81745d 100644 --- a/apps/common/main/lib/model/User.js +++ b/apps/common/main/lib/model/User.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User.js * diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template index 42ab32de2..9b6ccb036 100644 --- a/apps/common/main/lib/template/Comments.template +++ b/apps/common/main/lib/template/Comments.template @@ -9,7 +9,7 @@
<%=scope.getFixedQuote(quote)%>
<% } %> <% if (!editText) { %> -
<%=scope.pickLink(comment)%>
+
<%=scope.pickLink(comment)%>
<% } else { %>
@@ -27,7 +27,7 @@
<%=scope.getUserName(item.get("username"))%>
<%=item.get("date")%>
<% if (!item.get("editText")) { %> -
<%=scope.pickLink(item.get("reply"))%>
+
<%=scope.pickLink(item.get("reply"))%>
">
">
diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index d2ca4e715..b2bca6691 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -5,7 +5,7 @@
<%=scope.getUserName(username)%>
<%=date%>
<% if (!editTextInPopover || hint) { %> -
<%=scope.pickLink(comment)%>
+
<%=scope.pickLink(comment)%>
<% } else { %>
@@ -27,7 +27,7 @@
<%=scope.getUserName(item.get("username"))%>
<%=item.get("date")%>
<% if (!item.get("editTextInPopover")) { %> -
<%=scope.pickLink(item.get("reply"))%>
+
<%=scope.pickLink(item.get("reply"))%>
<% if (!hint) { %>
">
diff --git a/apps/common/main/lib/template/ReviewChangesPopover.template b/apps/common/main/lib/template/ReviewChangesPopover.template index b14295448..dbdd6586c 100644 --- a/apps/common/main/lib/template/ReviewChangesPopover.template +++ b/apps/common/main/lib/template/ReviewChangesPopover.template @@ -1,7 +1,7 @@
<%=scope.getUserName(username)%>
<%=date%>
-
<%=changetext%>
+
<%=changetext%>
<% if (scope.isReviewOnly) { %>
diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js index 4afbef3b6..df89c880e 100644 --- a/apps/common/main/lib/util/LanguageInfo.js +++ b/apps/common/main/lib/util/LanguageInfo.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * LanguageInfo.js * diff --git a/apps/common/main/lib/util/LocalStorage.js b/apps/common/main/lib/util/LocalStorage.js index 42f2b1d5c..b3ceda5bd 100644 --- a/apps/common/main/lib/util/LocalStorage.js +++ b/apps/common/main/lib/util/LocalStorage.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * LocalStorage.js * diff --git a/apps/common/main/lib/util/Shortcuts.js b/apps/common/main/lib/util/Shortcuts.js index 9c65ff200..be6eb219c 100644 --- a/apps/common/main/lib/util/Shortcuts.js +++ b/apps/common/main/lib/util/Shortcuts.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Shortcuts.js * diff --git a/apps/common/main/lib/util/Tip.js b/apps/common/main/lib/util/Tip.js index c504cd1bc..ce7359cf9 100644 --- a/apps/common/main/lib/util/Tip.js +++ b/apps/common/main/lib/util/Tip.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /* =========================================================== * * Extends bootstrap-tooltip.js diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 79612c7ea..c7f6f0a6b 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) { var Common = {}; } @@ -6,7 +38,7 @@ if (Common.Utils === undefined) { Common.Utils = {}; } -Common.Utils = new(function() { +Common.Utils = _.extend(new(function() { var userAgent = navigator.userAgent.toLowerCase(), check = function(regex){ return regex.test(userAgent); @@ -132,7 +164,7 @@ Common.Utils = new(function() { hostnameStrongRe: hostnameStrongRe, documentSettingsType: documentSettingsType } -})(); +})(), Common.Utils || {}); Common.Utils.ThemeColor = new(function() { return { @@ -192,8 +224,8 @@ Common.Utils.ThemeColor = new(function() { color=color.replace(/#/,''); if(color.length==3) color=color.replace(/(.)/g,'$1$1'); color=parseInt(color,16); - var c = new CAscColor(); - c.put_type( (typeof(clr) == 'object' && clr.effectId !== undefined)? c_oAscColor.COLOR_TYPE_SCHEME : c_oAscColor.COLOR_TYPE_SRGB); + var c = new Asc.asc_CColor(); + c.put_type( (typeof(clr) == 'object' && clr.effectId !== undefined)? Asc.c_oAscColor.COLOR_TYPE_SCHEME : Asc.c_oAscColor.COLOR_TYPE_SRGB); c.put_r(color>>16); c.put_g((color&0xff00)>>8); c.put_b(color&0xff); @@ -217,19 +249,24 @@ Common.Utils.ThemeColor = new(function() { } })(); -Common.Utils.Metric = new(function() { +Common.Utils.Metric = _.extend( new(function() { var me = this; me.c_MetricUnits = { cm: 0, - pt: 1 + pt: 1, + inch: 2 }; + me.currentMetric = me.c_MetricUnits.pt; - me.metricName = ['cm', 'pt']; + me.metricName = ['Cm', 'Pt', 'Inch']; + me.defaultMetric = me.c_MetricUnits.cm; return { c_MetricUnits: me.c_MetricUnits, - metricName : me.metricName, + txtCm : 'cm', + txtPt : 'pt', + txtInch : '\"', setCurrentMetric: function(value) { me.currentMetric = value; @@ -239,31 +276,51 @@ Common.Utils.Metric = new(function() { return me.currentMetric; }, + getCurrentMetricName: function() { + return this['txt' + me.metricName[me.currentMetric]]; + }, + + getMetricName: function(unit) { + return this['txt' + me.metricName[(unit !== undefined) ? unit : 0]]; + }, + + setDefaultMetric: function(value) { + me.defaultMetric = value; + }, + + getDefaultMetric: function() { + return me.defaultMetric; + }, + fnRecalcToMM: function(value) { - // value in pt/cm. need to convert to mm + // value in pt/cm/inch. need to convert to mm if (value!==null && value!==undefined) { switch (me.currentMetric) { case me.c_MetricUnits.cm: return value * 10; case me.c_MetricUnits.pt: return value * 25.4 / 72.0; + case me.c_MetricUnits.inch: + return value * 25.4; } } return value; }, fnRecalcFromMM: function(value) { - // value in mm. need to convert to pt/cm + // value in mm. need to convert to pt/cm/inch switch (me.currentMetric) { case me.c_MetricUnits.cm: return parseFloat((value/10.).toFixed(4)); case me.c_MetricUnits.pt: return parseFloat((value * 72.0 / 25.4).toFixed(3)); + case me.c_MetricUnits.inch: + return parseFloat((value / 25.4).toFixed(3)); } return value; } } -})(); +})(), Common.Utils.Metric || {}); Common.Utils.RGBColor = function(colorString) { var r, g, b; diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js index f8a80cbdd..dcce825f5 100644 --- a/apps/common/main/lib/view/About.js +++ b/apps/common/main/lib/view/About.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * About.js * @@ -20,7 +52,7 @@ define([ initialize: function(options) { Common.UI.BaseView.prototype.initialize.call(this,arguments); - this.txtVersionNum = '3.7'; + this.txtVersionNum = '3.8'; this.txtAscMail = 'support@onlyoffice.com'; this.txtAscTelNum = '+371 660-16425'; this.txtAscUrl = 'www.onlyoffice.com'; diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index db7e2b964..2ad8a0524 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * AdvancedSettingsWindow.js * @@ -44,6 +76,7 @@ define([ this.handler = _options.handler; this.toggleGroup = _options.toggleGroup; this.contentWidth = _options.contentWidth; + this.storageName = _options.storageName; Common.UI.Window.prototype.initialize.call(this, _options); }, @@ -111,6 +144,37 @@ define([ return false; }, + setActiveCategory: function(index) { + if (this.btnsCategory.length<1) return; + + var btnActive = this.btnsCategory[(index>=0 && index', '
<%= msg.get("message") %>
', '<% } else { %>', - '
;"><%= scope.getUserName(msg.get("username")) %>
', + '
;"><%= scope.getUserName(msg.get("username")) %>
', '', '<% } %>', ''].join(''), @@ -79,7 +111,7 @@ define([ render: function(el) { el = el || this.el; - $(el).html(this.template({scope: this, maxMsgLength: c_oAscMaxCellOrCommentLength})); + $(el).html(this.template({scope: this, maxMsgLength: Asc.c_oAscMaxCellOrCommentLength})); this.panelBox = $('#chat-box', this.el); this.panelUsers = $('#chat-users', this.el); @@ -246,6 +278,7 @@ define([ hide: function () { Common.UI.BaseView.prototype.hide.call(this,arguments); this.fireEvent('hide', this ); + this.textBoxAutoSizeLocked = undefined; }, setupLayout: function () { @@ -308,6 +341,7 @@ define([ // text box setup autosize input text this.setupAutoSizingTextBox(); + this.txtMessage.bind('input propertychange', _.bind(this.updateHeightTextBox, this)); }, updateLayout: function (applyUsersAutoSizig) { @@ -341,18 +375,17 @@ define([ this.lineHeight = parseInt(this.txtMessage.css('lineHeight'), 10) * 1.25; // TODO: need fix this.updateHeightTextBox(true); - this.txtMessage.bind('input propertychange', _.bind(this.updateHeightTextBox, this)); }, updateHeightTextBox: function (event) { - var textBox, controlHeight, contentHeight, height, + var textBox = this.txtMessage, + controlHeight, contentHeight, height, textBoxMinHeightIndent = 36 + 4; // 4px - autosize line height + big around border - textBox = $('#chat-msg-text', this.el); height = this.panelBox.height(); if (event && 0 == textBox.val().length) { - this.layout.setResizeValue(1, Math.max(-this.addMessageBoxHeight, height - this.addMessageBoxHeight)); + this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight)); this.textBoxAutoSizeLocked = undefined; return; } @@ -375,7 +408,7 @@ define([ height = this.panelBox.height(); this.layout.setResizeValue(1, - Math.max(-this.addMessageBoxHeight, + Math.max(this.addMessageBoxHeight, Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight))); }, diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 6d921b67d..14930e085 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Comments.js * @@ -229,7 +261,7 @@ define([ textEdit: t.textEdit, textReply: t.textReply, textClose: t.textClose, - maxCommLength: c_oAscMaxCellOrCommentLength + maxCommLength: Asc.c_oAscMaxCellOrCommentLength }) ) }); @@ -805,7 +837,7 @@ define([ textAddComment: me.textAddComment, textCancel: me.textCancel, textEnterCommentHint: me.textEnterCommentHint, - maxCommLength: c_oAscMaxCellOrCommentLength + maxCommLength: Asc.c_oAscMaxCellOrCommentLength })); this.buttonAddCommentToDoc = new Common.UI.Button({ @@ -955,7 +987,7 @@ define([ textEdit: me.textEdit, textReply: me.textReply, textClose: me.textClose, - maxCommLength: c_oAscMaxCellOrCommentLength + maxCommLength: Asc.c_oAscMaxCellOrCommentLength })) }); diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js index e6bfd7d08..2f1526a94 100644 --- a/apps/common/main/lib/view/CopyWarningDialog.js +++ b/apps/common/main/lib/view/CopyWarningDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * CopyWarningDialog.js * diff --git a/apps/common/main/lib/view/DocumentAccessDialog.js b/apps/common/main/lib/view/DocumentAccessDialog.js index 18ad17b01..d691e0f86 100644 --- a/apps/common/main/lib/view/DocumentAccessDialog.js +++ b/apps/common/main/lib/view/DocumentAccessDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentAccessDialog.js * diff --git a/apps/common/main/lib/view/ExtendedColorDialog.js b/apps/common/main/lib/view/ExtendedColorDialog.js index 79aaa6a2b..187f1fd58 100644 --- a/apps/common/main/lib/view/ExtendedColorDialog.js +++ b/apps/common/main/lib/view/ExtendedColorDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ if (Common === undefined) var Common = {}; diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js index 621ac275f..eeb341695 100644 --- a/apps/common/main/lib/view/ExternalDiagramEditor.js +++ b/apps/common/main/lib/view/ExternalDiagramEditor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ExternalDiagramEditor.js * diff --git a/apps/common/main/lib/view/ExternalMergeEditor.js b/apps/common/main/lib/view/ExternalMergeEditor.js index bb5298d3c..6e693f21d 100644 --- a/apps/common/main/lib/view/ExternalMergeEditor.js +++ b/apps/common/main/lib/view/ExternalMergeEditor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ExternalDiagramEditor.js * diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 0479f8c6f..ed8360c4f 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Header.js * diff --git a/apps/common/main/lib/view/History.js b/apps/common/main/lib/view/History.js index bbcadc2ae..698bb7b11 100644 --- a/apps/common/main/lib/view/History.js +++ b/apps/common/main/lib/view/History.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 06.03.15 diff --git a/apps/common/main/lib/view/ImageFromUrlDialog.js b/apps/common/main/lib/view/ImageFromUrlDialog.js index 7b54bdaf3..bb77b0cd0 100644 --- a/apps/common/main/lib/view/ImageFromUrlDialog.js +++ b/apps/common/main/lib/view/ImageFromUrlDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ImageFromUrlDialog.js * diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js index 558a73931..e3f7d2fa3 100644 --- a/apps/common/main/lib/view/InsertTableDialog.js +++ b/apps/common/main/lib/view/InsertTableDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * InsertTableDialog.js * diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 194703690..852ffbfd7 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * OpenDialog.js * @@ -24,12 +56,12 @@ define([ _.extend(_options, { closable: false, width : 250, - height : (options.type == c_oAscAdvancedOptionsID.CSV) ? 205 : 155, + height : (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 205 : 155, contentWidth : 390, header : true, cls : 'open-dlg', contentTemplate : '', - title : t.txtTitle.replace('%1', (options.type == c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT') + title : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT') }, options); this.template = options.template || [ @@ -37,7 +69,7 @@ define([ '
', '', '
', - '<% if (type == c_oAscAdvancedOptionsID.CSV) { %>', + '<% if (type == Asc.c_oAscAdvancedOptionsID.CSV) { %>', '', '
', '<% } %>', @@ -255,7 +287,7 @@ define([ }); this.cmbEncoding.setValue( (this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0]); - if (this.type == c_oAscAdvancedOptionsID.CSV) { + if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) { this.cmbDelimiter = new Common.UI.ComboBox({ el: $('#id-delimiters-combo', this.$window), menuStyle: 'min-width: 110px;', diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js new file mode 100644 index 000000000..bf5d4b2bd --- /dev/null +++ b/apps/common/main/lib/view/Plugins.js @@ -0,0 +1,181 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * User: Julia.Radzhabova + * Date: 17.05.16 + * Time: 15:38 + */ + +if (Common === undefined) + var Common = {}; + +Common.Views = Common.Views || {}; + +define([ + 'common/main/lib/util/utils', + 'common/main/lib/component/BaseView', + 'common/main/lib/component/Layout', + 'common/main/lib/component/Window' +], function (template) { + 'use strict'; + + Common.Views.Plugins = Common.UI.BaseView.extend(_.extend({ + el: '#left-panel-plugins', + + storePlugins: undefined, + template: _.template([ + '
', + '', + '
', + '
', + '
' + ].join('')), + + initialize: function(options) { + _.extend(this, options); + this.pluginsPath = '../../../../sdkjs-plugins/'; + Common.UI.BaseView.prototype.initialize.call(this, arguments); + }, + + render: function(el) { + el = el || this.el; + $(el).html(this.template({scope: this})); + + this.viewPluginsList = new Common.UI.DataView({ + el: $('#plugins-list'), + store: this.storePlugins, + enableKeyEvents: false, + itemTemplate: _.template('
' + '<%= baseUrl %>' + '<% } else { %>' + this.pluginsPath + '<% } %>' + '<%= variations[currentVariation].get("icons")[(window.devicePixelRatio > 1) ? 1 : 0] %>); background-position: 0 0;">
') + }); + + this.trigger('render:after', this); + return this; + }, + + strPlugins: 'Plugins' + + }, Common.Views.Plugins || {})); + + Common.Views.PluginDlg = Common.UI.Window.extend(_.extend({ + initialize : function(options) { + var _options = {}; + _.extend(_options, { + width: 800, + height: (window.innerHeight-600)<0 ? window.innerHeight: 600, + cls: 'advanced-settings-dlg', + header: true + }, options); + + var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34; + this.template = [ + '
', + '
', + '
', + '<% if (_.size(buttons) > 0) { %>', + '
', + '
', + '<% for(var bt in buttons) { %>', + '', + '<% } %>', + '
', + '<% } %>' + ].join(''); + + _options.tpl = _.template(this.template, _options); + + this.url = options.url || ''; + Common.UI.Window.prototype.initialize.call(this, _options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'}); + + var iframe = document.createElement("iframe"); + iframe.id = 'plugin_iframe'; + iframe.name = 'pluginFrameEditor', + iframe.width = '100%'; + iframe.height = '100%'; + iframe.align = "top"; + iframe.frameBorder = 0; + iframe.scrolling = "no"; + iframe.onload = _.bind(this._onLoad,this); + $('#id-plugin-placeholder').append(iframe); + + this.loadMask = new Common.UI.LoadMask({owner: $('#id-plugin-placeholder')}); + this.loadMask.setTitle(this.textLoading); + this.loadMask.show(); + + iframe.src = this.url; + + var me = this; + + this.on('close', function(obj){ + }); + + this.on('show', function(obj){ + var h = me.getHeight(); + if (window.innerHeight>h && h<600 || window.innerHeight= 0) { + var min = parseInt(this.$window.css('min-height')); + height < min && (height = min); + this.$window.height(height); + + var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0; + + this.$window.find('> .body').css('height', height-header_height); + this.$window.find('> .body > .box').css('height', height-85); + + var top = ((parseInt(window.innerHeight) - parseInt(height)) / 2) * 0.9; + var left = (parseInt(window.innerWidth) - parseInt(this.initConfig.width)) / 2; + + this.$window.css('left',left); + this.$window.css('top',top); + } + }, + + textLoading : 'Loading' + }, Common.Views.PluginDlg || {})); +}); \ No newline at end of file diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 1e72fd10c..c599abfaa 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ReviewChanges.js * diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js index b73bb4110..9a6d3c3d1 100644 --- a/apps/common/main/lib/view/SearchDialog.js +++ b/apps/common/main/lib/view/SearchDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * SearchDialog.js * diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png old mode 100644 new mode 100755 diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png old mode 100644 new mode 100755 diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 2b68ccbe3..69a4fcedc 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -138,7 +138,7 @@ @common-controls-width: 100px; .img-commonctrl, - .theme-colorpalette .color-transparent, .dropdown-menu li .checked:before, .input-error:before { + .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before { background: e(%("url(%s)",'@{common-image-path}/@{common-controls}')) no-repeat; @media diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index f6b3efd21..89da9000e 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -146,8 +146,8 @@ background-color: @secondary; } - &:active, - &.active { + &:active:not(.disabled), + &.active:not(.disabled) { background-color: @primary; color: #fff; } diff --git a/apps/common/main/resources/less/colorpalette.less b/apps/common/main/resources/less/colorpalette.less index eb32981c4..08cd85b7b 100644 --- a/apps/common/main/resources/less/colorpalette.less +++ b/apps/common/main/resources/less/colorpalette.less @@ -10,4 +10,46 @@ .box-shadow(0 0 0 1px @primary); } } +} + +.palette-color-ext { + padding: 10px; + .palette-color-item { + padding: 0; + border: 1px solid #fff; + display: inline-block; + text-decoration: none; + -moz-outline: 0 none; + outline: 0 none; + cursor: pointer; + vertical-align: middle; + + em { + border: none; + display: block; + + span{ + height: 12px; + width: 12px; + cursor: pointer; + display: block; + border: 1px solid rgba(0, 0, 0, 0.2); + } + } + + &:hover, &.selected { + border-color: #000; + em span { + border-color: #fff; + } + } + } + + .color-transparent { + background-position: @nocolor-offset-x @nocolor-offset-y; + + em span { + border:solid 1px #C0C0C0; + } + } } \ No newline at end of file diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 9b9eba21d..04190efbf 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -157,9 +157,8 @@ } } -.combo-template { +.combo-template(@combo-dataview-height: 64px) { @combo-dataview-button-width: 18px; - @combo-dataview-height: 64px; height: @combo-dataview-height; @@ -196,6 +195,10 @@ } }; +.combo-template { + .combo-template(64px); +} + .combo-pattern { @combo-dataview-button-width: 15px; @combo-dataview-height: 40px; diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index 449f0536d..d4792cf34 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -67,7 +67,9 @@ color: @dropdown-link-active-color; &:hover, - &.hover { + &.hover, + &:focus, + &.focus { background-color: @primary; } } diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less new file mode 100644 index 000000000..3577df2dd --- /dev/null +++ b/apps/common/main/resources/less/plugins.less @@ -0,0 +1,27 @@ +#plugins-box { + position: relative; + width: 100%; + height: 100%; + + #plugins-header { + position: absolute; + height: 20px; + left: 0; + top: 0; + font-weight: bold; + margin-top: 10px; + margin-left: 12px; + } + + #plugins-list { + height: 100%; + overflow: hidden; + padding: 30px 0 10px 10px; + + .item-plugins { + width: 40px; + height: 40px; + } + } +} + diff --git a/apps/common/mobile/lib/component/PlanarSpinner.js b/apps/common/mobile/lib/component/PlanarSpinner.js index a599f2419..32293a2a5 100644 --- a/apps/common/mobile/lib/component/PlanarSpinner.js +++ b/apps/common/mobile/lib/component/PlanarSpinner.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.component.PlanarSpinner', { extend: 'Ext.field.Spinner', xtype: 'planarspinnerfield', diff --git a/apps/common/mobile/lib/component/RepeatableButton.js b/apps/common/mobile/lib/component/RepeatableButton.js index 7f5649a86..b8df68f07 100644 --- a/apps/common/mobile/lib/component/RepeatableButton.js +++ b/apps/common/mobile/lib/component/RepeatableButton.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.component.RepeatableButton', { extend: 'Ext.Button', xtype: 'repeatablebutton', diff --git a/apps/common/mobile/lib/component/SettingsList.js b/apps/common/mobile/lib/component/SettingsList.js index 3e51a5578..6560131bd 100644 --- a/apps/common/mobile/lib/component/SettingsList.js +++ b/apps/common/mobile/lib/component/SettingsList.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.component.SettingsList', { extend: 'Ext.List', alias: 'widget.settingslist', diff --git a/apps/common/mobile/lib/component/slider/Vertical.js b/apps/common/mobile/lib/component/slider/Vertical.js index 17da3e7ee..787baf5c8 100644 --- a/apps/common/mobile/lib/component/slider/Vertical.js +++ b/apps/common/mobile/lib/component/slider/Vertical.js @@ -1,3 +1,36 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ + Ext.define('Common.component.slider.Vertical', { extend: 'Ext.slider.Slider', xtype: 'verticalslider', diff --git a/apps/common/mobile/lib/controller/PopClip.js b/apps/common/mobile/lib/controller/PopClip.js index b8173848e..9553a44db 100644 --- a/apps/common/mobile/lib/controller/PopClip.js +++ b/apps/common/mobile/lib/controller/PopClip.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.controller.PopClip', { extend: 'Ext.app.Controller', diff --git a/apps/common/mobile/lib/model/SettingItem.js b/apps/common/mobile/lib/model/SettingItem.js index d1bc194ec..f9ecfff60 100644 --- a/apps/common/mobile/lib/model/SettingItem.js +++ b/apps/common/mobile/lib/model/SettingItem.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.model.SettingItem', { extend: 'Ext.data.Model', config: { diff --git a/apps/common/mobile/lib/store/SettingsList.js b/apps/common/mobile/lib/store/SettingsList.js index 3ee48bbce..3a58bb8bb 100644 --- a/apps/common/mobile/lib/store/SettingsList.js +++ b/apps/common/mobile/lib/store/SettingsList.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.store.SettingsList', { extend: 'Ext.data.Store', config: { diff --git a/apps/common/mobile/lib/view/PopClip.js b/apps/common/mobile/lib/view/PopClip.js index 40ae4285c..f19cb000e 100644 --- a/apps/common/mobile/lib/view/PopClip.js +++ b/apps/common/mobile/lib/view/PopClip.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.view.PopClip', { extend: 'Ext.Container', alias: 'widget.popclip', diff --git a/apps/common/mobile/lib/view/PopoverPanel.js b/apps/common/mobile/lib/view/PopoverPanel.js index e3667a53a..8a7ba5d4d 100644 --- a/apps/common/mobile/lib/view/PopoverPanel.js +++ b/apps/common/mobile/lib/view/PopoverPanel.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('Common.view.PopoverPanel', { extend: 'Ext.Panel', alias: 'widget.commonpopoverpanel', diff --git a/apps/common/mobile/loader.js b/apps/common/mobile/loader.js index 6bc2fe303..443332aeb 100644 --- a/apps/common/mobile/loader.js +++ b/apps/common/mobile/loader.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.Loader.setConfig({ enabled: true, disableCaching : false, diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index c04d04a3f..462870e25 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -301,9 +301,12 @@ - - - + + diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index c977ddaa7..44c24a922 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -292,8 +292,8 @@ - - + + diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 42a401bfa..c6bea5f94 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ var ApplicationController = new(function(){ var me, api, @@ -139,7 +171,7 @@ var ApplicationController = new(function(){ if (docConfig) { permissions = $.extend(permissions, docConfig.permissions); - var docInfo = new CDocInfo(); + var docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(docConfig.key); docInfo.put_Url(docConfig.url); docInfo.put_Title(docConfig.title); @@ -184,7 +216,7 @@ var ApplicationController = new(function(){ var text = ''; switch (id) { - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: text = 'Downloading document...'; break; default: @@ -192,7 +224,7 @@ var ApplicationController = new(function(){ break; } - if (type == c_oAscAsyncActionType['BlockInteraction']) { + if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { $('#id-loadmask .cmd-loader-title').html(text); showMask(); } @@ -323,19 +355,19 @@ var ApplicationController = new(function(){ switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: message = me.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: message = me.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: message = me.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: message = me.downloadErrorText; break; @@ -344,7 +376,7 @@ var ApplicationController = new(function(){ break; } - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, message); @@ -395,7 +427,7 @@ var ApplicationController = new(function(){ } function onDownloadAs() { - if (api) api.asc_DownloadAs(c_oAscFileType.DOCX, true); + if (api) api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true); } // Helpers @@ -672,13 +704,11 @@ var ApplicationController = new(function(){ }); window["flat_desine"] = true; - api = new asc_docs_api("editor_sdk"); + api = new Asc.asc_docs_api({ + 'id-view' : 'editor_sdk' + }); if (api){ - api.CreateComponents(); - api.asc_SetFontsPath("../../../sdk/Fonts/"); - api.Init(); - api.asc_registerCallback('asc_onError', onError); api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady); api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); diff --git a/apps/documenteditor/embed/js/ApplicationView.js b/apps/documenteditor/embed/js/ApplicationView.js index 8e3677a73..a42c5c2cc 100644 --- a/apps/documenteditor/embed/js/ApplicationView.js +++ b/apps/documenteditor/embed/js/ApplicationView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ var ApplicationView = new(function(){ // Initialize view diff --git a/apps/documenteditor/embed/js/application.js b/apps/documenteditor/embed/js/application.js index e8bdeab02..541640578 100644 --- a/apps/documenteditor/embed/js/application.js +++ b/apps/documenteditor/embed/js/application.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ (function ($) { $(function(){ diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index 8fbc9bbf2..40df85e8a 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * app.js * @@ -25,8 +57,8 @@ require.config({ jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', - allfonts : '../sdk/Common/AllFonts', - sdk : '../sdk/Word/sdk-all', + allfonts : '../../sdkjs/common/AllFonts', + sdk : '../../sdkjs/word/sdk-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -38,7 +70,7 @@ require.config({ locale : 'common/locale', irregularstack : 'common/IrregularStack' }, -// urlArgs: "_dc=" + (new Date()).getTime(), // debug only, be sure to remove it before deploying your code. + shim: { underscore: { exports: '_' @@ -129,6 +161,7 @@ require([ ,'Common.Controllers.Chat' ,'Common.Controllers.Comments' /** coauthoring end **/ + ,'Common.Controllers.Plugins' ,'Common.Controllers.ExternalDiagramEditor' ,'Common.Controllers.ExternalMergeEditor' ,'Common.Controllers.ReviewChanges' @@ -159,6 +192,7 @@ require([ ,'common/main/lib/controller/Comments' ,'common/main/lib/controller/Chat' /** coauthoring end **/ + ,'common/main/lib/controller/Plugins' ,'documenteditor/main/app/view/ChartSettings' ,'common/main/lib/controller/ExternalDiagramEditor' ,'common/main/lib/controller/ExternalMergeEditor' diff --git a/apps/documenteditor/main/app/collection/EquationGroups.js b/apps/documenteditor/main/app/collection/EquationGroups.js index 9e5029c28..ed1453642 100644 --- a/apps/documenteditor/main/app/collection/EquationGroups.js +++ b/apps/documenteditor/main/app/collection/EquationGroups.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * EquationGroups.js * diff --git a/apps/documenteditor/main/app/collection/ShapeGroups.js b/apps/documenteditor/main/app/collection/ShapeGroups.js index 819485bdb..1e2ddf91e 100644 --- a/apps/documenteditor/main/app/collection/ShapeGroups.js +++ b/apps/documenteditor/main/app/collection/ShapeGroups.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeGroups.js * diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index e20f73af1..225b14ad2 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentHolder.js * diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 4b6ae976a..0d65e83e3 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * LeftMenu.js * @@ -142,10 +174,20 @@ define([ if (this.mode.canUseHistory) this.leftMenu.setOptionsPanel('history', this.getApplication().getController('Common.Controllers.History').getView('Common.Views.History')); + this.enablePlugins(); + Common.util.Shortcuts.resumeEvents(); return this; }, + enablePlugins: function() { + if (this.mode.canPlugins) { + this.leftMenu.btnPlugins.show(); + this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins')); + } else + this.leftMenu.btnPlugins.hide(); + }, + clickMenuFileItem: function(menu, action, isopts) { var close_menu = true; switch (action) { @@ -206,7 +248,7 @@ define([ clickSaveAsFormat: function(menu, format) { if (menu) { - if (format == c_oAscFileType.TXT) { + if (format == Asc.c_oAscFileType.TXT) { Common.UI.warning({ closable: false, title: this.notcriticalErrorTitle, @@ -237,14 +279,14 @@ define([ if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline) { value = Common.localStorage.getItem("de-settings-coauthmode"); var fast_coauth = (value===null || parseInt(value) == 1); - this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1); + this.api.asc_SetFastCollaborative(fast_coauth); value = Common.localStorage.getItem((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict"); switch(value) { - case 'all': value = c_oAscCollaborativeMarksShowType.All; break; - case 'none': value = c_oAscCollaborativeMarksShowType.None; break; - case 'last': value = c_oAscCollaborativeMarksShowType.LastChanges; break; - default: value = (fast_coauth) ? c_oAscCollaborativeMarksShowType.None : c_oAscCollaborativeMarksShowType.LastChanges; + case 'all': value = Asc.c_oAscCollaborativeMarksShowType.All; break; + case 'none': value = Asc.c_oAscCollaborativeMarksShowType.None; break; + case 'last': value = Asc.c_oAscCollaborativeMarksShowType.LastChanges; break; + default: value = (fast_coauth) ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges; } this.api.SetCollaborativeMarksShowType(value); } @@ -260,10 +302,8 @@ define([ case '0': this.api.SetFontRenderingMode(3); break; } - if (this.mode.canAutosave) { - value = Common.localStorage.getItem("de-settings-autosave"); - this.api.asc_setAutoSaveGap(parseInt(value)); - } + value = Common.localStorage.getItem("de-settings-autosave"); + this.api.asc_setAutoSaveGap(parseInt(value)); value = Common.localStorage.getItem("de-settings-spellcheck"); this.api.asc_setSpellCheck(value===null || parseInt(value) == 1); @@ -407,6 +447,7 @@ define([ this.leftMenu.btnComments.setDisabled(true); this.leftMenu.btnChat.setDisabled(true); /** coauthoring end **/ + this.leftMenu.btnPlugins.setDisabled(true); this.leftMenu.getMenu('file').setMode({isDisconnected: true}); if ( this.dlgSearch ) { @@ -423,6 +464,7 @@ define([ this.leftMenu.btnComments.setDisabled(disable); this.leftMenu.btnChat.setDisabled(disable); /** coauthoring end **/ + this.leftMenu.btnPlugins.setDisabled(disable); if (disableFileMenu) this.leftMenu.getMenu('file').SetDisabled(disable); }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 6979911d6..c0b75936e 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Main.js * @@ -79,7 +111,10 @@ define([ // Initialize api - this.api = new asc_docs_api("editor_sdk"); + window["flat_desine"] = true; + this.api = new Asc.asc_docs_api({ + 'id-view' : 'editor_sdk' + }); if (this.api){ switch (value) { @@ -87,11 +122,6 @@ define([ case '1': this.api.SetFontRenderingMode(1); break; case '2': this.api.SetFontRenderingMode(2); break; } - window["flat_desine"] = true; - - this.api.CreateComponents(); - this.api.asc_SetFontsPath("../../../sdk/Fonts/"); - this.api.Init(); this.api.asc_registerCallback('asc_onError', _.bind(this.onError, this)); this.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(this.onDocumentContentReady, this)); @@ -108,6 +138,7 @@ define([ // Initialize api gateway this.editorConfig = {}; this.appOptions = {}; + this.plugins = undefined; Common.Gateway.on('init', _.bind(this.loadConfig, this)); Common.Gateway.on('showmessage', _.bind(this.onExternalMessage, this)); Common.Gateway.on('opendocument', _.bind(this.loadDocument, this)); @@ -141,7 +172,7 @@ define([ /* * TODO: Workaround bug #25004. Clipboard feature processing in sdk. */ - if (!(Common.Utils.isSafari && Common.Utils.isMac)) { + if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) { me.api.asc_enableKeyEvents(true); if (/msg-reply/.test(e.target.className)) me.dontCloseDummyComment = false; @@ -203,6 +234,7 @@ define([ this.appOptions.recent = this.editorConfig.recent; this.appOptions.createUrl = this.editorConfig.createUrl; this.appOptions.lang = this.editorConfig.lang; + this.appOptions.location = (typeof (this.editorConfig.location) == 'string') ? this.editorConfig.location.toLowerCase() : ''; this.appOptions.sharingSettingsUrl = this.editorConfig.sharingSettingsUrl; this.appOptions.fileChoiceUrl = this.editorConfig.fileChoiceUrl; this.appOptions.mergeFolderUrl = this.editorConfig.mergeFolderUrl; @@ -211,6 +243,8 @@ define([ this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object') && !_.isEmpty(this.editorConfig.customization.goback.url); this.appOptions.canBack = this.editorConfig.nativeApp !== true && this.appOptions.canBackToFolder === true; + this.appOptions.canPlugins = false; + this.plugins = this.editorConfig.plugins; this.getApplication() .getController('Viewport') @@ -219,6 +253,9 @@ define([ if (this.editorConfig.lang) this.api.asc_setLocale(this.editorConfig.lang); + + if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') + Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); }, loadDocument: function(data) { @@ -230,13 +267,13 @@ define([ if (data.doc) { this.permissions = $.extend(this.permissions, data.doc.permissions); - var _user = new CUserInfo(); + var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); _user.put_FirstName(this.appOptions.user.firstname); _user.put_LastName(this.appOptions.user.lastname); _user.put_FullName(this.appOptions.user.fullname); - docInfo = new CDocInfo(); + docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(data.doc.key); docInfo.put_Url(data.doc.url); docInfo.put_Title(data.doc.title); @@ -292,7 +329,7 @@ define([ onDownloadAs: function() { var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType); - (type && typeof type[1] === 'string') ? this.api.asc_DownloadOrigin(true) : this.api.asc_DownloadAs(c_oAscFileType.DOCX, true); + (type && typeof type[1] === 'string') ? this.api.asc_DownloadOrigin(true) : this.api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true); }, onProcessMouse: function(data) { @@ -345,8 +382,8 @@ define([ user = new Common.Models.User({ id : version.user.id, username : version.user.name, - colorval : c_oAscArrUserColors[usersCnt], - color : this.generateUserColor(c_oAscArrUserColors[usersCnt++]) + colorval : Asc.c_oAscArrUserColors[usersCnt], + color : this.generateUserColor(Asc.c_oAscArrUserColors[usersCnt++]) }); usersStore.add(user); } @@ -388,8 +425,8 @@ define([ user = new Common.Models.User({ id : change.user.id, username : change.user.name, - colorval : c_oAscArrUserColors[usersCnt], - color : this.generateUserColor(c_oAscArrUserColors[usersCnt++]) + colorval : Asc.c_oAscArrUserColors[usersCnt], + color : this.generateUserColor(Asc.c_oAscArrUserColors[usersCnt++]) }); usersStore.add(user); } @@ -501,33 +538,33 @@ define([ this.updateWindowTitle(true); - action = this.stackLongActions.get({type: c_oAscAsyncActionType.Information}); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); if (action) { this.setLongActionView(action) } else { - if (this._state.fastCoauth && this._state.usersCount>1 && id==c_oAscAsyncAction['Save']) { + if (this._state.fastCoauth && this._state.usersCount>1 && id==Asc.c_oAscAsyncAction['Save']) { var me = this; if (me._state.timerSave===undefined) me._state.timerSave = setInterval(function(){ - if ((new Date()) - me._state.isSaving>2000) { + if ((new Date()) - me._state.isSaving>500) { clearInterval(me._state.timerSave); me.getApplication().getController('Statusbar').setStatusCaption(''); me._state.timerSave = undefined; } - }, 2000); + }, 500); } else this.getApplication().getController('Statusbar').setStatusCaption(''); } - action = this.stackLongActions.get({type: c_oAscAsyncActionType.BlockInteraction}); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide(); - if (id==c_oAscAsyncAction['Save'] && (!this._state.fastCoauth || this._state.usersCount<2)) + if (id==Asc.c_oAscAsyncAction['Save'] && (!this._state.fastCoauth || this._state.usersCount<2)) this.synchronizeChanges(); - if ( type == c_oAscAsyncActionType.BlockInteraction && + if ( type == Asc.c_oAscAsyncActionType.BlockInteraction && (!this.getApplication().getController('LeftMenu').dlgSearch || !this.getApplication().getController('LeftMenu').dlgSearch.isVisible()) && - !( id == c_oAscAsyncAction['ApplyChanges'] && this.dontCloseDummyComment ) ) { + !( id == Asc.c_oAscAsyncAction['ApplyChanges'] && this.dontCloseDummyComment ) ) { this.onEditComplete(this.loadMask); this.api.asc_enableKeyEvents(true); } @@ -537,73 +574,73 @@ define([ var title = '', text = ''; switch (action.id) { - case c_oAscAsyncAction['Open']: + case Asc.c_oAscAsyncAction['Open']: title = this.openTitleText; text = this.openTextText; break; - case c_oAscAsyncAction['Save']: + case Asc.c_oAscAsyncAction['Save']: this._state.isSaving = new Date(); title = this.saveTitleText; text = this.saveTextText; break; - case c_oAscAsyncAction['LoadDocumentFonts']: + case Asc.c_oAscAsyncAction['LoadDocumentFonts']: title = this.loadFontsTitleText; text = this.loadFontsTextText; break; - case c_oAscAsyncAction['LoadDocumentImages']: + case Asc.c_oAscAsyncAction['LoadDocumentImages']: title = this.loadImagesTitleText; text = this.loadImagesTextText; break; - case c_oAscAsyncAction['LoadFont']: + case Asc.c_oAscAsyncAction['LoadFont']: title = this.loadFontTitleText; text = this.loadFontTextText; break; - case c_oAscAsyncAction['LoadImage']: + case Asc.c_oAscAsyncAction['LoadImage']: title = this.loadImageTitleText; text = this.loadImageTextText; break; - case c_oAscAsyncAction['DownloadAs']: + case Asc.c_oAscAsyncAction['DownloadAs']: title = this.downloadTitleText; text = this.downloadTextText; break; - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: title = this.printTitleText; text = this.printTextText; break; - case c_oAscAsyncAction['UploadImage']: + case Asc.c_oAscAsyncAction['UploadImage']: title = this.uploadImageTitleText; text = this.uploadImageTextText; break; - case c_oAscAsyncAction['ApplyChanges']: + case Asc.c_oAscAsyncAction['ApplyChanges']: title = this.applyChangesTitleText; text = this.applyChangesTextText; break; - case c_oAscAsyncAction['PrepareToSave']: + case Asc.c_oAscAsyncAction['PrepareToSave']: title = this.savePreparingText; text = this.savePreparingTitle; break; - case c_oAscAsyncAction['MailMergeLoadFile']: + case Asc.c_oAscAsyncAction['MailMergeLoadFile']: title = this.mailMergeLoadFileText; text = this.mailMergeLoadFileTitle; break; - case c_oAscAsyncAction['DownloadMerge']: + case Asc.c_oAscAsyncAction['DownloadMerge']: title = this.downloadMergeTitle; text = this.downloadMergeText; break; - case c_oAscAsyncAction['SendMailMerge']: + case Asc.c_oAscAsyncAction['SendMailMerge']: title = this.sendMergeTitle; text = this.sendMergeText; break; @@ -619,7 +656,7 @@ define([ break; } - if (action.type == c_oAscAsyncActionType['BlockInteraction']) { + if (action.type == Asc.c_oAscAsyncActionType['BlockInteraction']) { if (!this.loadMask) this.loadMask = new Common.UI.LoadMask({owner: $('#viewport')}); @@ -642,7 +679,7 @@ define([ data.requestrights = true; this.appOptions.isEdit= true; - this.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); + this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); var me = this; setTimeout(function(){ @@ -673,7 +710,7 @@ define([ documentHolderController.getView('DocumentHolder').changePosition(); me.loadLanguages(); - var shapes = me.api.get_PropertyEditorShapes(); + var shapes = me.api.asc_getPropertyEditorShapes(); if (shapes) me.fillAutoShapes(shapes[0], shapes[1]); @@ -706,7 +743,7 @@ define([ me.api.SetDrawingFreeze(false); me.hidePreloader(); - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); /** coauthoring begin **/ value = Common.localStorage.getItem("de-settings-livecomment"); @@ -732,16 +769,14 @@ define([ if (!window['AscDesktopEditor']) { var tips = []; Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - !Common.Utils.isGecko && (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}')); if (tips.length) me.showTips(tips); } + document.removeEventListener('visibilitychange', checkWarns); } if (typeof document.hidden !== 'undefined' && document.hidden) { - document.addEventListener('visibilitychange', function() { - setTimeout(checkWarns, 50); - }); + document.addEventListener('visibilitychange', checkWarns); } else checkWarns(); me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me)); @@ -767,14 +802,14 @@ define([ value = Common.localStorage.getItem((me._state.fastCoauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict"); if (value !== null) - me.api.SetCollaborativeMarksShowType(value == 'all' ? c_oAscCollaborativeMarksShowType.All : - value == 'none' ? c_oAscCollaborativeMarksShowType.None : c_oAscCollaborativeMarksShowType.LastChanges); + me.api.SetCollaborativeMarksShowType(value == 'all' ? Asc.c_oAscCollaborativeMarksShowType.All : + value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges); else - me.api.SetCollaborativeMarksShowType(me._state.fastCoauth ? c_oAscCollaborativeMarksShowType.None : c_oAscCollaborativeMarksShowType.LastChanges); + me.api.SetCollaborativeMarksShowType(me._state.fastCoauth ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges); } else { me._state.fastCoauth = false; me.api.asc_SetFastCollaborative(me._state.fastCoauth); - me.api.SetCollaborativeMarksShowType(c_oAscCollaborativeMarksShowType.None); + me.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None); } /** coauthoring end **/ @@ -784,7 +819,8 @@ define([ fontsController = application.getController('Common.Controllers.Fonts'), rightmenuController = application.getController('RightMenu'), leftmenuController = application.getController('LeftMenu'), - chatController = application.getController('Common.Controllers.Chat'); + chatController = application.getController('Common.Controllers.Chat'), + pluginsController = application.getController('Common.Controllers.Plugins'); leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document}); leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api); @@ -793,6 +829,10 @@ define([ application.getController('Common.Controllers.ExternalDiagramEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization}); application.getController('Common.Controllers.ExternalMergeEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization}); + pluginsController.setApi(this.api); + this.updatePluginsList(this.plugins); + this.api.asc_registerCallback('asc_onPluginsInit', _.bind(this.updatePluginsList, this)); + documentHolderController.setApi(me.api); documentHolderController.createDelayedElements(); statusbarController.createDelayedElements(); @@ -805,6 +845,10 @@ define([ documentHolderController.getView('DocumentHolder').setApi(me.api).on('editcomplete', _.bind(me.onEditComplete, me)); if (me.appOptions.isEdit) { + value = Common.localStorage.getItem("de-settings-autosave"); + value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : 1; + me.api.asc_setAutoSaveGap(value); + if (me.needToUpdateVersion) Common.NotificationCenter.trigger('api:disconnect'); var timer_sl = setInterval(function(){ @@ -818,7 +862,7 @@ define([ rightmenuController.createDelayedElements(); - var shapes = me.api.get_PropertyEditorShapes(); + var shapes = me.api.asc_getPropertyEditorShapes(); if (shapes) me.fillAutoShapes(shapes[0], shapes[1]); @@ -832,14 +876,6 @@ define([ }, 50); } - if (me.appOptions.canAutosave) { - value = Common.localStorage.getItem("de-settings-autosave"); - value = (value!==null) ? parseInt(value) : 1; - } else { - value = 0; - } - me.api.asc_setAutoSaveGap(value); - if (this.appOptions.canAnalytics && false) Common.component.Analytics.initialize('UA-12442749-13', 'Document Editor'); @@ -861,14 +897,19 @@ define([ if (now - value > 86400000) { Common.localStorage.setItem("de-license-warning", now); Common.UI.info({ + width: 400, title: this.textNoLicenseTitle, msg : this.warnNoLicense, - buttons: ['custom'], - primary: 'custom', - customButtonText: this.textBuyNow, + buttons: [ + {value: 'buynow', caption: this.textBuyNow}, + {value: 'contact', caption: this.textContactUs} + ], + primary: 'buynow', callback: function(btn) { - if (btn == 'custom') + if (btn == 'buynow') window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank"); + else if (btn == 'contact') + window.open('mailto:sales@onlyoffice.com', "_blank"); } }); } @@ -895,7 +936,6 @@ define([ (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined (!this.appOptions.isReviewOnly || this.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true this.appOptions.isEdit = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; - this.appOptions.canAutosave = this.editorConfig.canAutosave !== false && params.asc_getIsAutosaveEnable(); this.appOptions.canReview = this.appOptions.canLicense && this.appOptions.isEdit && (this.permissions.review===true); this.appOptions.canUseHistory = this.appOptions.canLicense && this.editorConfig.canUseHistory && (this.permissions.edit !== false) && this.appOptions.canCoAuthoring && !this.appOptions.isDesktopApp; this.appOptions.canHistoryClose = this.editorConfig.canHistoryClose; @@ -928,7 +968,7 @@ define([ if (!this.appOptions.isEdit) { this.hidePreloader(); - this.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } }, @@ -968,7 +1008,7 @@ define([ translateChart.asc_setSeries(this.txtSeries); this.api.asc_setChartTranslate(translateChart); - var translateArt = new asc_TextArtTranslate(); + var translateArt = new Asc.asc_TextArtTranslate(); translateArt.asc_setDefaultText(this.txtArt); this.api.asc_setTextArtTranslate(translateArt); } @@ -1021,7 +1061,9 @@ define([ } var value = Common.localStorage.getItem('de-settings-unit'); - Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); + value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); + Common.Utils.Metric.setCurrentMetric(value); + me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); value = Common.localStorage.getItem('de-hidden-rulers'); me.api.asc_SetViewRulers(value===null || parseInt(value) === 0); @@ -1037,11 +1079,11 @@ define([ me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); /** coauthoring end **/ - if (me.stackLongActions.exist({id: ApplyEditRights, type: c_oAscAsyncActionType['BlockInteraction']})) { - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); + if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); } else if (!this._isDocReady) { me.hidePreloader(); - me.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } // Message on window close @@ -1061,7 +1103,7 @@ define([ onError: function(id, level, errData) { this.hidePreloader(); - this.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); var config = { closable: false @@ -1069,79 +1111,79 @@ define([ switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: config.msg = this.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: config.msg = this.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: config.msg = this.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: config.msg = this.downloadErrorText; break; - case c_oAscError.ID.UplImageSize: + case Asc.c_oAscError.ID.UplImageSize: config.msg = this.uploadImageSizeMessage; break; - case c_oAscError.ID.UplImageExt: + case Asc.c_oAscError.ID.UplImageExt: config.msg = this.uploadImageExtMessage; break; - case c_oAscError.ID.UplImageFileCount: + case Asc.c_oAscError.ID.UplImageFileCount: config.msg = this.uploadImageFileCountMessage; break; - case c_oAscError.ID.SplitCellMaxRows: + case Asc.c_oAscError.ID.SplitCellMaxRows: config.msg = this.splitMaxRowsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellMaxCols: + case Asc.c_oAscError.ID.SplitCellMaxCols: config.msg = this.splitMaxColsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellRowsDivider: + case Asc.c_oAscError.ID.SplitCellRowsDivider: config.msg = this.splitDividerErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.VKeyEncrypt: + case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorKeyEncrypt; break; - case c_oAscError.ID.KeyExpire: + case Asc.c_oAscError.ID.KeyExpire: config.msg = this.errorKeyExpire; break; - case c_oAscError.ID.UserCountExceed: + case Asc.c_oAscError.ID.UserCountExceed: config.msg = this.errorUsersExceed; break; - case c_oAscError.ID.CoAuthoringDisconnect: + case Asc.c_oAscError.ID.CoAuthoringDisconnect: config.msg = this.errorCoAuthoringDisconnect; break; - case c_oAscError.ID.ConvertationPassword: + case Asc.c_oAscError.ID.ConvertationPassword: config.msg = this.errorFilePassProtect; break; - case c_oAscError.ID.StockChartError: + case Asc.c_oAscError.ID.StockChartError: config.msg = this.errorStockChart; break; - case c_oAscError.ID.DataRangeError: + case Asc.c_oAscError.ID.DataRangeError: config.msg = this.errorDataRange; break; - case c_oAscError.ID.Database: + case Asc.c_oAscError.ID.Database: config.msg = this.errorDatabaseConnection; break; - case c_oAscError.ID.UserDrop: + case Asc.c_oAscError.ID.UserDrop: if (this._state.lostEditingRights) { this._state.lostEditingRights = false; return; @@ -1150,15 +1192,15 @@ define([ config.msg = this.errorUserDrop; break; - case c_oAscError.ID.MailMergeLoadFile: + case Asc.c_oAscError.ID.MailMergeLoadFile: config.msg = this.errorMailMergeLoadFile; break; - case c_oAscError.ID.MailMergeSaveFile: + case Asc.c_oAscError.ID.MailMergeSaveFile: config.msg = this.errorMailMergeSaveFile; break; - case c_oAscError.ID.Warning: + case Asc.c_oAscError.ID.Warning: config.msg = this.errorConnectToServer; break; @@ -1168,7 +1210,7 @@ define([ } - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, config.msg); @@ -1189,7 +1231,7 @@ define([ config.iconCls = 'warn'; config.buttons = ['ok']; config.callback = _.bind(function(btn){ - if (id == c_oAscError.ID.Warning && btn == 'ok' && (this.appOptions.canDownload || this.appOptions.canDownloadOrigin)) { + if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && (this.appOptions.canDownload || this.appOptions.canDownloadOrigin)) { Common.UI.Menu.Manager.hideAll(); if (this.appOptions.isDesktopApp && this.appOptions.isOffline) this.api.asc_DownloadAs(); @@ -1211,20 +1253,6 @@ define([ this._state.isDisconnected = true; }, - getBrowseZoomLevel: function() { - if (Common.Utils.isIE) { - return screen.logicalXDPI/screen.deviceXDPI; - } else { - var zoom = window.outerWidth / document.documentElement.clientWidth; - - if (Common.Utils.isSafari) { - zoom = Math.floor(zoom * 10) / 10; - } - - return zoom; - } - }, - showTips: function(strings) { var me = this; if (!strings.length) return; @@ -1381,7 +1409,7 @@ define([ onUpdateVersion: function(callback) { var me = this; me.needToUpdateVersion = true; - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); Common.UI.warning({ title: me.titleUpdateVersion, msg: this.errorUpdateVersion, @@ -1389,7 +1417,7 @@ define([ _.defer(function() { Common.Gateway.updateVersion(); if (callback) callback.call(me); - me.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); }) } }); @@ -1558,13 +1586,16 @@ define([ unitsChanged: function(m) { var value = Common.localStorage.getItem("de-settings-unit"); - Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); + value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); + Common.Utils.Metric.setCurrentMetric(value); + this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); this.getApplication().getController('RightMenu').updateMetricUnit(); + this.getApplication().getController('Toolbar').getView('Toolbar').updateMetricUnit(); }, onAdvancedOptions: function(advOptions) { var type = advOptions.asc_getOptionId(); - if (type == c_oAscAdvancedOptionsID.TXT) { + if (type == Asc.c_oAscAdvancedOptionsID.TXT) { var me = this; var dlg = new Common.Views.OpenDialog({ type: type, @@ -1581,7 +1612,7 @@ define([ this.isShowOpenDialog = true; this.loadMask && this.loadMask.hide(); - this.onLongActionEnd(c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); dlg.show(); } @@ -1605,7 +1636,7 @@ define([ this.api.asc_SetFastCollaborative(false); this._state.fastCoauth = false; Common.localStorage.setItem("de-settings-showchanges-strict", 'last'); - this.api.SetCollaborativeMarksShowType(c_oAscCollaborativeMarksShowType.LastChanges); + this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.LastChanges); } this.fireEvent('editcomplete', this); }, this) @@ -1663,6 +1694,61 @@ define([ if (url) this.iframePrint.src = url; }, + updatePluginsList: function(plugins) { + var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), + isEdit = this.appOptions.isEdit; + if (pluginStore && plugins) { + var arr = []; + plugins.pluginsData.forEach(function(item){ + var variations = item.variations, + variationsArr = []; + variations.forEach(function(itemVar){ + var isSupported = false; + for (var i=0; i0) + arr.push(new Common.Models.Plugin({ + name : item.name, + guid: item.guid, + baseUrl : item.baseUrl, + variations: variationsArr, + currentVariation: 0 + })); + }); + + pluginStore.reset(arr); + + this.appOptions.pluginsPath = (plugins.url); + this.appOptions.canPlugins = (arr.length>0); + } else { + this.appOptions.pluginsPath = ''; + this.appOptions.canPlugins = false; + } + if (this.appOptions.canPlugins) + this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions); + this.getApplication().getController('LeftMenu').enablePlugins(); + }, + leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', defaultTitleText: 'ONLYOFFICE Document Editor', criticalErrorTitle: 'Error', @@ -1756,8 +1842,9 @@ define([ textStrict: 'Strict mode', txtErrorLoadHistory: 'Loading history failed', textBuyNow: 'Buy now', - textNoLicenseTitle: 'License expired', - warnNoLicense: 'The license expired. You cannot create or edit files.
Click the \'Buy now\' button to prolong the license.' + textNoLicenseTitle: 'License expired or not found', + warnNoLicense: 'The license could not be found or expired. You cannot edit files.
Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.', + textContactUs: 'Contact us' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index 1258152ae..f9072dcdc 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * RightMenu.js * @@ -72,7 +104,7 @@ define([ this.rightmenu.fireEvent('editcomplete', this.rightmenu); }, - onFocusObject: function(SelectedObjects) { + onFocusObject: function(SelectedObjects, open) { if (!this.editMode) return; @@ -93,7 +125,7 @@ define([ { var eltype = SelectedObjects[i].get_ObjectType(), settingsType = this.getDocumentSettingsType(eltype); - if (eltype === c_oAscTypeSelectElement.Math) + if (eltype === Asc.c_oAscTypeSelectElement.Math) in_equation = true; if (settingsType===undefined || settingsType>=this._settings.length || this._settings[settingsType]===undefined) @@ -158,7 +190,7 @@ define([ if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) this._settings[Common.Utils.documentSettingsType.MailMerge].panel.setLocked(this._settings[Common.Utils.documentSettingsType.MailMerge].locked); - if (!this.rightmenu.minimizedMode) { + if (!this.rightmenu.minimizedMode || open) { var active; if (priorityactive>-1) active = priorityactive; @@ -166,8 +198,11 @@ define([ else if (currentactive>=0) active = currentactive; else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge; + if (active == undefined && open && lastactive>=0) + active = lastactive; + if (active !== undefined) { - this.rightmenu.SetActivePane(active); + this.rightmenu.SetActivePane(active, open); if (active!=Common.Utils.documentSettingsType.MailMerge) this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props); else @@ -237,8 +272,12 @@ define([ if (this.editMode && this.api) { var selectedElements = this.api.getSelectedElements(); - if (selectedElements.length>0) - this.onFocusObject(selectedElements); + if (selectedElements.length>0) { + var open = Common.localStorage.getItem("de-hide-right-settings"); + open = (open===null || parseInt(open) == 0); + + this.onFocusObject(selectedElements, open); + } } }, @@ -275,7 +314,7 @@ define([ }, onError: function(id, level, errData) { - if (id==c_oAscError.ID.MailMergeLoadFile) { + if (id==Asc.c_oAscError.ID.MailMergeLoadFile) { this._settings[Common.Utils.documentSettingsType.MailMerge].hidden = 1; this._settings[Common.Utils.documentSettingsType.MailMerge].btn.setDisabled(true); var selectedElements = this.api.getSelectedElements(); @@ -318,13 +357,13 @@ define([ getDocumentSettingsType: function(type) { switch (type) { - case c_oAscTypeSelectElement.Paragraph: + case Asc.c_oAscTypeSelectElement.Paragraph: return Common.Utils.documentSettingsType.Paragraph; - case c_oAscTypeSelectElement.Table: + case Asc.c_oAscTypeSelectElement.Table: return Common.Utils.documentSettingsType.Table; - case c_oAscTypeSelectElement.Image: + case Asc.c_oAscTypeSelectElement.Image: return Common.Utils.documentSettingsType.Image; - case c_oAscTypeSelectElement.Header: + case Asc.c_oAscTypeSelectElement.Header: return Common.Utils.documentSettingsType.Header; } } diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index ea862b94a..dff936258 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Statusbar.js * diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 82a2daff0..f88f81b6d 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Toolbar.js * @@ -41,7 +73,7 @@ define([ }, prstyle: undefined, prcontrolsdisable:undefined, - dropcap: c_oAscDropCap.None, + dropcap: Asc.c_oAscDropCap.None, clrhighlight: undefined, clrtext: undefined, pgsize: [0, 0], @@ -546,30 +578,30 @@ define([ type = selectedObjects[i].get_ObjectType(); pr = selectedObjects[i].get_ObjectValue(); - if (type === c_oAscTypeSelectElement.Paragraph) { + if (type === Asc.c_oAscTypeSelectElement.Paragraph) { paragraph_locked = pr.get_Locked(); can_add_table = pr.get_CanAddTable(); can_add_image = pr.get_CanAddImage(); frame_pr = pr; sh = pr.get_Shade(); - } else if (type === c_oAscTypeSelectElement.Header) { + } else if (type === Asc.c_oAscTypeSelectElement.Header) { header_locked = pr.get_Locked(); in_header = true; - } else if (type === c_oAscTypeSelectElement.Image) { + } else if (type === Asc.c_oAscTypeSelectElement.Image) { in_image = in_header = true; if (pr && pr.get_ChartProperties()) in_chart = true; - } else if (type === c_oAscTypeSelectElement.Math) { + } else if (type === Asc.c_oAscTypeSelectElement.Math) { in_equation = true; - if (c_oAscMathInterfaceType.Common === pr.get_Type()) + if (Asc.c_oAscMathInterfaceType.Common === pr.get_Type()) btn_eq_state = true; } - if (type === c_oAscTypeSelectElement.Table || type === c_oAscTypeSelectElement.Header || type === c_oAscTypeSelectElement.Image) { + if (type === Asc.c_oAscTypeSelectElement.Table || type === Asc.c_oAscTypeSelectElement.Header || type === Asc.c_oAscTypeSelectElement.Image) { enable_dropcap = false; } - if (enable_dropcap!==false && type == c_oAscTypeSelectElement.Paragraph) + if (enable_dropcap!==false && type == Asc.c_oAscTypeSelectElement.Paragraph) enable_dropcap = true; } @@ -599,11 +631,11 @@ define([ if (enable_dropcap && frame_pr) { var value = frame_pr.get_FramePr(), - drop_value = c_oAscDropCap.None; + drop_value = Asc.c_oAscDropCap.None; if (value!==undefined) { drop_value = value.get_DropCap(); - enable_dropcap = ( drop_value === c_oAscDropCap.Drop || drop_value === c_oAscDropCap.Margin); + enable_dropcap = ( drop_value === Asc.c_oAscDropCap.Drop || drop_value === Asc.c_oAscDropCap.Margin); disable_dropcapadv = false; } else { enable_dropcap = frame_pr.get_CanAddDropCap(); @@ -1228,7 +1260,7 @@ define([ handler: handlerDlg }); - props = new CHyperlinkProperty(); + props = new Asc.CHyperlinkProperty(); props.put_Text(text); win.show(); @@ -1237,7 +1269,7 @@ define([ var selectedElements = me.api.getSelectedElements(); if (selectedElements && _.isArray(selectedElements)){ _.each(selectedElements, function(el, i) { - if (selectedElements[i].get_ObjectType() == c_oAscTypeSelectElement.Hyperlink) + if (selectedElements[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) props = selectedElements[i].get_ObjectValue(); }); } @@ -1432,7 +1464,7 @@ define([ this.onSectionProps(section); return; } else { - var props = new CDocumentSectionProps(); + var props = new Asc.CDocumentSectionProps(); props.put_TopMargin(item.value[0]); props.put_LeftMargin(item.value[1]); props.put_BottomMargin(item.value[2]); @@ -1487,22 +1519,22 @@ define([ this._state.dropcap = undefined; if (this.api && item.checked) { - if (item.value === c_oAscDropCap.None) { + if (item.value === Asc.c_oAscDropCap.None) { this.api.removeDropcap(true); } else { var SelectedObjects = this.api.getSelectedElements(), i = -1; while (++i < SelectedObjects.length) { - if (SelectedObjects[i].get_ObjectType() == c_oAscTypeSelectElement.Paragraph) { + if (SelectedObjects[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) { var pr = SelectedObjects[i].get_ObjectValue(); var value = pr.get_FramePr(); if (!_.isUndefined(value)) { - value = new CParagraphFrame(); + value = new Asc.asc_CParagraphFrame(); value.put_FromDropCapMenu(true); value.put_DropCap(item.value); this.api.put_FramePr(value); } else { - this.api.asc_addDropCap((item.value === c_oAscDropCap.Drop)); + this.api.asc_addDropCap((item.value === Asc.c_oAscDropCap.Drop)); } break; } @@ -1520,9 +1552,9 @@ define([ var index = -1; switch (v) { - case c_oAscDropCap.None: index = 0; break; - case c_oAscDropCap.Drop: index = 1; break; - case c_oAscDropCap.Margin: index = 2; break; + case Asc.c_oAscDropCap.None: index = 0; break; + case Asc.c_oAscDropCap.Drop: index = 1; break; + case Asc.c_oAscDropCap.Margin: index = 2; break; } if (index < 0) this._clearChecked(this.toolbar.btnDropCap.menu); @@ -1554,7 +1586,7 @@ define([ if (selectedElements && _.isArray(selectedElements)){ for (var i = 0; i < selectedElementsLenght; i++) { - if (selectedElements[i].get_ObjectType() == c_oAscTypeSelectElement.Paragraph) { + if (selectedElements[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) { props = selectedElements[i].get_ObjectValue(); break; } @@ -1574,7 +1606,7 @@ define([ handler: function(result, value) { if (result == 'ok') { me.borderAdvancedProps = value.borderProps; - if (value.paragraphProps && value.paragraphProps.get_DropCap() === c_oAscDropCap.None) { + if (value.paragraphProps && value.paragraphProps.get_DropCap() === Asc.c_oAscDropCap.None) { me.api.removeDropcap(true); } else me.api.put_FramePr(value.paragraphProps); @@ -1593,7 +1625,7 @@ define([ this._state.columns = undefined; if (this.api && item.checked) { - var props = new CDocumentColumnsProps(), + var props = new Asc.CDocumentColumnsProps(), cols = item.value, def_space = 12.5; props.put_EqualWidth(cols<3); @@ -1760,7 +1792,7 @@ define([ isParagraph = false; if (selectedElements && _.isArray(selectedElements)){ for (var i = 0; i
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ 		+ +
+
+
+ 		+ +
+ 		+ +
+
+ +
+
+ 		+ +
+
+
+ 		+ +
+ 		+ +
+
+
+
+
+ + + + +
+
+
+
+
@@ -70,7 +140,7 @@
- @@ -101,7 +171,20 @@ - + + + + + @@ -119,25 +202,38 @@ - - - + + + + +
+
+ +
+ 		+ +
+ 		+ +
+
+
+
+
+
+ 		+ +
+ 		+ +
+
-
+
- diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template index 039703e46..2bf5364f9 100644 --- a/apps/documenteditor/main/app/template/LeftMenu.template +++ b/apps/documenteditor/main/app/template/LeftMenu.template @@ -8,11 +8,13 @@ +
+
+ + +
- +
-
-
+ +
diff --git a/apps/documenteditor/main/app/template/RightMenu.template b/apps/documenteditor/main/app/template/RightMenu.template index 6b30dae46..499e30afa 100644 --- a/apps/documenteditor/main/app/template/RightMenu.template +++ b/apps/documenteditor/main/app/template/RightMenu.template @@ -16,6 +16,8 @@
+
+
diff --git a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template index 0888606d6..22e7b08db 100644 --- a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template @@ -1,31 +1,31 @@
- +
- + + + + - - - - -
+ + +
-
+ +
+ 		+ +
-
- 		-
-
+
-
-
-
+
- -
@@ -43,20 +43,60 @@
+
+
+
+ + + + + + + + +
+ +
+
+ 		+ +
+
+
+
+ + + + + + + + + +
+ +
+
+ 		+ +
+ 		+ +
+
+
- - + + + + + + + + +
@@ -79,24 +119,38 @@
+
+
+ +
+
+
+
-
+
@@ -104,10 +158,10 @@
-
-
- -
+
+ +
+
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index f67954a77..c6d15c865 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -191,7 +191,7 @@
-
+
diff --git a/apps/documenteditor/main/app/util/define.js b/apps/documenteditor/main/app/util/define.js index 01ed30900..10d4746d8 100644 --- a/apps/documenteditor/main/app/util/define.js +++ b/apps/documenteditor/main/app/util/define.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define(function(){ 'use strict'; diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 0b1e7e987..c202e3d34 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ChartSettings.js * @@ -35,7 +67,7 @@ define([ this._initSettings = true; this._state = { - WrappingStyle: c_oAscWrapStyle2.Inline, + WrappingStyle: Asc.c_oAscWrapStyle2.Inline, CanBeFlow: true, Width: 0, Height: 0, @@ -54,13 +86,13 @@ define([ this.render(); var viewData = [ - { offsetx: 0, data: c_oAscWrapStyle2.Inline, iconCls:'wrap-inline', tip: this.txtInline, selected: true }, - { offsetx: 50, data: c_oAscWrapStyle2.Square, iconCls:'wrap-square', tip: this.txtSquare }, - { offsetx: 100, data: c_oAscWrapStyle2.Tight, iconCls:'wrap-tight', tip: this.txtTight }, - { offsetx: 150, data: c_oAscWrapStyle2.Through, iconCls:'wrap-through', tip: this.txtThrough }, - { offsetx: 200, data: c_oAscWrapStyle2.TopAndBottom, iconCls:'wrap-topAndBottom', tip: this.txtTopAndBottom }, - { offsetx: 250, data: c_oAscWrapStyle2.InFront, iconCls:'wrap-inFront', tip: this.txtInFront }, - { offsetx: 300, data: c_oAscWrapStyle2.Behind, iconCls:'wrap-behind', tip: this.txtBehind } + { offsetx: 0, data: Asc.c_oAscWrapStyle2.Inline, iconCls:'wrap-inline', tip: this.txtInline, selected: true }, + { offsetx: 50, data: Asc.c_oAscWrapStyle2.Square, iconCls:'wrap-square', tip: this.txtSquare }, + { offsetx: 100, data: Asc.c_oAscWrapStyle2.Tight, iconCls:'wrap-tight', tip: this.txtTight }, + { offsetx: 150, data: Asc.c_oAscWrapStyle2.Through, iconCls:'wrap-through', tip: this.txtThrough }, + { offsetx: 200, data: Asc.c_oAscWrapStyle2.TopAndBottom, iconCls:'wrap-topAndBottom', tip: this.txtTopAndBottom }, + { offsetx: 250, data: Asc.c_oAscWrapStyle2.InFront, iconCls:'wrap-inFront', tip: this.txtInFront }, + { offsetx: 300, data: Asc.c_oAscWrapStyle2.Behind, iconCls:'wrap-behind', tip: this.txtBehind } ]; this.btnWrapType = new Common.UI.Button({ @@ -109,31 +141,31 @@ define([ { id: 'menu-chart-group-stock', caption: me.textStock } ]), store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} ]), itemTemplate: _.template('
') }); @@ -209,7 +241,7 @@ define([ this.disableControls(this._locked); if (props && props.get_ChartProperties()){ - this._originalProps = new CImgProperty(props); + this._originalProps = new Asc.asc_CImgProperty(props); this._noApply = true; var value = props.get_WrappingStyle(); @@ -279,13 +311,13 @@ define([ value = props.get_Width(); if ( Math.abs(this._state.Width-value)>0.001 ) { - this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); this._state.Width = value; } value = props.get_Height(); if ( Math.abs(this._state.Height-value)>0.001 ) { - this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); this._state.Height = value; } } @@ -293,10 +325,10 @@ define([ updateMetricUnit: function() { var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width); - this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height); - this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); }, createDelayedElements: function() { @@ -335,20 +367,20 @@ define([ this.btnWrapType.setIconCls('item-wrap ' + rawData.iconCls); if (this.api) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); props.put_WrappingStyle((rawData.data)); - if (this._state.WrappingStyle===c_oAscWrapStyle2.Inline && rawData.data!==c_oAscWrapStyle2.Inline ) { - props.put_PositionH(new CImagePositionH()); + if (this._state.WrappingStyle===Asc.c_oAscWrapStyle2.Inline && rawData.data!==Asc.c_oAscWrapStyle2.Inline ) { + props.put_PositionH(new Asc.CImagePositionH()); props.get_PositionH().put_UseAlign(false); - props.get_PositionH().put_RelativeFrom(c_oAscRelativeFromH.Column); - var val = this._originalProps.get_Value_X(c_oAscRelativeFromH.Column); + props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); + var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); props.get_PositionH().put_Value(val); - props.put_PositionV(new CImagePositionV()); + props.put_PositionV(new Asc.CImagePositionV()); props.get_PositionV().put_UseAlign(false); - props.get_PositionV().put_RelativeFrom(c_oAscRelativeFromV.Paragraph); - val = this._originalProps.get_Value_Y(c_oAscRelativeFromV.Paragraph); + props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); + val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); props.get_PositionV().put_Value(val); } @@ -383,7 +415,7 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Image == elType) { + if (Asc.c_oAscTypeSelectElement.Image == elType) { var imgsizeMax = this.api.GetSectionInfo(); imgsizeMax = {width: imgsizeMax.get_PageWidth() - (imgsizeMax.get_MarginLeft()+imgsizeMax.get_MarginRight()), height:imgsizeMax.get_PageHeight() - (imgsizeMax.get_MarginTop()+imgsizeMax.get_MarginBottom())}; @@ -391,6 +423,7 @@ define([ { imageProps: elValue, sizeMax: imgsizeMax, + sectionProps: me.api.asc_GetSectionProps(), handler: function(result, value) { if (result == 'ok') { if (me.api) { @@ -428,7 +461,7 @@ define([ this._state.ChartType = -1; if (this.api && !this._noApply && this.chartProps) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); this.chartProps.changeType(rawData.type); props.put_ChartProperties(this.chartProps); this.api.ImgApply(props); @@ -458,7 +491,7 @@ define([ btnIconEl.css('background-image', style); if (this.api && !this._noApply && this.chartProps) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); this.chartProps.putStyle(rawData.data); props.put_ChartProperties(this.chartProps); this.api.ImgApply(props); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index c54494443..5f8a2755a 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentHolder.js * @@ -78,6 +110,9 @@ define([ menu.alignPosition(); } _.delay(function() { + var value = Common.localStorage.getItem("de-settings-inputmode"); // only for hieroglyphs mode + if (value!==null && parseInt(value) == 1) + me.api.asc_enableKeyEvents(false); menu.cmpEl.focus(); }, 10); @@ -93,7 +128,7 @@ define([ for (var i = 0; i 0) this._changedProps.put_H(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue())); } @@ -510,16 +543,16 @@ define([ }) .on('change', _.bind(function(field, newValue, oldValue) { if (me._changedProps) { - var type = linerule_Auto; + var type = Asc.linerule_Auto; if (me.cmbHeight.getValue()==me._arrHeight[1].value) - type = linerule_Exact; + type = Asc.linerule_Exact; else if (me.cmbHeight.getValue()==me._arrHeight[2].value) - type = linerule_AtLeast; + type = Asc.linerule_AtLeast; - if (type==linerule_Auto) { + if (type==Asc.linerule_Auto) { me.cmbHeight.suspendEvents(); me.cmbHeight.setValue(me._arrHeight[2].value); - type = linerule_AtLeast; + type = Asc.linerule_AtLeast; me.cmbHeight.resumeEvents(); } @@ -559,9 +592,9 @@ define([ }, me)); this._arrHAlign = [ - {displayValue: this.textLeft, value: c_oAscXAlign.Left}, - {displayValue: this.textCenter, value: c_oAscXAlign.Center}, - {displayValue: this.textRight, value: c_oAscXAlign.Right} + {displayValue: this.textLeft, value: Asc.c_oAscXAlign.Left}, + {displayValue: this.textCenter, value: Asc.c_oAscXAlign.Center}, + {displayValue: this.textRight, value: Asc.c_oAscXAlign.Right} ]; this.cmbHAlign = new Common.UI.ComboBox({ el : $('#frame-advanced-input-hposition'), @@ -583,9 +616,9 @@ define([ this.cmbHAlign.setValue(this._arrHAlign[0].value); this._arrHRelative = [ - {displayValue: this.textMargin, value: c_oAscHAnchor.Margin}, - {displayValue: this.textPage, value: c_oAscHAnchor.Page}, - {displayValue: this.textColumn, value: c_oAscHAnchor.Text} + {displayValue: this.textMargin, value: Asc.c_oAscHAnchor.Margin}, + {displayValue: this.textPage, value: Asc.c_oAscHAnchor.Page}, + {displayValue: this.textColumn, value: Asc.c_oAscHAnchor.Text} ]; this.cmbHRelative = new Common.UI.ComboBox({ el : $('#frame-advanced-input-hrelative'), @@ -602,9 +635,9 @@ define([ this.cmbHRelative.setValue(this._arrHRelative[1].value); this._arrVAlign = [ - {displayValue: this.textTop, value: c_oAscYAlign.Top}, - {displayValue: this.textCenter, value: c_oAscYAlign.Center}, - {displayValue: this.textBottom, value: c_oAscYAlign.Bottom} + {displayValue: this.textTop, value: Asc.c_oAscYAlign.Top}, + {displayValue: this.textCenter, value: Asc.c_oAscYAlign.Center}, + {displayValue: this.textBottom, value: Asc.c_oAscYAlign.Bottom} ]; this.cmbVAlign = new Common.UI.ComboBox({ el : $('#frame-advanced-input-vposition'), @@ -626,9 +659,9 @@ define([ this.cmbVAlign.setValue(this._arrVAlign[0].value); this._arrVRelative = [ - {displayValue: this.textMargin, value: c_oAscVAnchor.Margin}, - {displayValue: this.textPage, value: c_oAscVAnchor.Page}, - {displayValue: this.textParagraph, value: c_oAscVAnchor.Text} + {displayValue: this.textMargin, value: Asc.c_oAscVAnchor.Margin}, + {displayValue: this.textPage, value: Asc.c_oAscVAnchor.Page}, + {displayValue: this.textParagraph, value: Asc.c_oAscVAnchor.Text} ]; this.cmbVRelative = new Common.UI.ComboBox({ el : $('#frame-advanced-input-vrelative'), @@ -640,7 +673,7 @@ define([ .on('selected', _.bind(function(combo, record) { if (me._changedProps) { me._changedProps.put_VAnchor(record.value); - this.chMove.setValue(record.value == c_oAscVAnchor.Text, true); + this.chMove.setValue(record.value == Asc.c_oAscVAnchor.Text, true); } }, me)); this.cmbVRelative.setValue(this._arrVRelative[2].value); @@ -697,7 +730,7 @@ define([ for (var j=0; j 0){ var size = parseFloat(this.BorderSize.ptValue); @@ -1092,7 +1112,7 @@ define([ border.put_Color(color); } else { - border.put_Color(new CColor()); + border.put_Color(new Asc.asc_CColor()); border.put_Value(0); } return border; @@ -1104,28 +1124,28 @@ define([ if ( ct.col==0 && border.indexOf('l') > -1 ) { updateBorders.put_Left(this._UpdateBorderStyle(updateBorders.get_Left(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Left(new CBorder(updateBorders.get_Left())); + this.ChangedBorders.put_Left(new Asc.asc_CTextBorder(updateBorders.get_Left())); } } if ( ct.col== this.tableStylerColumns-1 && border.indexOf('r') > -1 ) { updateBorders.put_Right(this._UpdateBorderStyle(updateBorders.get_Right(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Right(new CBorder(updateBorders.get_Right())); + this.ChangedBorders.put_Right(new Asc.asc_CTextBorder(updateBorders.get_Right())); } } if ( ct.row==0 && border.indexOf('t') > -1 ) { updateBorders.put_Top(this._UpdateBorderStyle(updateBorders.get_Top(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Top(new CBorder(updateBorders.get_Top())); + this.ChangedBorders.put_Top(new Asc.asc_CTextBorder(updateBorders.get_Top())); } } if ( ct.row== this.tableStylerRows-1 && border.indexOf('b') > -1 ) { updateBorders.put_Bottom(this._UpdateBorderStyle(updateBorders.get_Bottom(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Bottom(new CBorder(updateBorders.get_Bottom())); + this.ChangedBorders.put_Bottom(new Asc.asc_CTextBorder(updateBorders.get_Bottom())); } } @@ -1133,7 +1153,7 @@ define([ ct.row== this.tableStylerRows-1 && border.indexOf('t') > -1) { updateBorders.put_Between(this._UpdateBorderStyle(updateBorders.get_Between(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Between(new CBorder(updateBorders.get_Between())); + this.ChangedBorders.put_Between(new Asc.asc_CTextBorder(updateBorders.get_Between())); } } }, @@ -1144,25 +1164,25 @@ define([ if (border.indexOf('l') > -1) { updateBorders.put_Left(this._UpdateBorderStyle(updateBorders.get_Left(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Left(new CBorder(updateBorders.get_Left())); + this.ChangedBorders.put_Left(new Asc.asc_CTextBorder(updateBorders.get_Left())); } } if (border.indexOf('t') > -1) { updateBorders.put_Top(this._UpdateBorderStyle(updateBorders.get_Top(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Top(new CBorder(updateBorders.get_Top())); + this.ChangedBorders.put_Top(new Asc.asc_CTextBorder(updateBorders.get_Top())); } } if (border.indexOf('r') > -1) { updateBorders.put_Right(this._UpdateBorderStyle(updateBorders.get_Right(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Right(new CBorder(updateBorders.get_Right())); + this.ChangedBorders.put_Right(new Asc.asc_CTextBorder(updateBorders.get_Right())); } } if (border.indexOf('b') > -1) { updateBorders.put_Bottom(this._UpdateBorderStyle(updateBorders.get_Bottom(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Bottom(new CBorder(updateBorders.get_Bottom())); + this.ChangedBorders.put_Bottom(new Asc.asc_CTextBorder(updateBorders.get_Bottom())); } } }, diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index 9f68e45f8..97e4534f6 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FileMenu.js * diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 0815187b7..f34003d4f 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FileMenuPanels.js * @@ -20,15 +52,15 @@ define([ menu: undefined, formats: [[ - {name: 'PDF', imgCls: 'pdf', type: c_oAscFileType.PDF}, - {name: 'TXT', imgCls: 'txt', type: c_oAscFileType.TXT}, - {name: 'DOCX', imgCls: 'docx', type: c_oAscFileType.DOCX} + {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT}, + {name: 'DOCX', imgCls: 'docx', type: Asc.c_oAscFileType.DOCX} ],[ -// {name: 'DOC', imgCls: 'doc-format btn-doc', type: c_oAscFileType.DOC}, - {name: 'ODT', imgCls: 'odt', type: c_oAscFileType.ODT}, -// {name: 'RTF', imgCls: 'doc-format btn-rtf', type: c_oAscFileType.RTF}, - {name: 'HTML (Zipped)', imgCls: 'html', type: c_oAscFileType.HTML} -// {name: 'EPUB', imgCls: 'doc-format btn-epub', type: c_oAscFileType.EPUB} +// {name: 'DOC', imgCls: 'doc-format btn-doc', type: Asc.c_oAscFileType.DOC}, + {name: 'ODT', imgCls: 'odt', type: Asc.c_oAscFileType.ODT}, +// {name: 'RTF', imgCls: 'doc-format btn-rtf', type: Asc.c_oAscFileType.RTF}, + {name: 'HTML (Zipped)', imgCls: 'html', type: Asc.c_oAscFileType.HTML} +// {name: 'EPUB', imgCls: 'doc-format btn-epub', type: Asc.c_oAscFileType.EPUB} ]], @@ -160,7 +192,12 @@ define([ this.chAutosave = new Common.UI.CheckBox({ el: $('#fms-chb-autosave'), labelText: this.strAutosave - }); + }).on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (field.getValue()!=='checked' && this.cmbCoAuthMode.getValue()) { + this.cmbCoAuthMode.setValue(0); + this.onSelectCoAuthMode(this.cmbCoAuthMode.getSelectedRecord()); + } + }, this)); this.lblAutosave = $('#fms-lbl-autosave'); this.chAlignGuides = new Common.UI.CheckBox({ @@ -210,10 +247,10 @@ define([ { value: 1, displayValue: this.strFast, descValue: this.strCoAuthModeDescFast}, { value: 0, displayValue: this.strStrict, descValue: this.strCoAuthModeDescStrict } ] - }).on('selected', _.bind(function(combo, record) { - this.lblCoAuthMode.text(record.descValue); - this.fillShowChanges(record.value == 1); - this.cmbShowChanges.setValue((record.value == 1) ? 'none' : 'last'); + }).on('selected', _.bind( function(combo, record) { + if (record.value == 1 && (this.chAutosave.getValue()!=='checked')) + this.chAutosave.setValue(1); + this.onSelectCoAuthMode(record); }, this)); this.lblCoAuthMode = $('#fms-lbl-coauth-mode'); @@ -238,7 +275,8 @@ define([ cls : 'input-group-nr', data : [ { value: Common.Utils.Metric.c_MetricUnits['cm'], displayValue: this.txtCm }, - { value: Common.Utils.Metric.c_MetricUnits['pt'], displayValue: this.txtPt } + { value: Common.Utils.Metric.c_MetricUnits['pt'], displayValue: this.txtPt }, + { value: Common.Utils.Metric.c_MetricUnits['inch'], displayValue: this.txtInch } ] }); @@ -267,8 +305,8 @@ define([ setMode: function(mode) { this.mode = mode; $('tr.edit', this.el)[mode.isEdit?'show':'hide'](); - $('tr.autosave', this.el)[mode.isEdit && mode.canAutosave ? 'show' : 'hide'](); - if (this.mode.isDesktopApp) { + $('tr.autosave', this.el)[mode.isEdit ? 'show' : 'hide'](); + if (this.mode.isDesktopApp && this.mode.isOffline) { this.chAutosave.setCaption(this.strAutoRecover); this.lblAutosave.text(this.textAutoRecover); } @@ -291,7 +329,7 @@ define([ this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0)); value = Common.localStorage.getItem("de-settings-coauthmode"); - var fast_coauth = (value===null || parseInt(value) == 1); + var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline); item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)}); this.cmbCoAuthMode.setValue(item ? item.get('value') : 1); @@ -310,11 +348,11 @@ define([ value = Common.localStorage.getItem("de-settings-unit"); item = this.cmbUnit.store.findWhere({value: parseInt(value)}); - this.cmbUnit.setValue(item ? parseInt(item.get('value')) : 0); + this.cmbUnit.setValue(item ? parseInt(item.get('value')) : Common.Utils.Metric.getDefaultMetric()); this._oldUnits = this.cmbUnit.getValue(); value = Common.localStorage.getItem("de-settings-autosave"); - this.chAutosave.setValue(value===null || parseInt(value) == 1); + this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1)); value = Common.localStorage.getItem("de-settings-spellcheck"); this.chSpell.setValue(value===null || parseInt(value) == 1); @@ -355,7 +393,13 @@ define([ this.cmbShowChanges.store.reset(arr); } }, - + + onSelectCoAuthMode: function(record) { + this.lblCoAuthMode.text(record.descValue); + this.fillShowChanges(record.value == 1); + this.cmbShowChanges.setValue((record.value == 1) ? 'none' : 'last'); + }, + strLiveComment: 'Turn on option', strInputMode: 'Turn on hieroglyphs', strZoom: 'Default Zoom Value', @@ -387,7 +431,8 @@ define([ strFast: 'Fast', strStrict: 'Strict', textAutoRecover: 'Autorecover', - strAutoRecover: 'Turn on autorecover' + strAutoRecover: 'Turn on autorecover', + txtInch: 'Inch' }, DE.Views.FileMenuPanels.Settings || {})); DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/documenteditor/main/app/view/HeaderFooterSettings.js b/apps/documenteditor/main/app/view/HeaderFooterSettings.js index 2c39cd643..916223517 100644 --- a/apps/documenteditor/main/app/view/HeaderFooterSettings.js +++ b/apps/documenteditor/main/app/view/HeaderFooterSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * HeaderFooterSettings.js * @@ -202,8 +234,8 @@ define([ if (this.spinners) { for (var i=0; i0.001 ) { - this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); this._state.Width = value; } value = props.get_Height(); if ( Math.abs(this._state.Height-value)>0.001 ) { - this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); this._state.Height = value; } @@ -218,19 +250,19 @@ define([ this.btnWrapType.setIconCls('item-wrap ' + rawData.iconcls); if (this.api) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); props.put_WrappingStyle((rawData.data)); - if (this._state.WrappingStyle===c_oAscWrapStyle2.Inline && rawData.data!==c_oAscWrapStyle2.Inline ) { - props.put_PositionH(new CImagePositionH()); + if (this._state.WrappingStyle===Asc.c_oAscWrapStyle2.Inline && rawData.data!==Asc.c_oAscWrapStyle2.Inline ) { + props.put_PositionH(new Asc.CImagePositionH()); props.get_PositionH().put_UseAlign(false); - props.get_PositionH().put_RelativeFrom(c_oAscRelativeFromH.Column); - var val = this._originalProps.get_Value_X(c_oAscRelativeFromH.Column); + props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); + var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); props.get_PositionH().put_Value(val); - props.put_PositionV(new CImagePositionV()); + props.put_PositionV(new Asc.CImagePositionV()); props.get_PositionV().put_UseAlign(false); - props.get_PositionV().put_RelativeFrom(c_oAscRelativeFromV.Paragraph); - val = this._originalProps.get_Value_Y(c_oAscRelativeFromV.Paragraph); + props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); + val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); props.get_PositionV().put_Value(val); } @@ -246,10 +278,10 @@ define([ var w = imgsize.get_ImageWidth(); var h = imgsize.get_ImageHeight(); - this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; - this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); + this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); - var properties = new CImgProperty(); + var properties = new Asc.asc_CImgProperty(); properties.put_Width(w); properties.put_Height(h); this.api.ImgApply(properties); @@ -265,7 +297,7 @@ define([ if (me.api) { var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); props.put_ImageUrl(checkUrl); me.api.ImgApply(props); } @@ -288,7 +320,7 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Image == elType) { + if (Asc.c_oAscTypeSelectElement.Image == elType) { var imgsizeOriginal; if (!me.btnOriginalSize.isDisabled()) { imgsizeOriginal = me.api.get_OriginalSizeImage(); @@ -304,6 +336,7 @@ define([ imageProps: elValue, sizeOriginal: imgsizeOriginal, sizeMax: imgsizeMax, + sectionProps: me.api.asc_GetSectionProps(), handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 6a9039ed2..ac41f4878 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ImageSettingsAdvanced.js * @@ -18,11 +50,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat DE.Views.ImageSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 340, - height: 422, + height: 485, toggleGroup: 'image-adv-settings-group', sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, - properties: null + properties: null, + storageName: 'de-img-settings-adv-category' }, initialize : function(options) { @@ -30,6 +63,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat title: this.textTitle, items: [ {panelId: 'id-adv-image-width', panelCaption: this.textSize}, + {panelId: 'id-adv-shape-size', panelCaption: this.textSize}, {panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap}, {panelId: 'id-adv-image-position', panelCaption: this.textPosition}, {panelId: 'id-adv-image-shape', panelCaption: this.textShape}, @@ -44,20 +78,29 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spinners = []; this._state = { - HAlignType: c_oAscAlignH.Left, - HAlignFrom: c_oAscRelativeFromH.Character, - HPositionFrom: c_oAscRelativeFromH.Character, - VAlignType: c_oAscAlignV.Top, - VAlignFrom: c_oAscRelativeFromV.Line, - VPositionFrom: c_oAscRelativeFromV.Line, + HAlignType: Asc.c_oAscAlignH.Left, + HAlignFrom: Asc.c_oAscRelativeFromH.Character, + HPositionFrom: Asc.c_oAscRelativeFromH.Character, + HPositionPcFrom: Asc.c_oAscRelativeFromH.Page, + ShapeWidthPcFrom: Asc.c_oAscRelativeFromH.Margin, + VAlignType: Asc.c_oAscAlignV.Top, + VAlignFrom: Asc.c_oAscRelativeFromV.Paragraph, + VPositionFrom: Asc.c_oAscRelativeFromV.Paragraph, + VPositionPcFrom: Asc.c_oAscRelativeFromV.Page, + ShapeHeightPcFrom: Asc.c_oAscRelativeFromV.Margin, spnXChanged: false, - spnYChanged: false + spnYChanged: false, + spnXPcChanged: false, + spnYPcChanged: false }; - this._objectType = c_oAscTypeSelectElement.Image; + this._objectType = Asc.c_oAscTypeSelectElement.Image; this.Margins = undefined; this._nRatio = 1; this._originalProps = this.options.imageProps; + this.sectionProps = this.options.sectionProps; + this.pageWidth = this.options.sectionProps ? this.options.sectionProps.get_W() : 210; + this.pageHeight = this.options.sectionProps ? this.options.sectionProps.get_H() : 297; this._changedProps = null; this._changedShapeProps = null; }, @@ -67,6 +110,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat var me = this; + // Image & Chart Size this.spnWidth = new Common.UI.MetricSpinner({ el: $('#image-advanced-spin-width'), step: .1, @@ -146,14 +190,191 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat if (btn.pressed && this.spnHeight.getNumberValue()>0) { this._nRatio = this.spnWidth.getNumberValue()/this.spnHeight.getNumberValue(); } + if (this._changedProps) { + this._changedProps.asc_putLockAspect(btn.pressed); + } }, this)); + // Shape Size + this.radioHSize = new Common.UI.RadioBox({ + el: $('#shape-radio-hsize'), + name: 'asc-radio-width', + checked: true + }); + this.radioHSize.on('change', _.bind(this.onRadioHSizeChange, this)); + + this.radioHSizePc = new Common.UI.RadioBox({ + el: $('#shape-radio-hsizepc'), + name: 'asc-radio-width' + }); + this.radioHSizePc.on('change', _.bind(this.onRadioHSizePcChange, this)); + + this.radioVSize = new Common.UI.RadioBox({ + el: $('#shape-radio-vsize'), + name: 'asc-radio-height', + checked: true + }); + this.radioVSize.on('change', _.bind(this.onRadioVSizeChange, this)); + + this.radioVSizePc = new Common.UI.RadioBox({ + el: $('#shape-radio-vsizepc'), + name: 'asc-radio-height' + }); + this.radioVSizePc.on('change', _.bind(this.onRadioVSizePcChange, this)); + + this.chRatio = new Common.UI.CheckBox({ + el: $('#shape-checkbox-ratio'), + labelText: this.textAspectRatio + }); + this.chRatio.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if ((field.getValue()=='checked') && this.spnShapeHeight.getNumberValue()>0) { + this._nRatio = this.spnShapeWidth.getNumberValue()/this.spnShapeHeight.getNumberValue(); + } + if (this._changedProps) { + this._changedProps.asc_putLockAspect(field.getValue()=='checked'); + } + }, this)); + + this.spnShapeWidth = new Common.UI.MetricSpinner({ + el: $('#shape-advanced-spin-width'), + step: .1, + width: 80, + defaultUnit : "cm", + value: '3 cm', + maxValue: 55.88, + minValue: 0 + }); + this.spnShapeWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this.chRatio.getValue()=='checked' && !this.chRatio.isDisabled()) { + var w = field.getNumberValue(); + var h = w/this._nRatio; + if (h>this.sizeMax.height) { + h = this.sizeMax.height; + w = h * this._nRatio; + this.spnShapeWidth.setValue(w, true); + } + this.spnShapeHeight.setValue(h, true); + } + if (this._changedProps) { + this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + this.fillShapeHeight(); + } + }, this)); + this.spinners.push(this.spnShapeWidth); + + this.spnShapeHeight = new Common.UI.MetricSpinner({ + el: $('#shape-advanced-spin-height'), + step: .1, + width: 80, + defaultUnit : "cm", + value: '3 cm', + maxValue: 55.88, + minValue: 0 + }); + this.spnShapeHeight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + var h = field.getNumberValue(), w = null; + if (this.chRatio.getValue()=='checked' && !this.chRatio.isDisabled()) { + w = h * this._nRatio; + if (w>this.sizeMax.width) { + w = this.sizeMax.width; + h = w/this._nRatio; + this.spnShapeHeight.setValue(h, true); + } + this.spnShapeWidth.setValue(w, true); + } + if (this._changedProps) { + this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + this.fillShapeWidth(); + } + }, this)); + this.spinners.push(this.spnShapeHeight); + + this.spnShapeWidthPc = new Common.UI.MetricSpinner({ + el: $('#shape-advanced-spin-width-rel'), + disabled: true, + step: 1, + width: 80, + defaultUnit : "%", + value: '1 %', + maxValue: 1000, + minValue: 1 + }); + this.spnShapeWidthPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + if (this._changedProps.get_SizeRelH()===null || this._changedProps.get_SizeRelH()===undefined) + this._changedProps.put_SizeRelH(new Asc.CImagePositionH()); + + this._changedProps.get_SizeRelH().put_Value(field.getNumberValue()); + this._changedProps.get_SizeRelH().put_RelativeFrom(this._state.ShapeWidthPcFrom); + + this.fillShapeHeight(); + } + }, this)); + + this.spnShapeHeightPc = new Common.UI.MetricSpinner({ + el: $('#shape-advanced-spin-height-rel'), + disabled: true, + step: 1, + width: 80, + defaultUnit : "%", + value: '1 %', + maxValue: 1000, + minValue: 1 + }); + this.spnShapeHeightPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + if (this._changedProps.get_SizeRelV()===null || this._changedProps.get_SizeRelV()===undefined) + this._changedProps.put_SizeRelV(new Asc.CImagePositionV()); + + this._changedProps.get_SizeRelV().put_Value(field.getNumberValue()); + this._changedProps.get_SizeRelV().put_RelativeFrom(this._state.ShapeHeightPcFrom); + + this.fillShapeWidth(); + } + }, this)); + + this._arrHRelativePc = [ + {displayValue: this.textLeftMargin, value: Asc.c_oAscRelativeFromH.LeftMargin, size: this.sectionProps.get_LeftMargin()}, + {displayValue: this.textMargin, value: Asc.c_oAscRelativeFromH.Margin, size: this.sectionProps.get_W() - this.sectionProps.get_LeftMargin() - this.sectionProps.get_RightMargin()}, + {displayValue: this.textPage, value: Asc.c_oAscRelativeFromH.Page, size: this.sectionProps.get_W()}, + {displayValue: this.textRightMargin, value: Asc.c_oAscRelativeFromH.RightMargin, size: this.sectionProps.get_RightMargin()} + ]; + + this.cmbWidthPc = new Common.UI.ComboBox({ + el: $('#shape-combo-width-rel'), + cls: 'input-group-nr', + menuStyle: 'min-width: 115px;', + editable: false, + data: this._arrHRelativePc + }); + this.cmbWidthPc.setDisabled(true); + this.cmbWidthPc.setValue(this._state.ShapeWidthPcFrom); + this.cmbWidthPc.on('selected', _.bind(this.onCmbWidthPcSelect, this)); + + this._arrVRelativePc = [ + {displayValue: this.textMargin, value: Asc.c_oAscRelativeFromV.Margin, size: this.sectionProps.get_H() - this.sectionProps.get_TopMargin() - this.sectionProps.get_BottomMargin()}, + {displayValue: this.textBottomMargin, value: Asc.c_oAscRelativeFromV.BottomMargin, size: this.sectionProps.get_BottomMargin()}, + {displayValue: this.textPage, value: Asc.c_oAscRelativeFromV.Page, size: this.sectionProps.get_H()}, + {displayValue: this.textTopMargin, value: Asc.c_oAscRelativeFromV.TopMargin, size: this.sectionProps.get_TopMargin()} + ]; + + this.cmbHeightPc = new Common.UI.ComboBox({ + el: $('#shape-combo-height-rel'), + cls: 'input-group-nr', + menuStyle: 'min-width: 115px;', + editable: false, + data: this._arrVRelativePc + }); + this.cmbHeightPc.setDisabled(true); + this.cmbHeightPc.setValue(this._state.ShapeHeightPcFrom); + this.cmbHeightPc.on('selected', _.bind(this.onCmbHeightPcSelect, this)); + // Wrapping this.btnWrapInline = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-inline', - posId: c_oAscWrapStyle2.Inline, + posId: Asc.c_oAscWrapStyle2.Inline, hint: this.textWrapInlineTooltip, enableToggle: true, allowDepress: false, @@ -165,7 +386,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapSquare = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-square', - posId: c_oAscWrapStyle2.Square, + posId: Asc.c_oAscWrapStyle2.Square, hint: this.textWrapSquareTooltip, enableToggle: true, allowDepress: false, @@ -177,7 +398,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapTight = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-tight', - posId: c_oAscWrapStyle2.Tight, + posId: Asc.c_oAscWrapStyle2.Tight, hint: this.textWrapTightTooltip, enableToggle: true, allowDepress: false, @@ -189,7 +410,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapThrough = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-through', - posId: c_oAscWrapStyle2.Through, + posId: Asc.c_oAscWrapStyle2.Through, hint: this.textWrapThroughTooltip, enableToggle: true, allowDepress: false, @@ -201,7 +422,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapTopBottom = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-topbottom', - posId: c_oAscWrapStyle2.TopAndBottom, + posId: Asc.c_oAscWrapStyle2.TopAndBottom, hint: this.textWrapTopbottomTooltip, enableToggle: true, allowDepress: false, @@ -213,7 +434,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapBehind = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-behind', - posId: c_oAscWrapStyle2.Behind, + posId: Asc.c_oAscWrapStyle2.Behind, hint: this.textWrapBehindTooltip, enableToggle: true, allowDepress: false, @@ -225,7 +446,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapInFront = new Common.UI.Button({ cls: 'btn-options x-huge', iconCls: 'icon-advanced-wrap btn-wrap-infront', - posId: c_oAscWrapStyle2.InFront, + posId: Asc.c_oAscWrapStyle2.InFront, hint: this.textWrapInFrontTooltip, enableToggle: true, allowDepress: false, @@ -246,7 +467,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnTop.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Paddings()===null || this._changedProps.get_Paddings()===undefined) - this._changedProps.put_Paddings(new CPaddings()); + this._changedProps.put_Paddings(new Asc.asc_CPaddings()); this._changedProps.get_Paddings().put_Top(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } @@ -265,7 +486,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnBottom.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Paddings()===null || this._changedProps.get_Paddings()===undefined) - this._changedProps.put_Paddings(new CPaddings()); + this._changedProps.put_Paddings(new Asc.asc_CPaddings()); this._changedProps.get_Paddings().put_Bottom(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } @@ -284,7 +505,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Paddings()===null || this._changedProps.get_Paddings()===undefined) - this._changedProps.put_Paddings(new CPaddings()); + this._changedProps.put_Paddings(new Asc.asc_CPaddings()); this._changedProps.get_Paddings().put_Left(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } @@ -303,7 +524,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Paddings()===null || this._changedProps.get_Paddings()===undefined) - this._changedProps.put_Paddings(new CPaddings()); + this._changedProps.put_Paddings(new Asc.asc_CPaddings()); this._changedProps.get_Paddings().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } @@ -326,9 +547,10 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._changedProps.get_PositionH().put_UseAlign(false); + this._changedProps.get_PositionH().put_Percent(false); this._changedProps.get_PositionH().put_RelativeFrom(this._state.HPositionFrom); this._changedProps.get_PositionH().put_Value(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this._state.spnXChanged = true; @@ -350,9 +572,10 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnY.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._changedProps.get_PositionV().put_UseAlign(false); + this._changedProps.get_PositionV().put_Percent(false); this._changedProps.get_PositionV().put_RelativeFrom(this._state.VPositionFrom); this._changedProps.get_PositionV().put_Value(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this._state.spnYChanged = true; @@ -362,9 +585,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat // Horizontal this._arrHAlign = [ - {displayValue: this.textLeft, value: c_oAscAlignH.Left}, - {displayValue: this.textCenter, value: c_oAscAlignH.Center}, - {displayValue: this.textRight, value: c_oAscAlignH.Right} + {displayValue: this.textLeft, value: Asc.c_oAscAlignH.Left}, + {displayValue: this.textCenter, value: Asc.c_oAscAlignH.Center}, + {displayValue: this.textRight, value: Asc.c_oAscAlignH.Right} ]; this.cmbHAlign = new Common.UI.ComboBox({ @@ -378,12 +601,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.cmbHAlign.on('selected', _.bind(this.onHAlignSelect, this)); this._arrHRelative = [ - {displayValue: this.textCharacter, value: c_oAscRelativeFromH.Character}, - {displayValue: this.textColumn, value: c_oAscRelativeFromH.Column}, - {displayValue: this.textLeftMargin, value: c_oAscRelativeFromH.LeftMargin}, - {displayValue: this.textMargin, value: c_oAscRelativeFromH.Margin}, - {displayValue: this.textPage, value: c_oAscRelativeFromH.Page}, - {displayValue: this.textRightMargin, value: c_oAscRelativeFromH.RightMargin} + {displayValue: this.textCharacter, value: Asc.c_oAscRelativeFromH.Character}, + {displayValue: this.textColumn, value: Asc.c_oAscRelativeFromH.Column}, + {displayValue: this.textLeftMargin, value: Asc.c_oAscRelativeFromH.LeftMargin}, + {displayValue: this.textMargin, value: Asc.c_oAscRelativeFromH.Margin}, + {displayValue: this.textPage, value: Asc.c_oAscRelativeFromH.Page}, + {displayValue: this.textRightMargin, value: Asc.c_oAscRelativeFromH.RightMargin} ]; this.cmbHRelative = new Common.UI.ComboBox({ @@ -407,11 +630,46 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.cmbHPosition.setValue(this._state.HPositionFrom); this.cmbHPosition.on('selected', _.bind(this.onHPositionSelect, this)); + this.spnXPc = new Common.UI.MetricSpinner({ + el: $('#image-spin-xpc'), + step: 1, + width: 115, + disabled: true, + defaultUnit : "%", + defaultValue : 0, + value: '0 %', + maxValue: 1000, + minValue: -1000 + }); + this.spnXPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) + this._changedProps.put_PositionH(new Asc.CImagePositionH()); + + this._changedProps.get_PositionH().put_UseAlign(false); + this._changedProps.get_PositionH().put_Percent(true); + this._changedProps.get_PositionH().put_RelativeFrom(this._state.HPositionPcFrom); + this._changedProps.get_PositionH().put_Value(field.getNumberValue()); + this._state.spnXPcChanged = true; + } + }, this)); + + this.cmbHPositionPc = new Common.UI.ComboBox({ + el: $('#image-combo-hpositionpc'), + cls: 'input-group-nr', + menuStyle: 'min-width: 115px;', + editable: false, + data: this._arrHRelativePc + }); + this.cmbHPositionPc.setDisabled(true); + this.cmbHPositionPc.setValue(this._state.HPositionPcFrom); + this.cmbHPositionPc.on('selected', _.bind(this.onHPositionPcSelect, this)); + // Vertical this._arrVAlign = [ - {displayValue: this.textTop, value: c_oAscAlignV.Top}, - {displayValue: this.textCenter, value: c_oAscAlignV.Center}, - {displayValue: this.textBottom, value: c_oAscAlignV.Bottom} + {displayValue: this.textTop, value: Asc.c_oAscAlignV.Top}, + {displayValue: this.textCenter, value: Asc.c_oAscAlignV.Center}, + {displayValue: this.textBottom, value: Asc.c_oAscAlignV.Bottom} ]; this.cmbVAlign = new Common.UI.ComboBox({ @@ -425,12 +683,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.cmbVAlign.on('selected', _.bind(this.onVAlignSelect, this)); this._arrVRelative = [ - {displayValue: this.textLine, value: c_oAscRelativeFromV.Line}, - {displayValue: this.textMargin, value: c_oAscRelativeFromV.Margin}, - {displayValue: this.textBottomMargin, value: c_oAscRelativeFromV.BottomMargin}, - {displayValue: this.textParagraph, value: c_oAscRelativeFromV.Paragraph}, - {displayValue: this.textPage, value: c_oAscRelativeFromV.Page}, - {displayValue: this.textTopMargin, value: c_oAscRelativeFromV.TopMargin} + {displayValue: this.textLine, value: Asc.c_oAscRelativeFromV.Line}, + {displayValue: this.textMargin, value: Asc.c_oAscRelativeFromV.Margin}, + {displayValue: this.textBottomMargin, value: Asc.c_oAscRelativeFromV.BottomMargin}, + {displayValue: this.textParagraph, value: Asc.c_oAscRelativeFromV.Paragraph}, + {displayValue: this.textPage, value: Asc.c_oAscRelativeFromV.Page}, + {displayValue: this.textTopMargin, value: Asc.c_oAscRelativeFromV.TopMargin} ]; this.cmbVRelative = new Common.UI.ComboBox({ @@ -454,6 +712,41 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.cmbVPosition.setValue(this._state.VPositionFrom); this.cmbVPosition.on('selected', _.bind(this.onVPositionSelect, this)); + this.spnYPc = new Common.UI.MetricSpinner({ + el: $('#image-spin-ypc'), + step: 1, + width: 115, + disabled: true, + defaultUnit : "%", + defaultValue : 0, + value: '0 %', + maxValue: 1000, + minValue: -1000 + }); + this.spnYPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) + this._changedProps.put_PositionV(new Asc.CImagePositionV()); + + this._changedProps.get_PositionV().put_UseAlign(false); + this._changedProps.get_PositionV().put_Percent(true); + this._changedProps.get_PositionV().put_RelativeFrom(this._state.VPositionPcFrom); + this._changedProps.get_PositionV().put_Value(field.getNumberValue()); + this._state.spnYPcChanged = true; + } + }, this)); + + this.cmbVPositionPc = new Common.UI.ComboBox({ + el: $('#image-combo-vpositionpc'), + cls: 'input-group-nr', + menuStyle: 'min-width: 115px;', + editable: false, + data: this._arrVRelativePc + }); + this.cmbVPositionPc.setDisabled(true); + this.cmbVPositionPc.setValue(this._state.VPositionPcFrom); + this.cmbVPositionPc.on('selected', _.bind(this.onVPositionPcSelect, this)); + this.radioHAlign = new Common.UI.RadioBox({ el: $('#image-radio-halign'), name: 'asc-radio-horizontal', @@ -467,6 +760,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat }); this.radioHPosition.on('change', _.bind(this.onRadioHPositionChange, this)); + this.radioHPositionPc = new Common.UI.RadioBox({ + el: $('#image-radio-hpositionpc'), + name: 'asc-radio-horizontal' + }); + this.radioHPositionPc.on('change', _.bind(this.onRadioHPositionPcChange, this)); + this.radioVAlign = new Common.UI.RadioBox({ el: $('#image-radio-valign'), name: 'asc-radio-vertical', @@ -480,6 +779,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat }); this.radioVPosition.on('change', _.bind(this.onRadioVPositionChange, this)); + this.radioVPositionPc = new Common.UI.RadioBox({ + el: $('#image-radio-vpositionpc'), + name: 'asc-radio-vertical' + }); + this.radioVPositionPc.on('change', _.bind(this.onRadioVPositionPcChange, this)); + this.chMove = new Common.UI.CheckBox({ el: $('#image-checkbox-move'), labelText: this.textMove @@ -522,7 +827,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnMarginTop.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this.Margins===undefined) - this.Margins= new CPaddings(); + this.Margins= new Asc.asc_CPaddings(); this.Margins.put_Top(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -540,7 +845,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnMarginBottom.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this.Margins===undefined) - this.Margins= new CPaddings(); + this.Margins= new Asc.asc_CPaddings(); this.Margins.put_Bottom(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -558,7 +863,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnMarginLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this.Margins===undefined) - this.Margins= new CPaddings(); + this.Margins= new Asc.asc_CPaddings(); this.Margins.put_Left(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -576,7 +881,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnMarginRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this.Margins===undefined) - this.Margins= new CPaddings(); + this.Margins= new Asc.asc_CPaddings(); this.Margins.put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -584,9 +889,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat // Shape this._arrCapType = [ - {displayValue: this.textFlat, value: c_oAscLineCapType.Flat}, - {displayValue: this.textRound, value: c_oAscLineCapType.Round}, - {displayValue: this.textSquare, value: c_oAscLineCapType.Square} + {displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat}, + {displayValue: this.textRound, value: Asc.c_oAscLineCapType.Round}, + {displayValue: this.textSquare, value: Asc.c_oAscLineCapType.Square} ]; this.cmbCapType = new Common.UI.ComboBox({ @@ -596,20 +901,20 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat editable: false, data: this._arrCapType }); - this.cmbCapType.setValue(c_oAscLineCapType.Flat); + this.cmbCapType.setValue(Asc.c_oAscLineCapType.Flat); this.cmbCapType.on('selected', _.bind(function(combo, record){ if (this._changedShapeProps) { if (this._changedShapeProps.get_stroke()===null) - this._changedShapeProps.put_stroke(new CAscStroke()); + this._changedShapeProps.put_stroke(new Asc.asc_CStroke()); this._changedShapeProps.get_stroke().put_linecap(record.value); } }, this)); this._arrJoinType = [ - {displayValue: this.textRound, value: c_oAscLineJoinType.Round}, - {displayValue: this.textBevel, value: c_oAscLineJoinType.Bevel}, - {displayValue: this.textMiter, value: c_oAscLineJoinType.Miter} + {displayValue: this.textRound, value: Asc.c_oAscLineJoinType.Round}, + {displayValue: this.textBevel, value: Asc.c_oAscLineJoinType.Bevel}, + {displayValue: this.textMiter, value: Asc.c_oAscLineJoinType.Miter} ]; this.cmbJoinType = new Common.UI.ComboBox({ el: $('#shape-advanced-join-type'), @@ -618,11 +923,11 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat editable: false, data: this._arrJoinType }); - this.cmbJoinType.setValue(c_oAscLineJoinType.Round); + this.cmbJoinType.setValue(Asc.c_oAscLineJoinType.Round); this.cmbJoinType.on('selected', _.bind(function(combo, record){ if (this._changedShapeProps) { if (this._changedShapeProps.get_stroke()===null) - this._changedShapeProps.put_stroke(new CAscStroke()); + this._changedShapeProps.put_stroke(new Asc.asc_CStroke()); this._changedShapeProps.get_stroke().put_linejoin(record.value); } @@ -633,25 +938,25 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat for ( var i=0; i<6; i++ ) _arrStyles.push({value: i, offsetx: 80*i+10, offsety: 0}); - _arrStyles[0].type = c_oAscLineBeginType.None; - _arrStyles[1].type = c_oAscLineBeginType.Triangle; - _arrStyles[2].type = c_oAscLineBeginType.Arrow; - _arrStyles[3].type = c_oAscLineBeginType.Stealth; - _arrStyles[4].type = c_oAscLineBeginType.Diamond; - _arrStyles[5].type = c_oAscLineBeginType.Oval; + _arrStyles[0].type = Asc.c_oAscLineBeginType.None; + _arrStyles[1].type = Asc.c_oAscLineBeginType.Triangle; + _arrStyles[2].type = Asc.c_oAscLineBeginType.Arrow; + _arrStyles[3].type = Asc.c_oAscLineBeginType.Stealth; + _arrStyles[4].type = Asc.c_oAscLineBeginType.Diamond; + _arrStyles[5].type = Asc.c_oAscLineBeginType.Oval; for ( i=0; i<9; i++ ) _arrSize.push({value: i, offsetx: 80+10, offsety: 20*(i+1)}); - _arrSize[0].type = c_oAscLineBeginSize.small_small; - _arrSize[1].type = c_oAscLineBeginSize.small_mid; - _arrSize[2].type = c_oAscLineBeginSize.small_large; - _arrSize[3].type = c_oAscLineBeginSize.mid_small; - _arrSize[4].type = c_oAscLineBeginSize.mid_mid; - _arrSize[5].type = c_oAscLineBeginSize.mid_large; - _arrSize[6].type = c_oAscLineBeginSize.large_small; - _arrSize[7].type = c_oAscLineBeginSize.large_mid; - _arrSize[8].type = c_oAscLineBeginSize.large_large; + _arrSize[0].type = Asc.c_oAscLineBeginSize.small_small; + _arrSize[1].type = Asc.c_oAscLineBeginSize.small_mid; + _arrSize[2].type = Asc.c_oAscLineBeginSize.small_large; + _arrSize[3].type = Asc.c_oAscLineBeginSize.mid_small; + _arrSize[4].type = Asc.c_oAscLineBeginSize.mid_mid; + _arrSize[5].type = Asc.c_oAscLineBeginSize.mid_large; + _arrSize[6].type = Asc.c_oAscLineBeginSize.large_small; + _arrSize[7].type = Asc.c_oAscLineBeginSize.large_mid; + _arrSize[8].type = Asc.c_oAscLineBeginSize.large_large; this.btnBeginStyle = new Common.UI.ComboBox({ @@ -770,34 +1075,39 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat afterRender: function() { this.updateMetricUnit(); this._setDefaults(this._originalProps); + this.btnsCategory[(this._objectType == Asc.c_oAscTypeSelectElement.Shape) ? 0 : 1].setVisible(false); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, _setDefaults: function(props) { if (props ){ - this._objectType = c_oAscTypeSelectElement.Image; + this._objectType = Asc.c_oAscTypeSelectElement.Image; var value = props.get_WrappingStyle(); if ( props.get_CanBeFlow() ) { switch (value) { - case c_oAscWrapStyle2.Inline: + case Asc.c_oAscWrapStyle2.Inline: this.btnWrapInline.toggle(true); break; - case c_oAscWrapStyle2.Square: + case Asc.c_oAscWrapStyle2.Square: this.btnWrapSquare.toggle(true); break; - case c_oAscWrapStyle2.Tight: + case Asc.c_oAscWrapStyle2.Tight: this.btnWrapTight.toggle(true); break; - case c_oAscWrapStyle2.Through: + case Asc.c_oAscWrapStyle2.Through: this.btnWrapThrough.toggle(true); break; - case c_oAscWrapStyle2.TopAndBottom: + case Asc.c_oAscWrapStyle2.TopAndBottom: this.btnWrapTopBottom.toggle(true); break; - case c_oAscWrapStyle2.Behind: + case Asc.c_oAscWrapStyle2.Behind: this.btnWrapBehind.toggle(true); break; - case c_oAscWrapStyle2.InFront: + case Asc.c_oAscWrapStyle2.InFront: this.btnWrapInFront.toggle(true); break; default: @@ -819,16 +1129,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnWrapTopBottom.setDisabled(true); this.btnWrapBehind.setDisabled(true); this.btnWrapInFront.setDisabled(true); - this._DisableElem(c_oAscWrapStyle2.Inline); + this._DisableElem(Asc.c_oAscWrapStyle2.Inline); } - this.spnWidth.setMaxValue(this.sizeMax.width); - this.spnHeight.setMaxValue(this.sizeMax.height); - value = props.get_Width(); - this.spnWidth.setValue((value!==undefined) ? Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) : '', true); - value = props.get_Height(); - this.spnHeight.setValue((value!==undefined) ? Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) : '', true); - if (props.get_Paddings()) { var Paddings = { Top: props.get_Paddings().get_Top(), @@ -862,6 +1165,17 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat break; } } + } else if (Position.get_Percent()) { + this.radioHPositionPc.setValue(true); + this.spnXPc.setValue(Position.get_Value()); + value = Position.get_RelativeFrom(); + for (i=0; i0) ? filename.substring(idx, filename.length).toLowerCase() : ''; - if (mailformat==c_oAscFileType.PDF && ext!=='.pdf') + if (mailformat==Asc.c_oAscFileType.PDF && ext!=='.pdf') filename += '.pdf'; - else if (mailformat==c_oAscFileType.DOCX && ext!=='.docx') + else if (mailformat==Asc.c_oAscFileType.DOCX && ext!=='.docx') filename += '.docx'; } @@ -212,7 +244,7 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template', }, onCmbFormatSelect: function(combo, record) { - var attachDisable = (record.value == c_oAscFileType.HTML); + var attachDisable = (record.value == Asc.c_oAscFileType.HTML); this.inputFileName.setDisabled(attachDisable); this.lblFileName.toggleClass('disabled', attachDisable); (attachDisable) ? this.textareaMessage.attr('disabled', 'disabled') : this.textareaMessage.removeAttr('disabled'); diff --git a/apps/documenteditor/main/app/view/MailMergeRecepients.js b/apps/documenteditor/main/app/view/MailMergeRecepients.js index 254ea516d..15a066350 100644 --- a/apps/documenteditor/main/app/view/MailMergeRecepients.js +++ b/apps/documenteditor/main/app/view/MailMergeRecepients.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 09.02.15 diff --git a/apps/documenteditor/main/app/view/MailMergeSaveDlg.js b/apps/documenteditor/main/app/view/MailMergeSaveDlg.js index 423c2b3f2..4af2d8642 100644 --- a/apps/documenteditor/main/app/view/MailMergeSaveDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeSaveDlg.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 15.04.15 diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index 48f287bed..2ff261def 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * User: Julia.Radzhabova * Date: 20.02.15 @@ -177,9 +209,9 @@ define([ this.emptyDBControls.push(this.btnLast); this._arrMergeSrc = [ - {displayValue: this.textPdf, value: c_oAscFileType.PDF}, - {displayValue: this.textDocx, value: c_oAscFileType.DOCX}, - {displayValue: this.textEmail, value: c_oAscFileType.HTML} + {displayValue: this.textPdf, value: Asc.c_oAscFileType.PDF}, + {displayValue: this.textDocx, value: Asc.c_oAscFileType.DOCX}, + {displayValue: this.textEmail, value: Asc.c_oAscFileType.HTML} ]; this.cmbMergeTo = new Common.UI.ComboBox({ el: $('#mmerge-combo-merge-to', me.$el), @@ -492,11 +524,11 @@ define([ if (this._mailMergeDlg) return; var me = this; - if (this.cmbMergeTo.getValue() != c_oAscFileType.HTML) { + if (this.cmbMergeTo.getValue() != Asc.c_oAscFileType.HTML) { me._mailMergeDlg = new DE.Views.MailMergeSaveDlg({ mergeFolderUrl: me.mode.mergeFolderUrl, mergedFileUrl: url, - defFileName: me.defFileName + ((this.cmbMergeTo.getValue() == c_oAscFileType.PDF) ? '.pdf' : '.docx') + defFileName: me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx') }); me._mailMergeDlg.on('mailmergefolder', function(obj, folder){ // save last folder }).on('mailmergeerror', function(obj, err){ // save last folder @@ -627,14 +659,14 @@ define([ from = parseInt(this.txtFieldFrom.getValue())-1; to = parseInt(this.txtFieldTo.getValue())-1; } - var mmdata = new CMailMergeSendData(); + var mmdata = new Asc.CMailMergeSendData(); mmdata.put_RecordFrom(from); mmdata.put_RecordTo(to); mmdata.put_From(this.mergeMailData.from); mmdata.put_To(this.mergeMailData.to); mmdata.put_Subject(this.mergeMailData.subject); mmdata.put_MailFormat(this.mergeMailData.mailFormat); - if (this.mergeMailData.mailFormat!==c_oAscFileType.HTML) { + if (this.mergeMailData.mailFormat!==Asc.c_oAscFileType.HTML) { mmdata.put_FileName(this.mergeMailData.fileName); mmdata.put_Message(this.mergeMailData.message); } @@ -645,7 +677,7 @@ define([ }, onLongActionEnd: function(type, id) { - if (id == c_oAscAsyncAction['SendMailMerge']) { + if (id == Asc.c_oAscAsyncAction['SendMailMerge']) { Common.UI.info({ closable: false, width: 500, @@ -720,7 +752,7 @@ define([ }, onCmbMergeToSelect: function(combo, record) { - var mergeVisible = (record.value == c_oAscFileType.HTML); + var mergeVisible = (record.value == Asc.c_oAscFileType.HTML); this.btnMerge.setVisible(mergeVisible); this.btnPortal.setVisible(!mergeVisible && this.mode.mergeFolderUrl); this.btnDownload.setVisible(!mergeVisible); diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index aa1b9b2cb..a207d86ef 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * PageMarginsDialog.js * @@ -117,7 +149,7 @@ define([ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); $window.find('input').on('keypress', _.bind(this.onKeyPress, this)); -// this.updateMetricUnit(); + this.updateMetricUnit(); }, _handleInput: function(state) { @@ -154,26 +186,26 @@ define([ setSettings: function (props) { if (props) { - this.maxMarginsH = parseFloat((props.get_H()/10. - 0.26).toFixed(4)); - this.maxMarginsW = parseFloat((props.get_W()/10. - 1.27).toFixed(4)); + this.maxMarginsH = Common.Utils.Metric.fnRecalcFromMM(props.get_H() - 2.6); + this.maxMarginsW = Common.Utils.Metric.fnRecalcFromMM(props.get_W() - 12.7); this.spnTop.setMaxValue(this.maxMarginsH); this.spnBottom.setMaxValue(this.maxMarginsH); this.spnLeft.setMaxValue(this.maxMarginsW); this.spnRight.setMaxValue(this.maxMarginsW); - this.spnTop.setValue(props.get_TopMargin()/10, true); // this.spnTop.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_TopMargin()), true); - this.spnBottom.setValue(props.get_BottomMargin()/10, true); - this.spnLeft.setValue(props.get_LeftMargin()/10, true); - this.spnRight.setValue(props.get_RightMargin()/10, true); + this.spnTop.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_TopMargin()), true); + this.spnBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_BottomMargin()), true); + this.spnLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_LeftMargin()), true); + this.spnRight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_RightMargin()), true); } }, getSettings: function() { - var props = new CDocumentSectionProps(); - props.put_TopMargin(this.spnTop.getNumberValue()*10); // props.put_TopMargin(Common.Utils.Metric.fnRecalcToMM(this.spnTop.getNumberValue())); - props.put_BottomMargin(this.spnBottom.getNumberValue()*10); - props.put_LeftMargin(this.spnLeft.getNumberValue()*10); - props.put_RightMargin(this.spnRight.getNumberValue()*10); + var props = new Asc.CDocumentSectionProps(); + props.put_TopMargin(Common.Utils.Metric.fnRecalcToMM(this.spnTop.getNumberValue())); + props.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(this.spnBottom.getNumberValue())); + props.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(this.spnLeft.getNumberValue())); + props.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(this.spnRight.getNumberValue())); return props; }, @@ -181,11 +213,10 @@ define([ if (this.spinners) { for (var i=0; i= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Paragraph == elType) { + if (Asc.c_oAscTypeSelectElement.Paragraph == elType) { (new DE.Views.ParagraphSettingsAdvanced( { tableStylerRows: 2, @@ -464,7 +496,7 @@ define([ } }, - strParagraphSpacing: 'Spacing', + strParagraphSpacing: 'Paragraph Spacing', strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style', strLineHeight: 'Line Spacing', strSpacingBefore: 'Before', diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 3dc01471e..5e6d7ff02 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ParagraphSettingsAdvanced.js * @@ -22,7 +54,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem options: { contentWidth: 325, height: 394, - toggleGroup: 'paragraph-adv-settings-group' + toggleGroup: 'paragraph-adv-settings-group', + storageName: 'de-para-settings-adv-category' }, initialize : function(options) { @@ -56,7 +89,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.tableStylerColumns = this.options.tableStylerColumns; this.borderProps = this.options.borderProps; this.api = this.options.api; - this._originalProps = new CParagraphProp(this.options.paragraphProps); + this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps); this.isChart = this.options.isChart; }, @@ -80,7 +113,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numFirstLine.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new CParagraphInd()); + this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_FirstLine(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -99,7 +132,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numIndentsLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new CParagraphInd()); + this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -118,7 +151,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numIndentsRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new CParagraphInd()); + this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -339,7 +372,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this._changedProps.put_TextSpacing(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } if (this.api && !this._noApply) { - var properties = (this._originalProps) ? this._originalProps : new CParagraphProp(); + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); properties.put_TextSpacing(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', properties); } @@ -361,7 +394,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this._changedProps.put_Position(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } if (this.api && !this._noApply) { - var properties = (this._originalProps) ? this._originalProps : new CParagraphProp(); + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); properties.put_Position(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', properties); } @@ -535,38 +568,38 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem if (this.Margins) { var borders = this._changedProps.get_Borders(); if (borders===undefined || borders===null) { - this._changedProps.put_Borders(new CParagraphBorders()); + this._changedProps.put_Borders(new Asc.asc_CParagraphBorders()); borders = this._changedProps.get_Borders(); } if (this.Margins.Left!==undefined) { if (borders.get_Left()===undefined || borders.get_Left()===null) - borders.put_Left(new CBorder(this.Borders.get_Left())); + borders.put_Left(new Asc.asc_CTextBorder(this.Borders.get_Left())); borders.get_Left().put_Space(this.Margins.Left); } if (this.Margins.Top!==undefined) { if (borders.get_Top()===undefined || borders.get_Top()===null) - borders.put_Top(new CBorder(this.Borders.get_Top())); + borders.put_Top(new Asc.asc_CTextBorder(this.Borders.get_Top())); borders.get_Top().put_Space(this.Margins.Top); } if (this.Margins.Right!==undefined) { if (borders.get_Right()===undefined || borders.get_Right()===null) - borders.put_Right(new CBorder(this.Borders.get_Right())); + borders.put_Right(new Asc.asc_CTextBorder(this.Borders.get_Right())); borders.get_Right().put_Space(this.Margins.Right); } if (this.Margins.Bottom!==undefined) { if (borders.get_Bottom()===undefined || borders.get_Bottom()===null) - borders.put_Bottom(new CBorder(this.Borders.get_Bottom())); + borders.put_Bottom(new Asc.asc_CTextBorder(this.Borders.get_Bottom())); borders.get_Bottom().put_Space(this.Margins.Bottom); if (borders.get_Between()===undefined || borders.get_Between()===null) - borders.put_Between(new CBorder(this.Borders.get_Between())); + borders.put_Between(new Asc.asc_CTextBorder(this.Borders.get_Between())); borders.get_Between().put_Space(this.Margins.Bottom); } } if ( this._tabListChanged ) { if (this._changedProps.get_Tabs()===null || this._changedProps.get_Tabs()===undefined) - this._changedProps.put_Tabs(new CParagraphTabs()); + this._changedProps.put_Tabs(new Asc.asc_CParagraphTabs()); this.tabList.store.each(function (item, index) { - var tab = new CParagraphTab(Common.Utils.Metric.fnRecalcToMM(item.get('tabPos')), item.get('tabAlign')); + var tab = new Asc.asc_CParagraphTab(Common.Utils.Metric.fnRecalcToMM(item.get('tabPos')), item.get('tabAlign')); this._changedProps.get_Tabs().add_Tab(tab); }, this); } @@ -575,7 +608,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem _setDefaults: function(props) { if (props ){ - this._originalProps = new CParagraphProp(props); + this._originalProps = new Asc.asc_CParagraphProperty(props); this.hideTextOnlySettings(this.isChart); @@ -589,7 +622,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.chKeepNext.setValue((props.get_KeepNext() !== null && props.get_KeepNext() !== undefined) ? props.get_KeepNext() : 'indeterminate', true); this.chOrphan.setValue((props.get_WidowControl() !== null && props.get_WidowControl() !== undefined) ? props.get_WidowControl() : 'indeterminate', true); - this.Borders = new CParagraphBorders(props.get_Borders()); + this.Borders = new Asc.asc_CParagraphBorders(props.get_Borders()); // Margins if (this.Borders) { @@ -609,10 +642,10 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem // Borders var shd = props.get_Shade(); - if (shd!==null && shd!==undefined && shd.get_Value()===shd_Clear) { + if (shd!==null && shd!==undefined && shd.get_Value()===Asc.c_oAscShdClear) { var color = shd.get_Color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.paragraphShade = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; } else { this.paragraphShade = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); @@ -666,7 +699,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem var rec = new Common.UI.DataViewModel(); rec.set({ tabPos: pos, - value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()], + value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), tabAlign: tab.get_Value() }); arr.push(rec); @@ -678,7 +711,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this._noApply = false; - this._changedProps = new CParagraphProp(); + this._changedProps = new Asc.asc_CParagraphProperty(); this.ChangedBorders = undefined; } }, @@ -687,11 +720,11 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem if (this.spinners) { for (var i=0; i 0){ var size = parseFloat(this.BorderSize.ptValue); @@ -915,7 +953,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem border.put_Color(color); } else { - border.put_Color(new CAscColor()); + border.put_Color(new Asc.asc_CColor()); border.put_Value(0); } return border; @@ -927,28 +965,28 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem if ( ct.col==0 && border.indexOf('l') > -1 ) { updateBorders.put_Left(this._UpdateBorderStyle(updateBorders.get_Left(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Left(new CBorder(updateBorders.get_Left())); + this.ChangedBorders.put_Left(new Asc.asc_CTextBorder(updateBorders.get_Left())); } } if ( ct.col== this.tableStylerColumns-1 && border.indexOf('r') > -1 ) { updateBorders.put_Right(this._UpdateBorderStyle(updateBorders.get_Right(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Right(new CBorder(updateBorders.get_Right())); + this.ChangedBorders.put_Right(new Asc.asc_CTextBorder(updateBorders.get_Right())); } } if ( ct.row==0 && border.indexOf('t') > -1 ) { updateBorders.put_Top(this._UpdateBorderStyle(updateBorders.get_Top(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Top(new CBorder(updateBorders.get_Top())); + this.ChangedBorders.put_Top(new Asc.asc_CTextBorder(updateBorders.get_Top())); } } if ( ct.row== this.tableStylerRows-1 && border.indexOf('b') > -1 ) { updateBorders.put_Bottom(this._UpdateBorderStyle(updateBorders.get_Bottom(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Bottom(new CBorder(updateBorders.get_Bottom())); + this.ChangedBorders.put_Bottom(new Asc.asc_CTextBorder(updateBorders.get_Bottom())); } } @@ -956,7 +994,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem ct.row== this.tableStylerRows-1 && border.indexOf('t') > -1) { updateBorders.put_Between(this._UpdateBorderStyle(updateBorders.get_Between(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Between(new CBorder(updateBorders.get_Between())); + this.ChangedBorders.put_Between(new Asc.asc_CTextBorder(updateBorders.get_Between())); } } }, @@ -967,25 +1005,25 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem if (border.indexOf('l') > -1) { updateBorders.put_Left(this._UpdateBorderStyle(updateBorders.get_Left(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Left(new CBorder(updateBorders.get_Left())); + this.ChangedBorders.put_Left(new Asc.asc_CTextBorder(updateBorders.get_Left())); } } if (border.indexOf('t') > -1) { updateBorders.put_Top(this._UpdateBorderStyle(updateBorders.get_Top(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Top(new CBorder(updateBorders.get_Top())); + this.ChangedBorders.put_Top(new Asc.asc_CTextBorder(updateBorders.get_Top())); } } if (border.indexOf('r') > -1) { updateBorders.put_Right(this._UpdateBorderStyle(updateBorders.get_Right(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Right(new CBorder(updateBorders.get_Right())); + this.ChangedBorders.put_Right(new Asc.asc_CTextBorder(updateBorders.get_Right())); } } if (border.indexOf('b') > -1) { updateBorders.put_Bottom(this._UpdateBorderStyle(updateBorders.get_Bottom(), (size>0))); if (this.ChangedBorders) { - this.ChangedBorders.put_Bottom(new CBorder(updateBorders.get_Bottom())); + this.ChangedBorders.put_Bottom(new Asc.asc_CTextBorder(updateBorders.get_Bottom())); } } }, @@ -1061,7 +1099,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem rec = new Common.UI.DataViewModel(); rec.set({ tabPos: val, - value: val + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()], + value: val + ' ' + Common.Utils.Metric.getCurrentMetricName(), tabAlign: align }); store.add(rec); diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index 5da75e2b8..3366d6cfe 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * RightMenu.js * @@ -110,7 +142,9 @@ define([ this.trigger('render:before', this); - el.css('width', '40px'); + var open = Common.localStorage.getItem("de-hide-right-settings"); + open = (open===null || parseInt(open) == 0); + el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px'); el.show(); el.html(this.template({})); @@ -162,6 +196,11 @@ define([ }); } + if (open) { + $('#id-empty-settings').parent().css("display", "inline-block" ); + $('#id-empty-settings').addClass("active"); + } + this.trigger('render:after', this); return this; @@ -194,7 +233,7 @@ define([ $(this.el).width(MENU_SCALE_PART); target_pane_parent.css("display", "inline-block" ); this.minimizedMode = false; - Common.localStorage.setItem("de-hidden-right-settings", 0); + Common.localStorage.setItem("de-hide-right-settings", 0); } target_pane_parent.find('> .active').removeClass('active'); target_pane.addClass("active"); @@ -206,7 +245,7 @@ define([ target_pane_parent.css("display", "none" ); $(this.el).width(SCALE_MIN); this.minimizedMode = true; - Common.localStorage.setItem("de-hidden-right-settings", 1); + Common.localStorage.setItem("de-hide-right-settings", 1); } this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); @@ -248,7 +287,6 @@ define([ target_pane.css("display", "none" ); $(this.el).width(SCALE_MIN); this.minimizedMode = true; - Common.localStorage.setItem("de-hidden-right-settings", 1); Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); }, diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 536868989..8449545cd 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeSettings.js * @@ -47,19 +79,21 @@ define([ this._sendUndoPoint = true; this._sliderChanged = false; + this.txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt); + this._state = { Transparency: null, - FillType: c_oAscFill.FILL_TYPE_SOLID, + FillType: Asc.c_oAscFill.FILL_TYPE_SOLID, ShapeColor: 'transparent', - BlipFillType: c_oAscFillBlipType.STRETCH, - StrokeType: c_oAscStrokeType.STROKE_COLOR, + BlipFillType: Asc.c_oAscFillBlipType.STRETCH, + StrokeType: Asc.c_oAscStrokeType.STROKE_COLOR, StrokeWidth: this._pt2mm(1), StrokeColor: '000000', FGColor: '000000', BGColor: 'ffffff', GradColor: '000000', - GradFillType: c_oAscFillGradType.GRAD_LINEAR, - WrappingStyle: c_oAscWrapStyle2.Inline, + GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, + WrappingStyle: Asc.c_oAscWrapStyle2.Inline, CanBeFlow: true, FromGroup: false, DisabledFillPanels: false, @@ -70,10 +104,10 @@ define([ this.lockedControls = []; this._locked = false; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.ShapeColor = {Value: 1, Color: 'transparent'}; // value=1 - цвет определен - прозрачный или другой, value=0 - цвет не определен, рисуем прозрачным - this.BlipFillType = c_oAscFillBlipType.STRETCH; - this.GradFillType = c_oAscFillGradType.GRAD_LINEAR; + this.BlipFillType = Asc.c_oAscFillBlipType.STRETCH; + this.GradFillType = Asc.c_oAscFillGradType.GRAD_LINEAR; this.GradColor = { values: [0, 100], colors: ['000000', 'ffffff'], currentIdx: 0}; this.GradRadialDirectionIdx = 0; this.GradLinearDirectionType = 0; @@ -92,11 +126,11 @@ define([ this.render(); this._arrFillSrc = [ - {displayValue: this.textColor, value: c_oAscFill.FILL_TYPE_SOLID}, - {displayValue: this.textGradientFill, value: c_oAscFill.FILL_TYPE_GRAD}, - {displayValue: this.textImageTexture, value: c_oAscFill.FILL_TYPE_BLIP}, - {displayValue: this.textPatternFill, value: c_oAscFill.FILL_TYPE_PATT}, - {displayValue: this.textNoFill, value: c_oAscFill.FILL_TYPE_NOFILL} + {displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID}, + {displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD}, + {displayValue: this.textImageTexture, value: Asc.c_oAscFill.FILL_TYPE_BLIP}, + {displayValue: this.textPatternFill, value: Asc.c_oAscFill.FILL_TYPE_PATT}, + {displayValue: this.textNoFill, value: Asc.c_oAscFill.FILL_TYPE_NOFILL} ]; this.cmbFillSrc = new Common.UI.ComboBox({ @@ -277,8 +311,8 @@ define([ this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); this._arrFillType = [ - {displayValue: this.textStretch, value: c_oAscFillBlipType.STRETCH}, - {displayValue: this.textTile, value: c_oAscFillBlipType.TILE} + {displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH}, + {displayValue: this.textTile, value: Asc.c_oAscFillBlipType.TILE} ]; this.cmbFillType = new Common.UI.ComboBox({ @@ -337,8 +371,8 @@ define([ this.lblTransparencyEnd = $(this.el).find('#shape-lbl-transparency-end'); this._arrGradType = [ - {displayValue: this.textLinear, value: c_oAscFillGradType.GRAD_LINEAR}, - {displayValue: this.textRadial, value: c_oAscFillGradType.GRAD_PATH} + {displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR}, + {displayValue: this.textRadial, value: Asc.c_oAscFillGradType.GRAD_PATH} ]; this.cmbGradType = new Common.UI.ComboBox({ @@ -507,13 +541,13 @@ define([ $(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); var viewData = [ - { offsetx: 0, data: c_oAscWrapStyle2.Inline, iconcls:'wrap-inline', tip: this.txtInline, selected: true }, - { offsetx: 50, data: c_oAscWrapStyle2.Square, iconcls:'wrap-square', tip: this.txtSquare }, - { offsetx: 100, data: c_oAscWrapStyle2.Tight, iconcls:'wrap-tight', tip: this.txtTight }, - { offsetx: 150, data: c_oAscWrapStyle2.Through, iconcls:'wrap-through', tip: this.txtThrough }, - { offsetx: 200, data: c_oAscWrapStyle2.TopAndBottom, iconcls:'wrap-topAndBottom', tip: this.txtTopAndBottom }, - { offsetx: 250, data: c_oAscWrapStyle2.InFront, iconcls:'wrap-inFront', tip: this.txtInFront }, - { offsetx: 300, data: c_oAscWrapStyle2.Behind, iconcls:'wrap-behind', tip: this.txtBehind } + { offsetx: 0, data: Asc.c_oAscWrapStyle2.Inline, iconcls:'wrap-inline', tip: this.txtInline, selected: true }, + { offsetx: 50, data: Asc.c_oAscWrapStyle2.Square, iconcls:'wrap-square', tip: this.txtSquare }, + { offsetx: 100, data: Asc.c_oAscWrapStyle2.Tight, iconcls:'wrap-tight', tip: this.txtTight }, + { offsetx: 150, data: Asc.c_oAscWrapStyle2.Through, iconcls:'wrap-through', tip: this.txtThrough }, + { offsetx: 200, data: Asc.c_oAscWrapStyle2.TopAndBottom, iconcls:'wrap-topAndBottom', tip: this.txtTopAndBottom }, + { offsetx: 250, data: Asc.c_oAscWrapStyle2.InFront, iconcls:'wrap-inFront', tip: this.txtInFront }, + { offsetx: 300, data: Asc.c_oAscWrapStyle2.Behind, iconcls:'wrap-behind', tip: this.txtBehind } ]; this.btnWrapType = new Common.UI.Button({ @@ -573,10 +607,8 @@ define([ this.api = api; if (this.api) { this.api.asc_registerCallback('asc_onImgWrapStyleChanged', _.bind(this._ImgWrapStyleChanged, this)); - this.api.SetInterfaceDrawImagePlaceShape('shape-texture-img'); - var textures = this.api.get_PropertyStandartTextures(); - if (textures) - this.onInitStandartTextures(textures); + this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img'); + this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this)); } return this; }, @@ -584,32 +616,32 @@ define([ onFillSrcSelect: function(combo, record) { this.ShowHideElem(record.value); switch (record.value){ - case c_oAscFill.FILL_TYPE_SOLID: - this._state.FillType = c_oAscFill.FILL_TYPE_SOLID; + case Asc.c_oAscFill.FILL_TYPE_SOLID: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_SOLID; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_SOLID); - fill.put_fill( new CAscFillSolid()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID); + fill.put_fill( new Asc.asc_CFillSolid()); fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor((this.ShapeColor.Color=='transparent') ? {color: '4f81bd', effectId: 24} : this.ShapeColor.Color)); props.put_fill(fill); this.imgprops.put_ShapeProperties(props); this.api.ImgApply(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_GRAD: - this._state.FillType = c_oAscFill.FILL_TYPE_GRAD; + case Asc.c_oAscFill.FILL_TYPE_GRAD: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_GRAD; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(), HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex(); @@ -627,16 +659,16 @@ define([ this.api.ImgApply(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_BLIP: - this._state.FillType = c_oAscFill.FILL_TYPE_BLIP; + case Asc.c_oAscFill.FILL_TYPE_BLIP: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_BLIP; break; - case c_oAscFill.FILL_TYPE_PATT: - this._state.FillType = c_oAscFill.FILL_TYPE_PATT; + case Asc.c_oAscFill.FILL_TYPE_PATT: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_PATT; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); fill.get_fill().put_pattern_type(this.PatternFillType); var fHexColor = Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color).get_color().get_hex(); @@ -655,12 +687,12 @@ define([ this.api.ImgApply(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_NOFILL: - this._state.FillType = c_oAscFill.FILL_TYPE_NOFILL; + case Asc.c_oAscFill.FILL_TYPE_NOFILL: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_NOFILL); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.put_fill(null); props.put_fill(fill); this.imgprops.put_ShapeProperties(props); @@ -676,15 +708,15 @@ define([ this.ShapeColor = {Value: 1, Color: color}; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); if (this.ShapeColor.Color=='transparent') { - fill.put_type(c_oAscFill.FILL_TYPE_NOFILL); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.put_fill(null); } else { - fill.put_type(c_oAscFill.FILL_TYPE_SOLID); - fill.put_fill( new CAscFillSolid()); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID); + fill.put_fill( new Asc.asc_CFillSolid()); fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(this.ShapeColor.Color)); } @@ -702,12 +734,12 @@ define([ onPatternSelect: function(combo, record){ if (this.api && !this._noApply) { this.PatternFillType = record.get('type'); - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); fill.get_fill().put_pattern_type(this.PatternFillType); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.get_fill().put_color_fg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); fill.get_fill().put_color_bg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -722,12 +754,12 @@ define([ this.btnFGColor.setColor(color); this.FGColor = {Value: 1, Color: color}; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); fill.get_fill().put_color_fg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.get_fill().put_pattern_type(this.PatternFillType); fill.get_fill().put_color_bg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -742,11 +774,11 @@ define([ this.btnBGColor.setColor(color); this.BGColor = {Value: 1, Color: color}; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.get_fill().put_pattern_type(this.PatternFillType); fill.get_fill().put_color_fg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); } @@ -761,11 +793,11 @@ define([ onFillTypeSelect: function(combo, record) { this.BlipFillType = record.value; - if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == c_oAscFill.FILL_TYPE_BLIP) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); + if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == Asc.c_oAscFill.FILL_TYPE_BLIP) { + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); fill.get_fill().put_type(this.BlipFillType); @@ -780,8 +812,8 @@ define([ this.sldrTransparency.setValue(field.getNumberValue(), true); if (this.api) { var num = field.getNumberValue(); - var props = new CAscShapeProp(); - var fill = new CAscFill(); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); fill.put_transparent(num * 2.55); props.put_fill(fill); this.imgprops.put_ShapeProperties(props); @@ -811,8 +843,8 @@ define([ _transparencyApplyFunc: function() { if (this._sliderChanged!==undefined) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); fill.put_transparent(this._sliderChanged * 2.55); props.put_fill(fill); this.imgprops.put_ShapeProperties(props); @@ -824,7 +856,7 @@ define([ onGradTypeSelect: function(combo, record){ this.GradFillType = record.value; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { this.mnuDirectionPicker.store.reset(this._viewDataLinear); this.mnuDirectionPicker.cmpEl.width(175); this.mnuDirectionPicker.restoreHeight = 174; @@ -834,7 +866,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - } else if (this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); this.mnuDirectionPicker.cmpEl.width(60); this.mnuDirectionPicker.restoreHeight = 58; @@ -846,12 +878,12 @@ define([ } if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } @@ -881,13 +913,13 @@ define([ } this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls); - (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; + (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; if (this.api) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); fill.get_fill().put_linear_angle(rawData.type * 60000); fill.get_fill().put_linear_scale(true); @@ -907,15 +939,15 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color)); if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); fill.get_fill().put_colors([Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]), Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1])]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } @@ -950,15 +982,15 @@ define([ _gradientApplyFunc: function() { if (this._sliderChanged) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); fill.get_fill().put_positions([this.GradColor.values[0]*1000, this.GradColor.values[1]*1000]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } @@ -977,16 +1009,16 @@ define([ this.BorderSize = value; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var stroke = new CAscStroke(); + var props = new Asc.asc_CShapeProperty(); + var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.put_type( c_oAscStrokeType.STROKE_NONE); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { - stroke.put_type( c_oAscStrokeType.STROKE_COLOR); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); if (this.BorderColor.Color == 'transparent' || this.BorderColor.Color.color == 'transparent') stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29})); - else if (this._state.StrokeType == c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) + else if (this._state.StrokeType == Asc.c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(this.BorderColor.Color))); stroke.put_width(this._pt2mm(this.BorderSize)); } @@ -1004,8 +1036,9 @@ define([ onBorderSizeChanged: function(before, combo, record, e) { var me = this; if (before) { - var value = parseFloat(record.value); - if (!(/^\s*(\d*(\.|,)?\d+)\s*(pt)?\s*$/.exec(record.value)) || value<0 || value>1584) { + var value = parseFloat(record.value), + expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); + if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; Common.UI.error({ msg: this.textBorderSizeErr, @@ -1028,12 +1061,12 @@ define([ this.btnBorderColor.setColor(color); this.BorderColor = {Value: 1, Color: color}; if (this.api && this.BorderSize>0 && !this._noApply) { - var props = new CAscShapeProp(); - var stroke = new CAscStroke(); + var props = new Asc.asc_CShapeProperty(); + var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.put_type( c_oAscStrokeType.STROKE_NONE); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { - stroke.put_type( c_oAscStrokeType.STROKE_COLOR); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_color(Common.Utils.ThemeColor.getRgbColor(this.BorderColor.Color)); stroke.put_width(this._pt2mm(this.BorderSize)); } @@ -1076,20 +1109,20 @@ define([ this.btnWrapType.setIconCls('item-wrap ' + rawData.iconcls); if (this.api) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); props.put_WrappingStyle((rawData.data)); - if (this._state.WrappingStyle===c_oAscWrapStyle2.Inline && rawData.data!==c_oAscWrapStyle2.Inline ) { - props.put_PositionH(new CImagePositionH()); + if (this._state.WrappingStyle===Asc.c_oAscWrapStyle2.Inline && rawData.data!==Asc.c_oAscWrapStyle2.Inline ) { + props.put_PositionH(new Asc.CImagePositionH()); props.get_PositionH().put_UseAlign(false); - props.get_PositionH().put_RelativeFrom(c_oAscRelativeFromH.Column); - var val = this._originalProps.get_Value_X(c_oAscRelativeFromH.Column); + props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); + var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); props.get_PositionH().put_Value(val); - props.put_PositionV(new CImagePositionV()); + props.put_PositionV(new Asc.CImagePositionV()); props.get_PositionV().put_UseAlign(false); - props.get_PositionV().put_RelativeFrom(c_oAscRelativeFromV.Paragraph); - val = this._originalProps.get_Value_Y(c_oAscRelativeFromV.Paragraph); + props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); + val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); props.get_PositionV().put_Value(val); } @@ -1108,10 +1141,10 @@ define([ var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { if (me.BlipFillType !== null) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); fill.get_fill().put_type(me.BlipFillType); fill.get_fill().put_url(checkUrl); @@ -1139,10 +1172,11 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Image == elType) { + if (Asc.c_oAscTypeSelectElement.Image == elType) { (new DE.Views.ImageSettingsAdvanced( { imageProps: elValue, + sectionProps: me.api.asc_GetSectionProps(), handler: function(result, value) { if (result == 'ok') { if (me.api) { @@ -1161,7 +1195,7 @@ define([ ChangeSettings: function(props) { if (this.imgprops==null) - this.imgprops = new CImgProperty(); + this.imgprops = new Asc.asc_CImgProperty(); else this.imgprops.put_ImageUrl(null); @@ -1173,7 +1207,7 @@ define([ { var shapeprops = props.get_ShapeProperties(), shapetype = shapeprops.asc_getType(); - this._originalProps = new CImgProperty(props); + this._originalProps = new Asc.asc_CImgProperty(props); this._noApply = true; @@ -1221,13 +1255,13 @@ define([ if (fill===null || fill_type===null) { // заливка не совпадает у неск. фигур this.OriginalFillType = null; - } else if (fill_type==c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет - this.OriginalFillType = c_oAscFill.FILL_TYPE_NOFILL; - } else if (fill_type==c_oAscFill.FILL_TYPE_SOLID) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) { fill = fill.get_fill(); color = fill.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.ShapeColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1235,23 +1269,23 @@ define([ } else this.ShapeColor = {Value: 0, Color: 'transparent'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.FGColor = (this.ShapeColor.Color!=='transparent') ? {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color)} : {Value: 1, Color: '000000'}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.GradColor.colors[0] = (this.ShapeColor.Color!=='transparent') ? Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color) : '000000'; this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_BLIP) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_BLIP) { fill = fill.get_fill(); this.BlipFillType = fill.get_type(); // null - не совпадают у нескольких фигур if (this._state.BlipFillType !== this.BlipFillType) { - if (this.BlipFillType == c_oAscFillBlipType.STRETCH || this.BlipFillType == c_oAscFillBlipType.TILE) { + if (this.BlipFillType == Asc.c_oAscFillBlipType.STRETCH || this.BlipFillType == Asc.c_oAscFillBlipType.TILE) { this.cmbFillType.setValue(this.BlipFillType); } else this.cmbFillType.setValue(''); this._state.BlipFillType = this.BlipFillType; } - this.OriginalFillType = c_oAscFill.FILL_TYPE_BLIP; - } else if (fill_type==c_oAscFill.FILL_TYPE_PATT) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_BLIP; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_PATT) { fill = fill.get_fill(); this.PatternFillType = fill.get_pattern_type(); // null - не совпадают у нескольких фигур if (this._state.PatternFillType !== this.PatternFillType) { @@ -1266,7 +1300,7 @@ define([ color = fill.get_color_fg(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1276,7 +1310,7 @@ define([ color = fill.get_color_bg(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1284,17 +1318,17 @@ define([ } else this.BGColor = {Value: 1, Color: 'ffffff'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_PATT; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color); this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_GRAD) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_GRAD) { fill = fill.get_fill(); var gradfilltype = fill.get_grad_type(); // null - не совпадают у нескольких фигур if (this._state.GradFillType !== gradfilltype || this.GradFillType !== gradfilltype) { this.GradFillType = gradfilltype; rec = undefined; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.cmbGradType.setValue(this.GradFillType); rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); this.onGradTypeSelect(this.cmbGradType, rec.attributes); @@ -1305,7 +1339,7 @@ define([ this._state.GradFillType = this.GradFillType; } - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR ) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR ) { var value = Math.floor(fill.get_linear_angle()/60000); if (Math.abs(this.GradLinearDirectionType-value)>0.001) { this.GradLinearDirectionType=value; @@ -1322,7 +1356,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -1333,7 +1367,7 @@ define([ color = colors[1]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -1361,7 +1395,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; @@ -1404,10 +1438,10 @@ define([ var strokeType = stroke.get_type(); if (stroke) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { color = stroke.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BorderColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else @@ -1447,10 +1481,10 @@ define([ this._state.StrokeColor = this.BorderColor.Color; } - if (this._state.StrokeType !== strokeType || strokeType == c_oAscStrokeType.STROKE_COLOR) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !(/pt\s*$/.test(this.cmbBorderSize.getRawValue())); + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; @@ -1464,11 +1498,11 @@ define([ if (_selectedItem) this.cmbBorderSize.selectRecord(_selectedItem); else { - this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' pt' : ''); + this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' ' + this.txtPt : ''); } this.BorderSize = w; } - } else if (strokeType == c_oAscStrokeType.STROKE_NONE) { + } else if (strokeType == Asc.c_oAscStrokeType.STROKE_NONE) { this._state.StrokeWidth = 0; this.BorderSize = this.cmbBorderSize.store.at(0).get('value'); this.cmbBorderSize.setValue(this.BorderSize); @@ -1626,11 +1660,11 @@ define([ this._fromTextureCmb = false; if (this.api) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); - fill.get_fill().put_type(c_oAscFillBlipType.TILE); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); + fill.get_fill().put_type(Asc.c_oAscFillBlipType.TILE); fill.get_fill().put_texture_id(record.get('type')); props.put_fill(fill); this.imgprops.put_ShapeProperties(props); @@ -1705,11 +1739,11 @@ define([ }, ShowHideElem: function(value) { - this.FillColorContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_SOLID); - this.FillImageContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_BLIP); - this.FillPatternContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_PATT); - this.FillGradientContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_GRAD); - this.TransparencyContainer.toggleClass('settings-hidden', (value === c_oAscFill.FILL_TYPE_NOFILL || value === null)); + this.FillColorContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_SOLID); + this.FillImageContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_BLIP); + this.FillPatternContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_PATT); + this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD); + this.TransparencyContainer.toggleClass('settings-hidden', (value === Asc.c_oAscFill.FILL_TYPE_NOFILL || value === null)); }, setLocked: function (locked) { diff --git a/apps/documenteditor/main/app/view/StatusBar.js b/apps/documenteditor/main/app/view/Statusbar.js similarity index 94% rename from apps/documenteditor/main/app/view/StatusBar.js rename to apps/documenteditor/main/app/view/Statusbar.js index d26c59bff..d0eea1170 100644 --- a/apps/documenteditor/main/app/view/StatusBar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * StatusBar View * diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js index 7ea8ab3d6..bd0beae32 100644 --- a/apps/documenteditor/main/app/view/StyleTitleDialog.js +++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js @@ -1,5 +1,37 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** - * Created by vladimir on 26.05.15. + * Created by Vladimir Karas on 26.05.15. */ if (Common === undefined) var Common = {}; diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index d8522181b..033b01d73 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableSettings.js * @@ -57,9 +89,8 @@ define([ }; this.lockedControls = []; this._locked = false; - this._originalLook = new CTablePropLook(); + this._originalLook = new Asc.CTablePropLook(); - var fullwidth = 218; this._originalProps = null; this.CellBorders = {}; this.CellColor = {Value: 1, Color: 'transparent'}; // value=1 - цвет определен - прозрачный или другой, value=0 - цвет не определен, рисуем прозрачным @@ -187,7 +218,7 @@ define([ el: $('#table-combo-border-size'), style: "width: 93px;" }); - this.BorderSize = this.cmbBorderSize.store.at(2).get('value'); + this.BorderSize = this.cmbBorderSize.store.at(1).get('value'); this.cmbBorderSize.setValue(this.BorderSize); this.cmbBorderSize.on('selected', _.bind(this.onBorderSizeSelect, this)); this.lockedControls.push(this.cmbBorderSize); @@ -321,8 +352,8 @@ define([ onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) { if (this.api) { - var properties = new CTableProp(); - var look = (this._originalLook) ? this._originalLook : new CTablePropLook(); + var properties = new Asc.CTableProp(); + var look = (this._originalLook) ? this._originalLook : new Asc.CTablePropLook(); switch (type) { case 0: look.put_FirstRow(field.getValue()=='checked'); @@ -351,7 +382,7 @@ define([ onTableTemplateSelect: function(combo, record){ if (this.api && !this._noApply) { - var properties = new CTableProp(); + var properties = new Asc.CTableProp(); properties.put_TableStyle(record.get('templateId')); this.api.tblApply(properties); } @@ -360,7 +391,7 @@ define([ onBtnWrapClick: function(btn, e) { if (this.api && btn.pressed && !this._noApply) { - var properties = new CTableProp(); + var properties = new Asc.CTableProp(); properties.put_TableWrap(btn.options.posId); if (btn.options.posId == c_tableWrap.TABLE_WRAP_NONE) { if (this._state.TableAlignment<0) @@ -378,7 +409,7 @@ define([ onCheckRepeatRowChange: function(field, newValue, oldValue, eOpts) { if (this.api) { - var properties = new CTableProp(); + var properties = new Asc.CTableProp(); properties.put_RowsInHeader((field.getValue()=='checked') ? 1 : 0 ); this.api.tblApply(properties); } @@ -390,8 +421,8 @@ define([ this.CellColor = {Value: 1, Color: color}; if (this.api) { - var properties = new CTableProp(); - var background = new CBackground(); + var properties = new Asc.CTableProp(); + var background = new Asc.CBackground(); properties.put_CellsBackground(background); if (this.CellColor.Color=='transparent') { @@ -419,7 +450,7 @@ define([ onBtnBordersClick: function(btn, eOpts){ this._UpdateBordersStyle(btn.options.strId, true); if (this.api) { - var properties = new CTableProp(); + var properties = new Asc.CTableProp(); properties.put_CellBorders(this.CellBorders); properties.put_CellSelect(true); this.api.tblApply(properties); @@ -490,7 +521,7 @@ define([ if (props ) { - this._originalProps = new CTableProp(props); + this._originalProps = new Asc.CTableProp(props); this._originalProps.put_CellSelect(true); this._TblWrapStyleChanged(props.get_TableWrap()); @@ -576,7 +607,7 @@ define([ if (background.get_Value()==0) { var color = background.get_Color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.CellColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -623,46 +654,46 @@ define([ }, _UpdateBordersStyle: function(border) { - this.CellBorders = new CBorders(); + this.CellBorders = new Asc.CBorders(); var updateBorders = this.CellBorders; var visible = (border != ''); if (border.indexOf('l') > -1 || !visible) { if (updateBorders.get_Left()===null || updateBorders.get_Left()===undefined) - updateBorders.put_Left(new CBorder()); + updateBorders.put_Left(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Left(), visible); } if (border.indexOf('t') > -1 || !visible) { if (updateBorders.get_Top()===null || updateBorders.get_Top()===undefined) - updateBorders.put_Top(new CBorder()); + updateBorders.put_Top(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Top(), visible); } if (border.indexOf('r') > -1 || !visible) { if (updateBorders.get_Right()===null || updateBorders.get_Right()===undefined) - updateBorders.put_Right(new CBorder()); + updateBorders.put_Right(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Right(), visible); } if (border.indexOf('b') > -1 || !visible) { if (updateBorders.get_Bottom()===null || updateBorders.get_Bottom()===undefined) - updateBorders.put_Bottom(new CBorder()); + updateBorders.put_Bottom(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Bottom(), visible); } if (border.indexOf('c') > -1 || !visible) { if (updateBorders.get_InsideV()===null || updateBorders.get_InsideV()===undefined) - updateBorders.put_InsideV(new CBorder()); + updateBorders.put_InsideV(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_InsideV(), visible); } if (border.indexOf('m') > -1 || !visible) { if (updateBorders.get_InsideH()===null || updateBorders.get_InsideH()===undefined) - updateBorders.put_InsideH(new CBorder()); + updateBorders.put_InsideH(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_InsideH(), visible); } }, _UpdateBorderStyle: function(border, visible) { if (null == border) - border = new CBorder(); + border = new Asc.asc_CTextBorder(); if (visible && this.BorderSize > 0){ var size = parseFloat(this.BorderSize); @@ -733,13 +764,14 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Table == elType) { + if (Asc.c_oAscTypeSelectElement.Table == elType) { (new DE.Views.TableSettingsAdvanced( { tableStylerRows: (elValue.get_CellBorders().get_InsideH()===null && elValue.get_CellSelect()==true) ? 1 : 2, tableStylerColumns: (elValue.get_CellBorders().get_InsideV()===null && elValue.get_CellSelect()==true) ? 1 : 2, tableProps: elValue, borderProps: me.borderAdvancedProps, + sectionProps: me.api.asc_GetSectionProps(), handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index f06a0d721..d50b3e16d 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableSettingsAdvanced.js * @@ -23,18 +55,19 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat options: { contentWidth: 340, height: 436, - toggleGroup: 'table-adv-settings-group' + toggleGroup: 'table-adv-settings-group', + storageName: 'de-table-settings-adv-category' }, initialize : function(options) { _.extend(this.options, { title: this.textTitle, items: [ - {panelId: 'id-adv-table-width', panelCaption: this.textWidthSpaces}, - {panelId: 'id-adv-table-wrap', panelCaption: this.textWrap}, + {panelId: 'id-adv-table-width', panelCaption: this.textTable}, + {panelId: 'id-adv-table-cell-props', panelCaption: this.textCellProps}, {panelId: 'id-adv-table-borders', panelCaption: this.textBordersBackgroung}, - {panelId: 'id-adv-table-position', panelCaption: this.textPosition}, - {panelId: 'id-adv-table-cell-props', panelCaption: this.textCellProps} + {panelId: 'id-adv-table-position', panelCaption: this.textTablePosition}, + {panelId: 'id-adv-table-wrap', panelCaption: this.textWrap} ], contentTemplate: _.template(contentTemplate)({ scope: this @@ -48,12 +81,12 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._cellBackground = null; this._state = { - HAlignType: c_oAscXAlign.Left, - HAlignFrom: c_oAscHAnchor.Margin, - HPositionFrom: c_oAscHAnchor.Margin, - VAlignType: c_oAscYAlign.Top, - VAlignFrom: c_oAscVAnchor.Margin, - VPositionFrom: c_oAscVAnchor.Margin, + HAlignType: Asc.c_oAscXAlign.Left, + HAlignFrom: Asc.c_oAscHAnchor.Margin, + HPositionFrom: Asc.c_oAscHAnchor.Margin, + VAlignType: Asc.c_oAscYAlign.Top, + VAlignFrom: Asc.c_oAscVAnchor.Margin, + VPositionFrom: Asc.c_oAscVAnchor.Margin, spnXChanged: false, spnYChanged: false, fromWrapInline: false, @@ -91,7 +124,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.tableStylerRows = this.options.tableStylerRows; this.tableStylerColumns = this.options.tableStylerColumns; this.borderProps = this.options.borderProps; - this._originalProps = new CTableProp(this.options.tableProps); + this.pageWidth = 210; + this._originalProps = new Asc.CTableProp(this.options.tableProps); }, render: function() { @@ -109,14 +143,15 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.chWidth = new Common.UI.CheckBox({ el: $('#tableadv-checkbox-width'), value: true, - labelText: this.textWidth + labelText: '' }); this.chWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ var value = (newValue=='checked'); this.nfWidth.setDisabled(!value); + this.cmbUnit.setDisabled(!value); if (this._changedProps) { if (value && this.nfWidth.getNumberValue()>0) - this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(this.nfWidth.getNumberValue())); + this._changedProps.put_Width(this.cmbUnit.getValue() ? -field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfWidth.getNumberValue())); else this._changedProps.put_Width(null); } @@ -125,7 +160,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.nfWidth = new Common.UI.MetricSpinner({ el: $('#tableadv-number-width'), step: .1, - width: 85, + width: 115, defaultUnit : "cm", value: '10 cm', maxValue: 55.88, @@ -133,14 +168,36 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat }); this.nfWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) - this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + this._changedProps.put_Width(this.cmbUnit.getValue() ? -field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + }, this)); + + var currmetric = Common.Utils.Metric.getCurrentMetric(); + this.cmbUnit = new Common.UI.ComboBox({ + el : $('#tableadv-cmb-unit'), + style : 'width: 115px;', + menuStyle : 'min-width: 115px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: (currmetric == Common.Utils.Metric.c_MetricUnits.pt) ? this.txtPt : ((currmetric == Common.Utils.Metric.c_MetricUnits.inch) ? this.txtInch : this.txtCm) }, + { value: 1, displayValue: this.txtPercent } + ] + }); + this.cmbUnit.on('selected', _.bind(function(combo, record) { + if (this._changedProps) { + var maxwidth = Common.Utils.Metric.fnRecalcFromMM(558); + this.nfWidth.setDefaultUnit(record.value ? '%' : Common.Utils.Metric.getCurrentMetricName()); + this.nfWidth.setMaxValue(record.value ? parseFloat((100 * maxwidth/this.pageWidth).toFixed(2)) : maxwidth); + this.nfWidth.setStep((record.value || Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt) ? 1 : 0.1); + this.nfWidth.setValue((record.value) ? 100*this.nfWidth.getNumberValue()/this.pageWidth : this.pageWidth*this.nfWidth.getNumberValue()/100); + this._changedProps.put_Width(record.value ? -this.nfWidth.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfWidth.getNumberValue())); + } }, this)); - this.spinners.push(this.nfWidth); this.chAllowSpacing = new Common.UI.CheckBox({ el: $('#tableadv-checkbox-spacing'), value: true, - labelText: this.textAllowSpacing + labelText: '' }); this.chAllowSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){ var value = (newValue=='checked'); @@ -160,7 +217,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.nfSpacing = new Common.UI.MetricSpinner({ el: $('#tableadv-number-spacing'), step: .1, - width: 85, + width: 115, defaultUnit : "cm", value: '0.5 cm', maxValue: 2.14, @@ -179,7 +236,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat }); this.chAutofit.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { - this._changedProps.put_TableLayout((field.getValue()=='checked') ? c_oAscTableLayout.AutoFit : c_oAscTableLayout. Fixed); + this._changedProps.put_TableLayout((field.getValue()=='checked') ? Asc.c_oAscTableLayout.AutoFit : Asc.c_oAscTableLayout. Fixed); } }, this)); @@ -197,7 +254,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Top'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Top((this.TableMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Top) : null); this.TableMargins.isChanged = true; } @@ -217,7 +274,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Bottom'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Bottom((this.TableMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Bottom) : null); this.TableMargins.isChanged = true; } @@ -237,7 +294,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Left'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Left((this.TableMargins.Left!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Left) : null); this.TableMargins.isChanged = true; } @@ -257,7 +314,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Right'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Right((this.TableMargins.Right!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Right) : null); this.TableMargins.isChanged = true; } @@ -287,7 +344,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.CellMargins.Flag = field.getValue(); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Left( ( this.CellMargins.Left!== null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Left) : null); this._changedProps.get_CellMargins().put_Top((this.CellMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Top) : null); this._changedProps.get_CellMargins().put_Bottom((this.CellMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Bottom) : null); @@ -309,7 +366,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Top'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Top((this.CellMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Top) : null); setCellFlag(); } @@ -329,7 +386,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Bottom'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Bottom((this.CellMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Bottom) : null); setCellFlag(); } @@ -349,7 +406,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Left'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Left((this.CellMargins.Left!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Left) : null); setCellFlag(); } @@ -369,13 +426,81 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Right'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Right((this.CellMargins.Right!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Right) : null); setCellFlag(); } }, this)); this.spinners.push(this.spnMarginRight); + // Cell Size + this.chPrefWidth = new Common.UI.CheckBox({ + el: $('#tableadv-checkbox-prefwidth'), + value: false, + labelText: '' + }); + this.chPrefWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + var value = (newValue=='checked'); + this.nfPrefWidth.setDisabled(!value); + this.cmbPrefWidthUnit.setDisabled(!value); + if (this._changedProps) { + if (value && this.nfPrefWidth.getNumberValue()>0) + this._changedProps.put_CellsWidth(this.cmbPrefWidthUnit.getValue() ? -field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfPrefWidth.getNumberValue())); + else + this._changedProps.put_CellsWidth(null); + } + }, this)); + + this.nfPrefWidth = new Common.UI.MetricSpinner({ + el: $('#tableadv-number-prefwidth'), + step: .1, + width: 115, + defaultUnit : "cm", + value: '10 cm', + maxValue: 55.88, + minValue: 0 + }); + this.nfPrefWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) + this._changedProps.put_CellsWidth(this.cmbPrefWidthUnit.getValue() ? -field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + }, this)); + + this.cmbPrefWidthUnit = new Common.UI.ComboBox({ + el : $('#tableadv-combo-prefwidth-unit'), + style : 'width: 115px;', + menuStyle : 'min-width: 115px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: (currmetric == Common.Utils.Metric.c_MetricUnits.pt) ? this.txtPt : ((currmetric == Common.Utils.Metric.c_MetricUnits.inch) ? this.txtInch : this.txtCm) }, + { value: 1, displayValue: this.txtPercent } + ] + }); + this.cmbPrefWidthUnit.on('selected', _.bind(function(combo, record) { + if (this._changedProps) { + var defUnit = (record.value) ? '%' : Common.Utils.Metric.getCurrentMetricName(); + if (this.nfPrefWidth.getUnitValue() !== defUnit) { + var maxwidth = Common.Utils.Metric.fnRecalcFromMM(558); + this.nfPrefWidth.setDefaultUnit(defUnit); + this.nfPrefWidth.setMaxValue(record.value ? parseFloat((100 * maxwidth/this.pageWidth).toFixed(2)) : maxwidth); + this.nfPrefWidth.setStep((record.value || Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt) ? 1 : 0.1); + this.nfPrefWidth.setValue((record.value) ? 100*this.nfPrefWidth.getNumberValue()/this.pageWidth : this.pageWidth*this.nfPrefWidth.getNumberValue()/100); + this._changedProps.put_CellsWidth(record.value ? -this.nfPrefWidth.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfPrefWidth.getNumberValue())); + } + } + }, this)); + + this.chWrapText = new Common.UI.CheckBox({ + el: $('#tableadv-checkbox-wrap'), + value: false, + labelText: this.textWrapText + }); + this.chWrapText.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + this._changedProps.put_CellsNoWrap((field.getValue()!='checked')); + } + }, this)); + // Wrapping this.btnWrapNone = new Common.UI.Button({ @@ -488,7 +613,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnDistanceTop.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_TablePaddings()===undefined) - this._changedProps.put_TablePaddings(new CPaddings()); + this._changedProps.put_TablePaddings(new Asc.asc_CPaddings()); this._changedProps.get_TablePaddings().put_Top(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -506,7 +631,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnDistanceBottom.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_TablePaddings()===undefined) - this._changedProps.put_TablePaddings(new CPaddings()); + this._changedProps.put_TablePaddings(new Asc.asc_CPaddings()); this._changedProps.get_TablePaddings().put_Bottom(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -524,7 +649,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnDistanceLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_TablePaddings()===undefined) - this._changedProps.put_TablePaddings(new CPaddings()); + this._changedProps.put_TablePaddings(new Asc.asc_CPaddings()); this._changedProps.get_TablePaddings().put_Left(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -542,7 +667,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnDistanceRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_TablePaddings()===undefined) - this._changedProps.put_TablePaddings(new CPaddings()); + this._changedProps.put_TablePaddings(new Asc.asc_CPaddings()); this._changedProps.get_TablePaddings().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -564,7 +689,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_RelativeFrom(this._state.HPositionFrom); @@ -588,7 +713,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnY.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_RelativeFrom(this._state.VPositionFrom); @@ -600,9 +725,9 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat // Horizontal this._arrHAlign = [ - {displayValue: this.textLeft, value: c_oAscXAlign.Left}, - {displayValue: this.textCenter, value: c_oAscXAlign.Center}, - {displayValue: this.textRight, value: c_oAscXAlign.Right} + {displayValue: this.textLeft, value: Asc.c_oAscXAlign.Left}, + {displayValue: this.textCenter, value: Asc.c_oAscXAlign.Center}, + {displayValue: this.textRight, value: Asc.c_oAscXAlign.Right} ]; this.cmbHAlign = new Common.UI.ComboBox({ @@ -616,9 +741,9 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.cmbHAlign.on('selected', _.bind(this.onHAlignSelect, this)); this._arrHRelative = [ - {displayValue: this.textMargin, value: c_oAscHAnchor.Margin}, - {displayValue: this.textPage, value: c_oAscHAnchor.Page}, - {displayValue: this.textAnchorText, value: c_oAscHAnchor.Text} + {displayValue: this.textMargin, value: Asc.c_oAscHAnchor.Margin}, + {displayValue: this.textPage, value: Asc.c_oAscHAnchor.Page}, + {displayValue: this.textAnchorText, value: Asc.c_oAscHAnchor.Text} ]; this.cmbHRelative = new Common.UI.ComboBox({ @@ -644,9 +769,9 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat // Vertical this._arrVAlign = [ - {displayValue: this.textTop, value: c_oAscYAlign.Top}, - {displayValue: this.textCenter, value: c_oAscYAlign.Center}, - {displayValue: this.textBottom, value: c_oAscYAlign.Bottom} + {displayValue: this.textTop, value: Asc.c_oAscYAlign.Top}, + {displayValue: this.textCenter, value: Asc.c_oAscYAlign.Center}, + {displayValue: this.textBottom, value: Asc.c_oAscYAlign.Bottom} ]; this.cmbVAlign = new Common.UI.ComboBox({ @@ -660,9 +785,9 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.cmbVAlign.on('selected', _.bind(this.onVAlignSelect, this)); this._arrVRelative = [ - {displayValue: this.textMargin, value: c_oAscVAnchor.Margin}, - {displayValue: this.textPage, value: c_oAscVAnchor.Page}, - {displayValue: this.textAnchorText, value: c_oAscVAnchor.Text} + {displayValue: this.textMargin, value: Asc.c_oAscVAnchor.Margin}, + {displayValue: this.textPage, value: Asc.c_oAscVAnchor.Page}, + {displayValue: this.textAnchorText, value: Asc.c_oAscVAnchor.Text} ]; this.cmbVRelative = new Common.UI.ComboBox({ @@ -747,7 +872,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat el: $('#tableadv-combo-border-size'), style: "width: 93px;" }); - var rec = this.cmbBorderSize.store.at(2); + var rec = this.cmbBorderSize.store.at(1); this.BorderSize = {ptValue: rec.get('value'), pxValue: rec.get('pxValue')}; this.cmbBorderSize.setValue(this.BorderSize.ptValue); this.cmbBorderSize.on('selected', _.bind(this.onBorderSizeSelect, this)); @@ -943,7 +1068,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.CellBackContainer = $('#tableadv-panel-cell-back'); this.TableBackContainer = $('#tableadv-panel-table-back'); - this.btnsCategory[4].on('click', _.bind(this.onCellCategoryClick, this)); + this.btnsCategory[1].on('click', _.bind(this.onCellCategoryClick, this)); this.afterRender(); }, @@ -971,7 +1096,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat for (var j=0; j0 ? Common.Utils.Metric.fnRecalcFromMM(TableWidth) : -TableWidth , true); + this.chWidth.setValue(TableWidth !== null, true); - this.nfWidth.setDisabled(this.chWidth.getValue()!=='checked'); + value = (this.chWidth.getValue()!=='checked'); + this.nfWidth.setDisabled(value); + this.cmbUnit.setDisabled(value); var TableSpacing = props.get_Spacing(); if (TableSpacing !== null) { @@ -1063,7 +1204,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat var autoFit = props.get_TableLayout(); this.chAutofit.setDisabled(autoFit===undefined); - this.chAutofit.setValue(autoFit===c_oAscTableLayout.AutoFit, true); + this.chAutofit.setValue(autoFit===Asc.c_oAscTableLayout.AutoFit, true); // margins var margins = props.get_DefaultMargins(); @@ -1100,6 +1241,26 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.fillMargins(this.CellMargins.Flag); + // Cell Size + var cellWidth = props.get_CellsWidth(); + + this.cmbPrefWidthUnit.store.at(0).set('displayValue', (currmetric == Common.Utils.Metric.c_MetricUnits.pt) ? this.txtPt : ((currmetric == Common.Utils.Metric.c_MetricUnits.inch) ? this.txtInch : this.txtCm)); + this.cmbPrefWidthUnit.setValue(cellWidth<0 ? 1 : 0); + this.nfPrefWidth.setDefaultUnit(cellWidth<0 ? '%' : Common.Utils.Metric.getCurrentMetricName()); + if (cellWidth<0) //% + this.nfPrefWidth.setMaxValue(parseFloat((100 * Common.Utils.Metric.fnRecalcFromMM(558)/this.pageWidth).toFixed(2))); + this.nfPrefWidth.setStep((cellWidth<0 || Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt) ? 1 : 0.1); + if (cellWidth !== null) + this.nfPrefWidth.setValue(cellWidth>0 ? Common.Utils.Metric.fnRecalcFromMM(cellWidth) : -cellWidth , true); + + this.chPrefWidth.setValue(cellWidth !== null, true); + value = (this.chPrefWidth.getValue()!=='checked'); + this.nfPrefWidth.setDisabled(value); + this.cmbPrefWidthUnit.setDisabled(value); + + var wrapText = !props.get_CellsNoWrap(); + this.chWrapText.setValue(wrapText, true); + // wrapping props this._TblWrapStyleChanged(props.get_TableWrap()); this.ShowHideWrap(props.get_TableWrap()===c_tableWrap.TABLE_WRAP_NONE); @@ -1168,7 +1329,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat break; } } - if (value==c_oAscVAnchor.Text) + if (value==Asc.c_oAscVAnchor.Text) this.chMove.setValue(true, true); if (Position.get_UseAlign()) { @@ -1197,9 +1358,9 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._state.horizontalPropChanged = false; // borders - this.TableBorders = new CBorders(props.get_TableBorders()); + this.TableBorders = new Asc.CBorders(props.get_TableBorders()); - this.CellBorders = new CBorders(props.get_CellBorders()); + this.CellBorders = new Asc.CBorders(props.get_CellBorders()); this._UpdateBordersNoSpacing_(); this._UpdateBordersSpacing_(); @@ -1214,7 +1375,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat if (background && background.get_Value()==0) { var color = background.get_Color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.TableColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.TableColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1229,7 +1390,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat if (background.get_Value()==0) { var color = background.get_Color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.CellColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1272,7 +1433,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.ShowHideSpacing(this.chAllowSpacing.getValue()==='checked'); } - this._changedProps = new CTableProp(); + this._changedProps = new Asc.CTableProp(); this._cellBackground = null; this.ChangedTableBorders = undefined; this.ChangedCellBorders = undefined; @@ -1315,12 +1476,12 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.ShowHideWrap(true); if (this._changedProps && btn.pressed) { if (this._state.alignChanged) { - if (this._state.HAlignType===c_oAscXAlign.Left) - this.btnAlignLeft.toggle(true, true); - else if (this._state.HAlignType==c_oAscXAlign.Center) - this.btnAlignCenter.toggle(true, true); - else if (this._state.HAlignType==c_oAscXAlign.Right) - this.btnAlignRight.toggle(true, true); + if (this._state.HAlignType===Asc.c_oAscXAlign.Left) + this.btnAlignLeft.toggle(true); + else if (this._state.HAlignType==Asc.c_oAscXAlign.Center) + this.btnAlignCenter.toggle(true); + else if (this._state.HAlignType==Asc.c_oAscXAlign.Right) + this.btnAlignRight.toggle(true); this._state.alignChanged = false; } @@ -1343,13 +1504,13 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.radioVPosition.setValue(true); } if (this._state.alignChanged) { - if (this.btnAlignLeft.pressed) this._state.HAlignType = c_oAscXAlign.Left; - else if (this.btnAlignCenter.pressed) this._state.HAlignType = c_oAscXAlign.Center; - else this._state.HAlignType = c_oAscXAlign.Right; + if (this.btnAlignLeft.pressed) this._state.HAlignType = Asc.c_oAscXAlign.Left; + else if (this.btnAlignCenter.pressed) this._state.HAlignType = Asc.c_oAscXAlign.Center; + else this._state.HAlignType = Asc.c_oAscXAlign.Right; this.cmbHAlign.setValue(this._state.HAlignType); this.radioHAlign.setValue(true); if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._changedProps.get_PositionH().put_UseAlign(true); this._changedProps.get_PositionH().put_Align(this._state.HAlignType); @@ -1365,7 +1526,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onHAlignSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._state.HAlignType = record.value; this._changedProps.get_PositionH().put_UseAlign(true); @@ -1378,7 +1539,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onHRelativeSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._state.HAlignFrom = record.value; this._changedProps.get_PositionH().put_UseAlign(true); @@ -1390,7 +1551,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onHPositionSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._state.HPositionFrom = record.value; this._changedProps.get_PositionH().put_UseAlign(false); @@ -1406,7 +1567,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onVAlignSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._state.VAlignType = record.value; this._changedProps.get_PositionV().put_UseAlign(true); @@ -1418,21 +1579,21 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onVRelativeSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._state.VAlignFrom = record.value; this._changedProps.get_PositionV().put_UseAlign(true); this._changedProps.get_PositionV().put_RelativeFrom(this._state.VAlignFrom); this._changedProps.get_PositionV().put_Align(this._state.VAlignType); - this.chMove.setValue(this._state.VAlignFrom==c_oAscVAnchor.Text, true); + this.chMove.setValue(this._state.VAlignFrom==Asc.c_oAscVAnchor.Text, true); } }, onVPositionSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._state.VPositionFrom = record.value; this._changedProps.get_PositionV().put_UseAlign(false); @@ -1442,14 +1603,14 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnY.setValue(Common.Utils.Metric.fnRecalcFromMM(val), true); } this._changedProps.get_PositionV().put_Value(Common.Utils.Metric.fnRecalcToMM(this.spnY.getNumberValue())); - this.chMove.setValue(this._state.VPositionFrom==c_oAscVAnchor.Text, true); + this.chMove.setValue(this._state.VPositionFrom==Asc.c_oAscVAnchor.Text, true); } }, onRadioHAlignChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._changedProps.get_PositionH().put_UseAlign(newValue); if (newValue) { @@ -1470,7 +1631,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onRadioHPositionChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._changedProps.get_PositionH().put_UseAlign(!newValue); if (newValue) { @@ -1494,7 +1655,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat onRadioVAlignChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._changedProps.get_PositionV().put_UseAlign(newValue); if (newValue) { @@ -1508,14 +1669,14 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.cmbVRelative.setDisabled(false); this.spnY.setDisabled(true); this.cmbVPosition.setDisabled(true); - this.chMove.setValue(this._state.VAlignFrom==c_oAscVAnchor.Text, true); + this.chMove.setValue(this._state.VAlignFrom==Asc.c_oAscVAnchor.Text, true); } }, onRadioVPositionChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._changedProps.get_PositionV().put_UseAlign(!newValue); if (newValue) { @@ -1532,7 +1693,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.cmbVRelative.setDisabled(true); this.spnY.setDisabled(false); this.cmbVPosition.setDisabled(false); - this.chMove.setValue(this._state.VPositionFrom==c_oAscVAnchor.Text, true); + this.chMove.setValue(this._state.VPositionFrom==Asc.c_oAscVAnchor.Text, true); } }, @@ -1558,11 +1719,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.CellColor = {Value: 1, Color: color}; if (this._cellBackground === null) - this._cellBackground = new CBackground(); + this._cellBackground = new Asc.CBackground(); if (this.CellColor.Color=='transparent') { this._cellBackground.put_Value(1); - this._cellBackground.put_Color(new CAscColor(0,0,0)); + this._cellBackground.put_Color(new Asc.asc_CColor(0,0,0)); } else { this._cellBackground.put_Value(0); this._cellBackground.put_Color(Common.Utils.ThemeColor.getRgbColor(this.CellColor.Color)); @@ -1576,12 +1737,12 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat if (this._changedProps) { var background = this._changedProps.get_TableBackground(); if (background===undefined) { - background = new CBackground(); + background = new Asc.CBackground(); this._changedProps.put_TableBackground(background); } if (this.TableColor.Color=='transparent') { background.put_Value(1); - background.put_Color(new CAscColor(0, 0,0)); + background.put_Color(new Asc.asc_CColor(0, 0,0)); } else { background.put_Value(0); background.put_Color(Common.Utils.ThemeColor.getRgbColor(this.TableColor.Color)); @@ -1618,7 +1779,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this._UpdateCellBorderSpacing_(source.get_Bottom(), 'b', this.tableBordersImageSpacing.getCell(i, this.tableBordersImageSpacing.rows-1)); } if (this._allTable && source.get_InsideV() === null) { - source.put_InsideV(new CBorder()); + source.put_InsideV(new Asc.asc_CTextBorder()); } if (source.get_InsideV() !== null) { for (i=0; i -1 ) { this._UpdateBorderStyle(updateBorders.get_Left(), (size>0)); if (changed_destination) { - changed_destination.put_Left(new CBorder(updateBorders.get_Left())); + changed_destination.put_Left(new Asc.asc_CTextBorder(updateBorders.get_Left())); } } if ( ct.col== this.tableStylerColumns-1 && border.indexOf('r') > -1 ) { this._UpdateBorderStyle(updateBorders.get_Right(), (size>0)); if (changed_destination) { - changed_destination.put_Right(new CBorder(updateBorders.get_Right())); + changed_destination.put_Right(new Asc.asc_CTextBorder(updateBorders.get_Right())); } } if ( ct.row==0 && border.indexOf('t') > -1 ) { this._UpdateBorderStyle(updateBorders.get_Top(), (size>0)); if (changed_destination) { - changed_destination.put_Top(new CBorder(updateBorders.get_Top())); + changed_destination.put_Top(new Asc.asc_CTextBorder(updateBorders.get_Top())); } } if ( ct.row== this.tableStylerRows-1 && border.indexOf('b') > -1 ) { this._UpdateBorderStyle(updateBorders.get_Bottom(), (size>0)); if (changed_destination) { - changed_destination.put_Bottom(new CBorder(updateBorders.get_Bottom())); + changed_destination.put_Bottom(new Asc.asc_CTextBorder(updateBorders.get_Bottom())); } } if ( ct.col==0 && border.indexOf('r') > -1 || ct.col== this.tableStylerColumns-1 && border.indexOf('l') > -1) { this._UpdateBorderStyle(updateBorders.get_InsideV(), (size>0)); if (changed_destination) { - changed_destination.put_InsideV(new CBorder(updateBorders.get_InsideV())); + changed_destination.put_InsideV(new Asc.asc_CTextBorder(updateBorders.get_InsideV())); } } if ( ct.row==0 && border.indexOf('b') > -1 || ct.row== this.tableStylerRows-1 && border.indexOf('t') > -1) { this._UpdateBorderStyle(updateBorders.get_InsideH(), (size>0)); if (changed_destination) { - changed_destination.put_InsideH(new CBorder(updateBorders.get_InsideH())); + changed_destination.put_InsideH(new Asc.asc_CTextBorder(updateBorders.get_InsideH())); } } }, @@ -1862,25 +2023,25 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat if (border.indexOf('l') > -1) { this._UpdateBorderStyle(updateBorders.get_Left(), (size>0)); if (changed_destination) { - changed_destination.put_Left(new CBorder(updateBorders.get_Left())); + changed_destination.put_Left(new Asc.asc_CTextBorder(updateBorders.get_Left())); } } if (border.indexOf('t') > -1) { this._UpdateBorderStyle(updateBorders.get_Top(), (size>0)); if (changed_destination) { - changed_destination.put_Top(new CBorder(updateBorders.get_Top())); + changed_destination.put_Top(new Asc.asc_CTextBorder(updateBorders.get_Top())); } } if (border.indexOf('r') > -1) { this._UpdateBorderStyle(updateBorders.get_Right(), (size>0)); if (changed_destination) { - changed_destination.put_Right(new CBorder(updateBorders.get_Right())); + changed_destination.put_Right(new Asc.asc_CTextBorder(updateBorders.get_Right())); } } if (border.indexOf('b') > -1) { this._UpdateBorderStyle(updateBorders.get_Bottom(), (size>0)); if (changed_destination) { - changed_destination.put_Bottom(new CBorder(updateBorders.get_Bottom())); + changed_destination.put_Bottom(new Asc.asc_CTextBorder(updateBorders.get_Bottom())); } } }, @@ -1896,7 +2057,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat border.put_Color(color); } else { - border.put_Color(new CAscColor()); + border.put_Color(new Asc.asc_CColor()); border.put_Value(0); } return border.get_Value(); @@ -1920,8 +2081,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat if (this.spinners) { for (var i=0; i1584) { + var value = parseFloat(record.value), + expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); + if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; Common.UI.error({ msg: this.textBorderSizeErr, @@ -722,12 +757,12 @@ define([ this.btnBorderColor.setColor(color); this.BorderColor = {Value: 1, Color: color}; if (this.api && this.BorderSize>0 && !this._noApply) { - var props = new asc_TextArtProperties(); - var stroke = new CAscStroke(); + var props = new Asc.asc_TextArtProperties(); + var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.put_type( c_oAscStrokeType.STROKE_NONE); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { - stroke.put_type( c_oAscStrokeType.STROKE_COLOR); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_color(Common.Utils.ThemeColor.getRgbColor(this.BorderColor.Color)); stroke.put_width(this._pt2mm(this.BorderSize)); } @@ -740,8 +775,8 @@ define([ ChangeSettings: function(props) { if (this.imgprops==null) { - this.imgprops = new CImgProperty(); - this.imgprops.put_ShapeProperties(new CAscShapeProp()); + this.imgprops = new Asc.asc_CImgProperty(); + this.imgprops.put_ShapeProperties(new Asc.asc_CShapeProperty()); this.shapeprops = this.imgprops.get_ShapeProperties(); } else this.imgprops.put_ImageUrl(null); @@ -779,13 +814,13 @@ define([ if (fill===null || fill===undefined || fill_type===null) { // заливка не совпадает у неск. фигур this.OriginalFillType = null; - } else if (fill_type==c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет - this.OriginalFillType = c_oAscFill.FILL_TYPE_NOFILL; - } else if (fill_type==c_oAscFill.FILL_TYPE_SOLID) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) { fill = fill.get_fill(); color = fill.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.ShapeColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -793,16 +828,16 @@ define([ } else this.ShapeColor = {Value: 0, Color: 'transparent'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.GradColor.colors[0] = (this.ShapeColor.Color!=='transparent') ? Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color) : '000000'; this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_GRAD) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_GRAD) { fill = fill.get_fill(); var gradfilltype = fill.get_grad_type(); // null - не совпадают у нескольких фигур if (this._state.GradFillType !== gradfilltype || this.GradFillType !== gradfilltype) { this.GradFillType = gradfilltype; rec = undefined; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.cmbGradType.setValue(this.GradFillType); rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); this.onGradTypeSelect(this.cmbGradType, rec.attributes); @@ -813,7 +848,7 @@ define([ this._state.GradFillType = this.GradFillType; } - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR ) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR ) { var value = Math.floor(fill.get_linear_angle()/60000); if (Math.abs(this.GradLinearDirectionType-value)>0.001) { this.GradLinearDirectionType=value; @@ -830,7 +865,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -841,7 +876,7 @@ define([ color = colors[1]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -869,7 +904,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; } @@ -908,10 +943,10 @@ define([ strokeType = (stroke) ? stroke.get_type() : null; if (stroke) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { color = stroke.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BorderColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else @@ -950,10 +985,10 @@ define([ this._state.StrokeColor = this.BorderColor.Color; } - if (this._state.StrokeType !== strokeType || strokeType == c_oAscStrokeType.STROKE_COLOR) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !(/pt\s*$/.test(this.cmbBorderSize.getRawValue())); + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; @@ -967,11 +1002,11 @@ define([ if (_selectedItem) this.cmbBorderSize.selectRecord(_selectedItem); else { - this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' pt' : ''); + this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' ' + this.txtPt : ''); } this.BorderSize = w; } - } else if (strokeType == c_oAscStrokeType.STROKE_NONE) { + } else if (strokeType == Asc.c_oAscStrokeType.STROKE_NONE) { this._state.StrokeWidth = 0; this.BorderSize = this.cmbBorderSize.store.at(0).get('value'); this.cmbBorderSize.setValue(this.BorderSize); @@ -1025,7 +1060,7 @@ define([ createDelayedElements: function() { this.UpdateThemeColors(); - this.fillTransform(this.api.get_PropertyEditorTextArts()); + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); }, fillTextArt: function() { @@ -1046,7 +1081,7 @@ define([ onTextArtSelect: function(combo, record){ if (this.api && !this._noApply) { - var props = new asc_TextArtProperties(); + var props = new Asc.asc_TextArtProperties(); props.asc_putStyle(record.get('data')); this.shapeprops.put_TextArtProperties(props); this.api.ImgApply(this.imgprops); @@ -1079,7 +1114,7 @@ define([ onTransformSelect: function(combo, record){ if (this.api && !this._noApply) { - var props = new asc_TextArtProperties(); + var props = new Asc.asc_TextArtProperties(); props.asc_putForm(record.get('type')); this.shapeprops.put_TextArtProperties(props); this.api.ImgApply(this.imgprops); @@ -1102,9 +1137,9 @@ define([ }, ShowHideElem: function(value) { - this.FillColorContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_SOLID); - this.FillGradientContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_GRAD); - this.TransparencyContainer.toggleClass('settings-hidden', (value === c_oAscFill.FILL_TYPE_NOFILL || value === null)); + this.FillColorContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_SOLID); + this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD); + this.TransparencyContainer.toggleClass('settings-hidden', (value === Asc.c_oAscFill.FILL_TYPE_NOFILL || value === null)); }, setLocked: function (locked) { diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index ab0310ed5..b72277cd4 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Toolbar.js * @@ -537,10 +569,10 @@ define([ menu: new Common.UI.Menu({ menuAlign: 'tl-tr', items : [ - {caption: this.textNextPage, value: c_oAscSectionBreakType.NextPage}, - {caption: this.textContPage, value: c_oAscSectionBreakType.Continuous}, - {caption: this.textEvenPage, value: c_oAscSectionBreakType.EvenPage}, - {caption: this.textOddPage, value: c_oAscSectionBreakType.OddPage} + {caption: this.textNextPage, value: Asc.c_oAscSectionBreakType.NextPage}, + {caption: this.textContPage, value: Asc.c_oAscSectionBreakType.Continuous}, + {caption: this.textEvenPage, value: Asc.c_oAscSectionBreakType.EvenPage}, + {caption: this.textOddPage, value: Asc.c_oAscSectionBreakType.OddPage} ] }) }) @@ -614,9 +646,9 @@ define([ menu : new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ - { caption: this.textNone, iconCls: 'mnu-dropcap-none', checkable: true, toggleGroup: 'menuDropCap', value: c_oAscDropCap.None, checked: true }, - { caption: this.textInText, iconCls: 'mnu-dropcap-intext', checkable: true, toggleGroup: 'menuDropCap', value: c_oAscDropCap.Drop }, - { caption: this.textInMargin, iconCls: 'mnu-dropcap-inmargin', checkable: true, toggleGroup: 'menuDropCap', value: c_oAscDropCap.Margin }, + { caption: this.textNone, iconCls: 'mnu-dropcap-none', checkable: true, toggleGroup: 'menuDropCap', value: Asc.c_oAscDropCap.None, checked: true }, + { caption: this.textInText, iconCls: 'mnu-dropcap-intext', checkable: true, toggleGroup: 'menuDropCap', value: Asc.c_oAscDropCap.Drop }, + { caption: this.textInMargin, iconCls: 'mnu-dropcap-inmargin', checkable: true, toggleGroup: 'menuDropCap', value: Asc.c_oAscDropCap.Margin }, { caption: '--' }, this.mnuDropCapAdvanced = new Common.UI.MenuItem({ caption: this.mniEditDropCap }) ] @@ -654,10 +686,10 @@ define([ var pageMarginsTemplate = _.template('
<%= caption %>
' + '<% if (options.value !== null) { %>
' + - '' + - '
' + - ''+ - '
'+ + '' + + '
'+ '<% } %>'); this.btnPageMargins = new Common.UI.Button({ @@ -669,6 +701,7 @@ define([ items: [ { caption: this.textMarginsLast, checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins'}, //top,left,bottom,right { caption: this.textMarginsNormal, checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins', value: [20, 30, 20, 15] }, + { caption: this.textMarginsUsNormal, checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins', value: [25.4, 25.4, 25.4, 25.4] }, { caption: this.textMarginsNarrow, checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins', value: [12.7, 12.7, 12.7, 12.7] }, { caption: this.textMarginsModerate,checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins', value: [25.4, 19.1, 25.4, 19.1] }, { caption: this.textMarginsWide, checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins', value: [25.4, 50.8, 25.4, 50.8] }, @@ -679,7 +712,10 @@ define([ }); this.toolbarControls.push(this.btnPageMargins); - var pageSizeTemplate = _.template('
<%= caption %>
<%= options.subtitle %>
'); + var pageSizeTemplate = _.template('
<%= caption %>
' + + '
<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[0]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %> x '+ + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %>
'); + this.btnPageSize = new Common.UI.Button({ id : 'id-toolbar-btn-pagesize', cls : 'btn-toolbar', @@ -1002,7 +1038,6 @@ define([ parentMenu: btn.menu, showLast: false, restoreHeight: 411, - allowScrollbar: false, groups: new Common.UI.DataViewGroupStore([ { id: 'menu-chart-group-bar', caption: me.textColumn }, { id: 'menu-chart-group-line', caption: me.textLine }, @@ -1013,31 +1048,31 @@ define([ { id: 'menu-chart-group-stock', caption: me.textStock } ]), store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked, allowSelected: true, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer, allowSelected: true, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3d, allowSelected: true, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked3d, allowSelected: true, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer3d, allowSelected: true, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3dPerspective, allowSelected: true, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineNormal, allowSelected: true, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStacked, allowSelected: true, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStackedPer, allowSelected: true, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.line3d, allowSelected: true, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie, allowSelected: true, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.doughnut, allowSelected: true, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie3d, allowSelected: true, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal, allowSelected: true, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked, allowSelected: true, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer, allowSelected: true, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal3d, allowSelected: true, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked3d, allowSelected: true, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer3d, allowSelected: true, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaNormal, allowSelected: true, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStacked, allowSelected: true, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'} + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, allowSelected: true, iconCls: 'column-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, allowSelected: true, iconCls: 'column-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, allowSelected: true, iconCls: 'column-3d-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, allowSelected: true, iconCls: 'column-3d-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, allowSelected: true, iconCls: 'column-3d-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, allowSelected: true, iconCls: 'column-3d-normal-per'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, allowSelected: true, iconCls: 'line-normal'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, allowSelected: true, iconCls: 'line-stack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, allowSelected: true, iconCls: 'line-pstack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, allowSelected: true, iconCls: 'line-3d'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, allowSelected: true, iconCls: 'pie-normal'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, allowSelected: true, iconCls: 'pie-doughnut'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, allowSelected: true, iconCls: 'pie-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, allowSelected: true, iconCls: 'bar-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, allowSelected: true, iconCls: 'bar-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, allowSelected: true, iconCls: 'bar-pstack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, allowSelected: true, iconCls: 'bar-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, allowSelected: true, iconCls: 'bar-3d-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, allowSelected: true, iconCls: 'bar-3d-pstack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, allowSelected: true, iconCls: 'area-normal'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, allowSelected: true, iconCls: 'area-stack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'}, + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'} ]), itemTemplate: _.template('
') }) @@ -1342,6 +1377,29 @@ define([ this.mnuNonPrinting.items[0].setChecked(this.api.get_ShowParaMarks(), true); this.mnuNonPrinting.items[1].setChecked(this.api.get_ShowTableEmptyLine(), true); this.btnShowHidenChars.toggle(this.mnuNonPrinting.items[0].checked, true); + + this.updateMetricUnit(); + } + }, + + updateMetricUnit: function() { + var items = this.btnPageMargins.menu.items; + for (var i=0; i/g, '>'); + }; + + var lang = (getUrlParams()["lang"] || 'en').split("-")[0]; + + if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; + else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; + else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; + else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; + else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; + + window.alert(reqerr); + window.location.reload(); + } +}); \ No newline at end of file diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 1c1462757..1f4f6534d 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -233,7 +233,16 @@ + + + + + - + \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 375a5a42b..466ce7943 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1,4 +1,6 @@ { + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more", @@ -231,8 +233,10 @@ "DE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.", "DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", "DE.Controllers.Main.textAnonymous": "Anonymous", + "DE.Controllers.Main.textBuyNow": "Buy now", "DE.Controllers.Main.textCloseTip": "\nClick to close the tip", "DE.Controllers.Main.textLoadingDocument": "Loading document", + "DE.Controllers.Main.textNoLicenseTitle": "License expired or not found", "DE.Controllers.Main.textStrict": "Strict mode", "DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.
Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.", "DE.Controllers.Main.titleUpdateVersion": "Version changed", @@ -262,10 +266,9 @@ "DE.Controllers.Main.uploadImageTitleText": "Uploading Image", "DE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher", "DE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", + "DE.Controllers.Main.warnNoLicense": "The license could not be found or expired. You cannot edit files.
Click 'Buy now' to purchase Enterprise Edition license or 'Contact us' if you use Integration Edition.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "DE.Controllers.Main.textBuyNow": "Buy now", - "DE.Controllers.Main.textNoLicenseTitle": "License expired", - "DE.Controllers.Main.warnNoLicense": "The license expired. You cannot create or edit files.
Click the \'Buy now\' button to prolong the license.", + "DE.Controllers.Main.textContactUs": "Contact us", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", "DE.Controllers.Statusbar.zoomText": "Zoom {0}%", @@ -881,8 +884,8 @@ "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights", "DE.Views.FileMenuPanels.Settings.okButtonText": "Apply", "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Turn on alignment guides", - "DE.Views.FileMenuPanels.Settings.strAutosave": "Turn on autosave", "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover", + "DE.Views.FileMenuPanels.Settings.strAutosave": "Turn on autosave", "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing Mode", "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once", "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", @@ -900,8 +903,8 @@ "DE.Views.FileMenuPanels.Settings.text5Minutes": "Every 5 Minutes", "DE.Views.FileMenuPanels.Settings.text60Minutes": "Every Hour", "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Alignment Guides", - "DE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave", "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover", + "DE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave", "DE.Views.FileMenuPanels.Settings.textDisabled": "Disabled", "DE.Views.FileMenuPanels.Settings.textMinute": "Every Minute", "DE.Views.FileMenuPanels.Settings.txtAll": "View All", @@ -915,6 +918,7 @@ "DE.Views.FileMenuPanels.Settings.txtPt": "Point", "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", + "DE.Views.FileMenuPanels.Settings.txtInch": "Inch", "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom Center", "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom Left", "DE.Views.HeaderFooterSettings.textBottomRight": "Bottom Right", @@ -991,6 +995,7 @@ "DE.Views.ImageSettingsAdvanced.textPage": "Page", "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph", "DE.Views.ImageSettingsAdvanced.textPosition": "Position", + "DE.Views.ImageSettingsAdvanced.textPositionPc": "Relative position", "DE.Views.ImageSettingsAdvanced.textRelative": "relative to", "DE.Views.ImageSettingsAdvanced.textRight": "Right", "DE.Views.ImageSettingsAdvanced.textRightMargin": "Right Margin", @@ -1014,6 +1019,9 @@ "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Through", "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Tight", "DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Top and Bottom", + "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Lock aspect ratio", + "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute", + "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relative", "DE.Views.LeftMenu.tipAbout": "About", "DE.Views.LeftMenu.tipChat": "Chat", "DE.Views.LeftMenu.tipComments": "Comments", @@ -1089,7 +1097,7 @@ "DE.Views.PageSizeDialog.textTitle": "Page Size", "DE.Views.PageSizeDialog.textWidth": "Width", "DE.Views.ParagraphSettings.strLineHeight": "Line Spacing", - "DE.Views.ParagraphSettings.strParagraphSpacing": "Spacing", + "DE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style", "DE.Views.ParagraphSettings.strSpacingAfter": "After", "DE.Views.ParagraphSettings.strSpacingBefore": "Before", @@ -1299,7 +1307,7 @@ "DE.Views.TableSettingsAdvanced.okButtonText": "OK", "DE.Views.TableSettingsAdvanced.textAlign": "Alignment", "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment", - "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Allow spacing between cells", + "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells", "DE.Views.TableSettingsAdvanced.textAnchorText": "Text", "DE.Views.TableSettingsAdvanced.textAutofit": "Automatically resize to fit contents", "DE.Views.TableSettingsAdvanced.textBackColor": "Cell Background", @@ -1309,11 +1317,11 @@ "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Borders & Background", "DE.Views.TableSettingsAdvanced.textBorderWidth": "Border Size", "DE.Views.TableSettingsAdvanced.textBottom": "Bottom", - "DE.Views.TableSettingsAdvanced.textCellProps": "Cell Properties", + "DE.Views.TableSettingsAdvanced.textCellProps": "Cell", "DE.Views.TableSettingsAdvanced.textCenter": "Center", "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Center", "DE.Views.TableSettingsAdvanced.textCheckMargins": "Use default margins", - "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Margins", + "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Cell Margins", "DE.Views.TableSettingsAdvanced.textDistance": "Distance from Text", "DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal", "DE.Views.TableSettingsAdvanced.textIndLeft": "Indent from Left", @@ -1334,7 +1342,10 @@ "DE.Views.TableSettingsAdvanced.textRightOf": "to the right of", "DE.Views.TableSettingsAdvanced.textRightTooltip": "Right", "DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors", + "DE.Views.TableSettingsAdvanced.textTable": "Table", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background", + "DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position", + "DE.Views.TableSettingsAdvanced.textTableSize": "Table Size", "DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors", "DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings", "DE.Views.TableSettingsAdvanced.textTop": "Top", @@ -1344,6 +1355,7 @@ "DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping", "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table", "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow table", + "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style", "DE.Views.TableSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines", "DE.Views.TableSettingsAdvanced.tipCellAll": "Set Borders for Inner Cells Only", "DE.Views.TableSettingsAdvanced.tipCellInner": "Set Vertical and Horizontal Lines for Inner Cells Only", @@ -1354,7 +1366,16 @@ "DE.Views.TableSettingsAdvanced.tipTableOuterCellAll": "Set Outer Border and Borders for All Inner Cells", "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Set Outer Border and Vertical and Horizontal Lines for Inner Cells", "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Set Table Outer Border and Outer Borders for Inner Cells", + "DE.Views.TableSettingsAdvanced.txtCm": "Centimeter", "DE.Views.TableSettingsAdvanced.txtNoBorders": "No borders", + "DE.Views.TableSettingsAdvanced.txtPercent": "Percent", + "DE.Views.TableSettingsAdvanced.txtPt": "Point", + "DE.Views.TableSettingsAdvanced.txtInch": "Inch", + "DE.Views.TableSettingsAdvanced.textCellSize": "Cell Size", + "DE.Views.TableSettingsAdvanced.textPrefWidth": "Preferred width", + "DE.Views.TableSettingsAdvanced.textMeasure": "Measure in", + "DE.Views.TableSettingsAdvanced.textCellOptions": "Cell Options", + "DE.Views.TableSettingsAdvanced.textWrapText": "Wrap text", "DE.Views.TextArtSettings.strColor": "Color", "DE.Views.TextArtSettings.strFill": "Fill", "DE.Views.TextArtSettings.strSize": "Size", @@ -1419,6 +1440,7 @@ "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", "DE.Views.Toolbar.textMarginsNormal": "Normal", + "DE.Views.Toolbar.textMarginsUsNormal": "US Normal", "DE.Views.Toolbar.textMarginsWide": "Wide", "DE.Views.Toolbar.textNewColor": "Add New Custom Color", "DE.Views.Toolbar.textNextPage": "Next Page", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 49c4e5442..08448cf60 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -1,4 +1,6 @@ { + "Common.Utils.Metric.txtCm": "см", + "Common.Utils.Metric.txtPt": "пт", "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", "Common.Controllers.Chat.textUserLimit": "Вы используете бесплатную версию ONLYOFFICE.
Только два пользователя одновременно могут совместно редактировать документ.
Требуется больше? Рекомендуем приобрести корпоративную версию ONLYOFFICE.
Читать дальше", @@ -38,7 +40,7 @@ "Common.Controllers.ReviewChanges.textKeepLines": "Не разрывать абзац", "Common.Controllers.ReviewChanges.textKeepNext": "Не отрывать от следующего", "Common.Controllers.ReviewChanges.textLeft": "Выравнивание по левому краю", - "Common.Controllers.ReviewChanges.textLineSpacing": "Междустрочный интервал:", + "Common.Controllers.ReviewChanges.textLineSpacing": "Междустрочный интервал: ", "Common.Controllers.ReviewChanges.textMultiple": "Множитель", "Common.Controllers.ReviewChanges.textNoBreakBefore": "Не с новой страницы", "Common.Controllers.ReviewChanges.textNoContextual": "Добавлять интервал между абзацами одного стиля", @@ -81,6 +83,7 @@ "Common.UI.SearchDialog.textTitle": "Поиск и замена", "Common.UI.SearchDialog.textTitle2": "Найти", "Common.UI.SearchDialog.textWholeWords": "Только слово целиком", + "Common.UI.SearchDialog.txtBtnHideReplace": "Скрыть поле замены", "Common.UI.SearchDialog.txtBtnReplace": "Заменить", "Common.UI.SearchDialog.txtBtnReplaceAll": "Заменить все", "Common.UI.SynchronizeTip.textDontShow": "Больше не показывать это сообщение", @@ -230,8 +233,10 @@ "DE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1.", "DE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1.", "DE.Controllers.Main.textAnonymous": "Аноним", + "DE.Controllers.Main.textBuyNow": "Купить", "DE.Controllers.Main.textCloseTip": "\nЩелкните, чтобы закрыть эту подсказку", "DE.Controllers.Main.textLoadingDocument": "Загрузка документа", + "DE.Controllers.Main.textNoLicenseTitle": "Лицензия не найдена или истек ее срок действия", "DE.Controllers.Main.textStrict": "Строгий режим", "DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.", "DE.Controllers.Main.titleUpdateVersion": "Версия изменилась", @@ -261,10 +266,8 @@ "DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "DE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "DE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0.", + "DE.Controllers.Main.warnNoLicense": "Лицензия не найдена или истек ее срок действия. Вы не можете редактировать файлы.
Нажмите кнопку 'Купить' для покупки лицензии на Enterprise Edition или 'Связаться с нами', если вы используете Integration Edition.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", - "DE.Controllers.Main.textBuyNow": "Купить", - "DE.Controllers.Main.textNoLicenseTitle": "Истек срок действия лицензии", - "DE.Controllers.Main.warnNoLicense": "Истек срок действия лицензии. Вы не можете создавать и редактировать файлы.
Нажмите кнопку \'Купить\' для продления лицензии.", "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения", "DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений", "DE.Controllers.Statusbar.zoomText": "Масштаб {0}%", @@ -880,6 +883,7 @@ "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Люди, имеющие права", "DE.Views.FileMenuPanels.Settings.okButtonText": "Применить", "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Включить направляющие выравнивания", + "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Включить автовосстановление", "DE.Views.FileMenuPanels.Settings.strAutosave": "Включить автосохранение", "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Режим совместного редактирования", "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Другие пользователи будут сразу же видеть ваши изменения", @@ -898,6 +902,7 @@ "DE.Views.FileMenuPanels.Settings.text5Minutes": "Каждые 5 минут", "DE.Views.FileMenuPanels.Settings.text60Minutes": "Каждый час", "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Направляющие выравнивания", + "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление", "DE.Views.FileMenuPanels.Settings.textAutoSave": "Автосохранение", "DE.Views.FileMenuPanels.Settings.textDisabled": "Отключено", "DE.Views.FileMenuPanels.Settings.textMinute": "Каждую минуту", @@ -912,6 +917,7 @@ "DE.Views.FileMenuPanels.Settings.txtPt": "Пункт", "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии", "DE.Views.FileMenuPanels.Settings.txtWin": "как Windows", + "DE.Views.FileMenuPanels.Settings.txtInch": "Дюйм", "DE.Views.HeaderFooterSettings.textBottomCenter": "Снизу по центру", "DE.Views.HeaderFooterSettings.textBottomLeft": "Снизу слева", "DE.Views.HeaderFooterSettings.textBottomRight": "Снизу справа", @@ -988,6 +994,7 @@ "DE.Views.ImageSettingsAdvanced.textPage": "Страницы", "DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца", "DE.Views.ImageSettingsAdvanced.textPosition": "Положение", + "DE.Views.ImageSettingsAdvanced.textPositionPc": "Относительное положение", "DE.Views.ImageSettingsAdvanced.textRelative": "относительно", "DE.Views.ImageSettingsAdvanced.textRight": "Справа", "DE.Views.ImageSettingsAdvanced.textRightMargin": "Правого поля", @@ -1085,8 +1092,8 @@ "DE.Views.PageSizeDialog.textHeight": "Высота", "DE.Views.PageSizeDialog.textTitle": "Размер страницы", "DE.Views.PageSizeDialog.textWidth": "Ширина", - "DE.Views.ParagraphSettings.strLineHeight": "Междустрочный", - "DE.Views.ParagraphSettings.strParagraphSpacing": "Интервал", + "DE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", + "DE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Не добавлять интервал между абзацами одного стиля", "DE.Views.ParagraphSettings.strSpacingAfter": "После", "DE.Views.ParagraphSettings.strSpacingBefore": "Перед", @@ -1306,11 +1313,11 @@ "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Границы и фон", "DE.Views.TableSettingsAdvanced.textBorderWidth": "Ширина границ", "DE.Views.TableSettingsAdvanced.textBottom": "Снизу", - "DE.Views.TableSettingsAdvanced.textCellProps": "Свойства ячейки", + "DE.Views.TableSettingsAdvanced.textCellProps": "Ячейка", "DE.Views.TableSettingsAdvanced.textCenter": "По центру", "DE.Views.TableSettingsAdvanced.textCenterTooltip": "По центру", "DE.Views.TableSettingsAdvanced.textCheckMargins": "Использовать поля по умолчанию", - "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Поля по умолчанию", + "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Поля ячейки по умолчанию", "DE.Views.TableSettingsAdvanced.textDistance": "Расстояние до текста", "DE.Views.TableSettingsAdvanced.textHorizontal": "По горизонтали", "DE.Views.TableSettingsAdvanced.textIndLeft": "Отступ слева", @@ -1331,7 +1338,10 @@ "DE.Views.TableSettingsAdvanced.textRightOf": "справа от", "DE.Views.TableSettingsAdvanced.textRightTooltip": "По правому краю", "DE.Views.TableSettingsAdvanced.textStandartColors": "Стандартные цвета", + "DE.Views.TableSettingsAdvanced.textTable": "Таблица", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Фон таблицы", + "DE.Views.TableSettingsAdvanced.textTablePosition": "Положение таблицы", + "DE.Views.TableSettingsAdvanced.textTableSize": "Размер таблицы", "DE.Views.TableSettingsAdvanced.textThemeColors": "Цвета темы", "DE.Views.TableSettingsAdvanced.textTitle": "Таблица - дополнительные параметры", "DE.Views.TableSettingsAdvanced.textTop": "Сверху", @@ -1351,7 +1361,11 @@ "DE.Views.TableSettingsAdvanced.tipTableOuterCellAll": "Задать внешнюю границу и границы для всех внутренних ячеек", "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Задать внешнюю границу и вертикальные и горизонтальные линии для внутренних ячеек", "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Задать внешнюю границу таблицы и внешние границы для внутренних ячеек", + "DE.Views.TableSettingsAdvanced.txtCm": "Сантиметр", "DE.Views.TableSettingsAdvanced.txtNoBorders": "Без границ", + "DE.Views.TableSettingsAdvanced.txtPercent": "Процент", + "DE.Views.TableSettingsAdvanced.txtPt": "Пункт", + "DE.Views.TableSettingsAdvanced.txtInch": "Дюйм", "DE.Views.TextArtSettings.strColor": "Цвет", "DE.Views.TextArtSettings.strFill": "Заливка", "DE.Views.TextArtSettings.strSize": "Толщина", diff --git a/apps/documenteditor/main/resources/help/de/callback.js b/apps/documenteditor/main/resources/help/de/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/documenteditor/main/resources/help/de/callback.js +++ b/apps/documenteditor/main/resources/help/de/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/documenteditor/main/resources/help/de/images/GreenCircle.png b/apps/documenteditor/main/resources/help/de/images/greencircle.png similarity index 100% rename from apps/documenteditor/main/resources/help/de/images/GreenCircle.png rename to apps/documenteditor/main/resources/help/de/images/greencircle.png diff --git a/apps/documenteditor/main/resources/help/de/images/Hanging.png b/apps/documenteditor/main/resources/help/de/images/hanging.png similarity index 100% rename from apps/documenteditor/main/resources/help/de/images/Hanging.png rename to apps/documenteditor/main/resources/help/de/images/hanging.png diff --git a/apps/documenteditor/main/resources/help/de/images/SearchDownButton.png b/apps/documenteditor/main/resources/help/de/images/searchdownbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/de/images/SearchDownButton.png rename to apps/documenteditor/main/resources/help/de/images/searchdownbutton.png diff --git a/apps/documenteditor/main/resources/help/de/images/SearchUpButton.png b/apps/documenteditor/main/resources/help/de/images/searchupbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/de/images/SearchUpButton.png rename to apps/documenteditor/main/resources/help/de/images/searchupbutton.png diff --git a/apps/documenteditor/main/resources/help/de/images/ViewSettingsIcon.png b/apps/documenteditor/main/resources/help/de/images/viewsettingsicon.png similarity index 100% rename from apps/documenteditor/main/resources/help/de/images/ViewSettingsIcon.png rename to apps/documenteditor/main/resources/help/de/images/viewsettingsicon.png diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm index b32d66bae..d584e3ce2 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm @@ -5,6 +5,7 @@ +
diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm index d2ca7ad21..081492bbd 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/insertdropcap.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertDropCap.htm similarity index 100% rename from apps/documenteditor/main/resources/help/en/UsageInstructions/insertdropcap.htm rename to apps/documenteditor/main/resources/help/en/UsageInstructions/InsertDropCap.htm diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm index e3c47bc9a..a1722e1d0 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm @@ -5,6 +5,7 @@ +
diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/LineSpacing.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/LineSpacing.htm index 44687acfe..40fc53adf 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/LineSpacing.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/LineSpacing.htm @@ -15,12 +15,17 @@
  • put the cursor within the paragraph you need, or select several paragraphs with the mouse or all the text in the document by pressing the Ctrl+A key combination,
  • use the corresponding fields at the right sidebar to achieve the desired results:
      -
    • Line Spacing - set the line height for the text lines within the paragraph. You can select among three options: at least (sets the minimum line spacing that is needed to fit the largest font or graphic on the line), multiple (sets line spacing that can be expressed in numbers greater than 1), exactly (sets fixed line spacing). In the At field you can specify the necessary value.
      • -
    • Before - set the amount of space before the paragraph.
      • -
    • After - set the amount of space after the paragraph.
      • -
    • Don't add interval between paragraphs of the same style - check this box in case you don't need any space between paragraphs of the same style. -

      Right Sidebar - Paragraph Settings

      -
      • +
    • Line Spacing - set the line height for the text lines within the paragraph. You can select among three options: at least (sets the minimum line spacing that is needed to fit the largest font or graphic on the line), multiple (sets line spacing that can be expressed in numbers greater than 1), exactly (sets fixed line spacing). You can specify the necessary value in the field on the right.
      • +
    • Paragraph Spacing - set the amount of space between paragraphs. +
        +
      • Before - set the amount of space before the paragraph.
        • +
      • After - set the amount of space after the paragraph.
        • +
      • + Don't add interval between paragraphs of the same style - check this box in case you don't need any space between paragraphs of the same style. +

        Right Sidebar - Paragraph Settings

        +
        • +
      +
    • diff --git a/apps/documenteditor/main/resources/help/en/callback.js b/apps/documenteditor/main/resources/help/en/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/documenteditor/main/resources/help/en/callback.js +++ b/apps/documenteditor/main/resources/help/en/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/documenteditor/main/resources/help/en/images/GreenCircle.png b/apps/documenteditor/main/resources/help/en/images/greencircle.png similarity index 100% rename from apps/documenteditor/main/resources/help/en/images/GreenCircle.png rename to apps/documenteditor/main/resources/help/en/images/greencircle.png diff --git a/apps/documenteditor/main/resources/help/en/images/Hanging.png b/apps/documenteditor/main/resources/help/en/images/hanging.png similarity index 100% rename from apps/documenteditor/main/resources/help/en/images/Hanging.png rename to apps/documenteditor/main/resources/help/en/images/hanging.png diff --git a/apps/documenteditor/main/resources/help/en/images/right_paragraph.png b/apps/documenteditor/main/resources/help/en/images/right_paragraph.png index 4192ef646..87f9bc12a 100644 Binary files a/apps/documenteditor/main/resources/help/en/images/right_paragraph.png and b/apps/documenteditor/main/resources/help/en/images/right_paragraph.png differ diff --git a/apps/documenteditor/main/resources/help/en/images/SearchDownButton.png b/apps/documenteditor/main/resources/help/en/images/searchdownbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/en/images/SearchDownButton.png rename to apps/documenteditor/main/resources/help/en/images/searchdownbutton.png diff --git a/apps/documenteditor/main/resources/help/en/images/SearchUpButton.png b/apps/documenteditor/main/resources/help/en/images/searchupbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/en/images/SearchUpButton.png rename to apps/documenteditor/main/resources/help/en/images/searchupbutton.png diff --git a/apps/documenteditor/main/resources/help/en/images/ViewSettingsIcon.png b/apps/documenteditor/main/resources/help/en/images/viewsettingsicon.png similarity index 100% rename from apps/documenteditor/main/resources/help/en/images/ViewSettingsIcon.png rename to apps/documenteditor/main/resources/help/en/images/viewsettingsicon.png diff --git a/apps/documenteditor/main/resources/help/es/UsageInstructions/insertdropcap.htm b/apps/documenteditor/main/resources/help/es/UsageInstructions/InsertDropCap.htm similarity index 100% rename from apps/documenteditor/main/resources/help/es/UsageInstructions/insertdropcap.htm rename to apps/documenteditor/main/resources/help/es/UsageInstructions/InsertDropCap.htm diff --git a/apps/documenteditor/main/resources/help/es/callback.js b/apps/documenteditor/main/resources/help/es/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/documenteditor/main/resources/help/es/callback.js +++ b/apps/documenteditor/main/resources/help/es/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/documenteditor/main/resources/help/es/images/Hanging.png b/apps/documenteditor/main/resources/help/es/images/hanging.png similarity index 100% rename from apps/documenteditor/main/resources/help/es/images/Hanging.png rename to apps/documenteditor/main/resources/help/es/images/hanging.png diff --git a/apps/documenteditor/main/resources/help/es/images/SearchDownButton.png b/apps/documenteditor/main/resources/help/es/images/searchdownbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/es/images/SearchDownButton.png rename to apps/documenteditor/main/resources/help/es/images/searchdownbutton.png diff --git a/apps/documenteditor/main/resources/help/es/images/SearchUpButton.png b/apps/documenteditor/main/resources/help/es/images/searchupbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/es/images/SearchUpButton.png rename to apps/documenteditor/main/resources/help/es/images/searchupbutton.png diff --git a/apps/documenteditor/main/resources/help/fr/UsageInstructions/insertdropcap.htm b/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertDropCap.htm similarity index 100% rename from apps/documenteditor/main/resources/help/fr/UsageInstructions/insertdropcap.htm rename to apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertDropCap.htm diff --git a/apps/documenteditor/main/resources/help/fr/callback.js b/apps/documenteditor/main/resources/help/fr/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/documenteditor/main/resources/help/fr/callback.js +++ b/apps/documenteditor/main/resources/help/fr/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/documenteditor/main/resources/help/fr/images/GreenCircle.png b/apps/documenteditor/main/resources/help/fr/images/greencircle.png similarity index 100% rename from apps/documenteditor/main/resources/help/fr/images/GreenCircle.png rename to apps/documenteditor/main/resources/help/fr/images/greencircle.png diff --git a/apps/documenteditor/main/resources/help/fr/images/Hanging.png b/apps/documenteditor/main/resources/help/fr/images/hanging.png similarity index 100% rename from apps/documenteditor/main/resources/help/fr/images/Hanging.png rename to apps/documenteditor/main/resources/help/fr/images/hanging.png diff --git a/apps/documenteditor/main/resources/help/fr/images/SearchDownButton.png b/apps/documenteditor/main/resources/help/fr/images/searchdownbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/fr/images/SearchDownButton.png rename to apps/documenteditor/main/resources/help/fr/images/searchdownbutton.png diff --git a/apps/documenteditor/main/resources/help/fr/images/SearchUpButton.png b/apps/documenteditor/main/resources/help/fr/images/searchupbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/fr/images/SearchUpButton.png rename to apps/documenteditor/main/resources/help/fr/images/searchupbutton.png diff --git a/apps/documenteditor/main/resources/help/fr/images/ViewSettingsIcon.png b/apps/documenteditor/main/resources/help/fr/images/viewsettingsicon.png similarity index 100% rename from apps/documenteditor/main/resources/help/fr/images/ViewSettingsIcon.png rename to apps/documenteditor/main/resources/help/fr/images/viewsettingsicon.png diff --git a/apps/documenteditor/main/resources/help/it/callback.js b/apps/documenteditor/main/resources/help/it/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/documenteditor/main/resources/help/it/callback.js +++ b/apps/documenteditor/main/resources/help/it/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/documenteditor/main/resources/help/it/images/GreenCircle.png b/apps/documenteditor/main/resources/help/it/images/greencircle.png similarity index 100% rename from apps/documenteditor/main/resources/help/it/images/GreenCircle.png rename to apps/documenteditor/main/resources/help/it/images/greencircle.png diff --git a/apps/documenteditor/main/resources/help/it/images/Hanging.png b/apps/documenteditor/main/resources/help/it/images/hanging.png similarity index 100% rename from apps/documenteditor/main/resources/help/it/images/Hanging.png rename to apps/documenteditor/main/resources/help/it/images/hanging.png diff --git a/apps/documenteditor/main/resources/help/it/images/SearchDownButton.png b/apps/documenteditor/main/resources/help/it/images/searchdownbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/it/images/SearchDownButton.png rename to apps/documenteditor/main/resources/help/it/images/searchdownbutton.png diff --git a/apps/documenteditor/main/resources/help/it/images/SearchUpButton.png b/apps/documenteditor/main/resources/help/it/images/searchupbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/it/images/SearchUpButton.png rename to apps/documenteditor/main/resources/help/it/images/searchupbutton.png diff --git a/apps/documenteditor/main/resources/help/it/images/ViewSettingsIcon.png b/apps/documenteditor/main/resources/help/it/images/viewsettingsicon.png similarity index 100% rename from apps/documenteditor/main/resources/help/it/images/ViewSettingsIcon.png rename to apps/documenteditor/main/resources/help/it/images/viewsettingsicon.png diff --git a/apps/documenteditor/main/resources/help/ru/HelpfulHints/advancedsettings.htm b/apps/documenteditor/main/resources/help/ru/HelpfulHints/AdvancedSettings.htm similarity index 100% rename from apps/documenteditor/main/resources/help/ru/HelpfulHints/advancedsettings.htm rename to apps/documenteditor/main/resources/help/ru/HelpfulHints/AdvancedSettings.htm diff --git a/apps/documenteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm b/apps/documenteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm index c71e5f7be..b8f8fa45d 100644 --- a/apps/documenteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm +++ b/apps/documenteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm b/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm index 2b0918a91..b15fb8bce 100644 --- a/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/documenteditor/main/resources/help/ru/HelpfulHints/spellchecking.htm b/apps/documenteditor/main/resources/help/ru/HelpfulHints/SpellChecking.htm similarity index 100% rename from apps/documenteditor/main/resources/help/ru/HelpfulHints/spellchecking.htm rename to apps/documenteditor/main/resources/help/ru/HelpfulHints/SpellChecking.htm diff --git a/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm b/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm index d97787d1e..49ce57cca 100644 --- a/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm +++ b/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/documenteditor/main/resources/help/ru/UsageInstructions/LineSpacing.htm b/apps/documenteditor/main/resources/help/ru/UsageInstructions/LineSpacing.htm index 593e997e3..8feac1554 100644 --- a/apps/documenteditor/main/resources/help/ru/UsageInstructions/LineSpacing.htm +++ b/apps/documenteditor/main/resources/help/ru/UsageInstructions/LineSpacing.htm @@ -15,12 +15,17 @@
  • установите курсор в пределах нужного абзаца или выделите мышью несколько абзацев или весь текст документа, нажав сочетание клавиш Ctrl+A,
  • используйте соответствующие поля на правой боковой панели для получения нужного результата:
      -
    • Междустрочный - задайте высоту строки для строк текста в абзаце. Можно выбрать одну из трех опций: минимум (устанавливает минимальный междустрочный интервал, который требуется, чтобы соответствовать самому крупному шрифту или графическому элементу на строке), множитель (устанавливает междустрочный интервал, который может быть выражен в числах больше 1), точно (устанавливает фиксированный междустрочный интервал). В поле Значение можно указать необходимое значение.
      • -
    • Перед - задайте величину свободного места перед абзацем.
      • -
    • После - задайте величину свободного места после абзаца.
      • -
    • Не добавлять интервал между абзацами одного стиля - установите этот флажок, если свободное место между абзацами одного стиля не требуется. -

      Правая боковая панель - Настройки абзаца

      -
      • +
    • Междустрочный интервал - задайте высоту строки для строк текста в абзаце. Можно выбрать одну из трех опций: минимум (устанавливает минимальный междустрочный интервал, который требуется, чтобы соответствовать самому крупному шрифту или графическому элементу на строке), множитель (устанавливает междустрочный интервал, который может быть выражен в числах больше 1), точно (устанавливает фиксированный междустрочный интервал). Необходимое значение можно указать в поле справа.
      • +
    • Интервал между абзацами - задайте величину свободного пространства между абзацами. +
        +
      • Перед - задайте величину свободного пространства перед абзацем.
        • +
      • После - задайте величину свободного пространства после абзаца.
        • +
      • + Не добавлять интервал между абзацами одного стиля - установите этот флажок, если свободное пространство между абзацами одного стиля не требуется. +

        Правая боковая панель - Настройки абзаца

        +
        • +
      +
    • diff --git a/apps/documenteditor/main/resources/help/ru/callback.js b/apps/documenteditor/main/resources/help/ru/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/documenteditor/main/resources/help/ru/callback.js +++ b/apps/documenteditor/main/resources/help/ru/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/documenteditor/main/resources/help/ru/images/GreenCircle.png b/apps/documenteditor/main/resources/help/ru/images/greencircle.png similarity index 100% rename from apps/documenteditor/main/resources/help/ru/images/GreenCircle.png rename to apps/documenteditor/main/resources/help/ru/images/greencircle.png diff --git a/apps/documenteditor/main/resources/help/ru/images/Hanging.png b/apps/documenteditor/main/resources/help/ru/images/hanging.png similarity index 100% rename from apps/documenteditor/main/resources/help/ru/images/Hanging.png rename to apps/documenteditor/main/resources/help/ru/images/hanging.png diff --git a/apps/documenteditor/main/resources/help/ru/images/review_panel.png b/apps/documenteditor/main/resources/help/ru/images/review_panel.png index 403417f26..13cee7a2f 100644 Binary files a/apps/documenteditor/main/resources/help/ru/images/review_panel.png and b/apps/documenteditor/main/resources/help/ru/images/review_panel.png differ diff --git a/apps/documenteditor/main/resources/help/ru/images/SearchDownButton.png b/apps/documenteditor/main/resources/help/ru/images/searchdownbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/ru/images/SearchDownButton.png rename to apps/documenteditor/main/resources/help/ru/images/searchdownbutton.png diff --git a/apps/documenteditor/main/resources/help/ru/images/SearchUpButton.png b/apps/documenteditor/main/resources/help/ru/images/searchupbutton.png similarity index 100% rename from apps/documenteditor/main/resources/help/ru/images/SearchUpButton.png rename to apps/documenteditor/main/resources/help/ru/images/searchupbutton.png diff --git a/apps/documenteditor/main/resources/help/ru/images/ViewSettingsIcon.png b/apps/documenteditor/main/resources/help/ru/images/viewsettingsicon.png similarity index 100% rename from apps/documenteditor/main/resources/help/ru/images/ViewSettingsIcon.png rename to apps/documenteditor/main/resources/help/ru/images/viewsettingsicon.png diff --git a/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png b/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png index c170276c7..c5a8ce87f 100644 Binary files a/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png and b/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png differ diff --git a/apps/documenteditor/main/resources/img/right-panels/LargeBorders@2x.png b/apps/documenteditor/main/resources/img/right-panels/LargeBorders@2x.png index edeb95d79..a460b2ec7 100644 Binary files a/apps/documenteditor/main/resources/img/right-panels/LargeBorders@2x.png and b/apps/documenteditor/main/resources/img/right-panels/LargeBorders@2x.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar-menu.png b/apps/documenteditor/main/resources/img/toolbar-menu.png index e25a47f79..9c0be2658 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar-menu.png and b/apps/documenteditor/main/resources/img/toolbar-menu.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png index 998eae118..acfef39b8 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png and b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png differ diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 5d9a28070..bd9d4249b 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -113,6 +113,7 @@ @import "../../../../common/main/resources/less/history.less"; @import "../../../../common/main/resources/less/opendialog.less"; @import "../../../../common/main/resources/less/review-changes.less"; +@import "../../../../common/main/resources/less/plugins.less"; // App // -------------------------------------------------- diff --git a/apps/documenteditor/main/resources/less/leftmenu.less b/apps/documenteditor/main/resources/less/leftmenu.less index 1c4ef936e..92a926d22 100644 --- a/apps/documenteditor/main/resources/less/leftmenu.less +++ b/apps/documenteditor/main/resources/less/leftmenu.less @@ -20,6 +20,7 @@ button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60 .button-normal-icon(btn-menu-chat, 62, @toolbar-icon-size); .button-normal-icon(btn-menu-about, 68, @toolbar-icon-size); .button-normal-icon(btn-menu-support, 70, @toolbar-icon-size); +.button-normal-icon(btn-menu-plugin, 84, @toolbar-icon-size); .tool-menu-btns { width: 40px; diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js index 3dbef7ed5..a2618a502 100644 --- a/apps/documenteditor/mobile/app.js +++ b/apps/documenteditor/mobile/app.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.application({ name: 'DE', diff --git a/apps/documenteditor/mobile/app/controller/Document.js b/apps/documenteditor/mobile/app/controller/Document.js index c093b8666..c8f3681e8 100644 --- a/apps/documenteditor/mobile/app/controller/Document.js +++ b/apps/documenteditor/mobile/app/controller/Document.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.Document', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 13aee3558..ab2a3d5f5 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.Main', { extend: 'Ext.app.Controller', editMode: false, @@ -26,12 +58,10 @@ Ext.define('DE.controller.Main', { var api = this.api, app = this.getApplication(); - api = new asc_docs_api("id-sdkeditor"); - api.SetMobileVersion(true); - api.CreateComponents(); - api.asc_SetFontsPath("../../../sdk/Fonts/"); - api.Init(); - api.initEvents2MobileAdvances(); + api = new Asc.asc_docs_api({ + 'id-view' : 'id-sdkeditor', + 'mobile' : true + }); api.asc_registerCallback('asc_onStartAction', Ext.bind(this.onLongActionBegin, this)); api.asc_registerCallback('asc_onError', Ext.bind(this.onError, this)); @@ -69,6 +99,7 @@ Ext.define('DE.controller.Main', { }, loadConfig: function(data) { + this.editorConfig = Ext.merge(this.editorConfig, data.config); this.editorConfig.user = this._fillUserInfo(this.editorConfig.user); }, @@ -76,13 +107,13 @@ Ext.define('DE.controller.Main', { if ( data.doc ) { this.permissions = data.doc.permissions; - var _user = new CUserInfo(); + var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.editorConfig.user.id); _user.put_FirstName(this.editorConfig.user.firstname); _user.put_LastName(this.editorConfig.user.lastname); _user.put_FullName(this.editorConfig.user.fullname); - var docInfo = new CDocInfo(); + var docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(data.doc.key); docInfo.put_Url(data.doc.url); docInfo.put_Title(data.doc.title); @@ -127,11 +158,13 @@ Ext.define('DE.controller.Main', { }, onDocumentContentReady: function() { + if (this._isReady) return; + this._isReady = true; + if (this.api) { this.api.Resize(); this.api.zoomFitToWidth(); } - this._hideLoadSplash(); Common.component.Analytics.trackEvent('Load', 'Complete'); @@ -158,15 +191,15 @@ Ext.define('DE.controller.Main', { var text = ''; switch (id) { - case c_oAscAsyncAction['Save']: + case Asc.c_oAscAsyncAction['Save']: text = this.saveText; break; - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: text = this.printText; } - if (type == c_oAscAsyncActionType['BlockInteraction']) { + if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { Ext.Viewport.setMasked({ xtype : 'loadmask', message : text @@ -188,63 +221,63 @@ Ext.define('DE.controller.Main', { switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: config.message = this.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: config.message = this.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: config.message = this.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: config.message = this.downloadErrorText; break; - case c_oAscError.ID.UplImageSize: + case Asc.c_oAscError.ID.UplImageSize: config.message = this.uploadImageSizeMessage; break; - case c_oAscError.ID.UplImageExt: + case Asc.c_oAscError.ID.UplImageExt: config.message = this.uploadImageExtMessage; break; - case c_oAscError.ID.UplImageFileCount: + case Asc.c_oAscError.ID.UplImageFileCount: config.message = this.uploadImageFileCountMessage; break; - case c_oAscError.ID.SplitCellMaxRows: + case Asc.c_oAscError.ID.SplitCellMaxRows: config.message = this.splitMaxRowsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellMaxCols: + case Asc.c_oAscError.ID.SplitCellMaxCols: config.message = this.splitMaxColsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellRowsDivider: + case Asc.c_oAscError.ID.SplitCellRowsDivider: config.message = this.splitDividerErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.VKeyEncrypt: + case Asc.c_oAscError.ID.VKeyEncrypt: config.message = this.errorKeyEncrypt; break; - case c_oAscError.ID.KeyExpire: + case Asc.c_oAscError.ID.KeyExpire: config.message = this.errorKeyExpire; break; - case c_oAscError.ID.UserCountExceed: + case Asc.c_oAscError.ID.UserCountExceed: config.message = this.errorUsersExceed; break; - case c_oAscError.ID.CoAuthoringDisconnect: + case Asc.c_oAscError.ID.CoAuthoringDisconnect: config.message = this.errorCoAuthoringDisconnect; break; - case c_oAscError.ID.MobileUnexpectedCharCount: + case Asc.c_oAscError.ID.MobileUnexpectedCharCount: config.message = this.errorDocTooBig; config.out = true; break; @@ -256,7 +289,7 @@ Ext.define('DE.controller.Main', { - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, config.message); @@ -316,7 +349,7 @@ Ext.define('DE.controller.Main', { }, onDownloadAs: function() { - this.api.asc_DownloadAs(c_oAscFileType.DOCX, true); + this.api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true); }, _hideLoadSplash: function(){ diff --git a/apps/documenteditor/mobile/app/controller/Search.js b/apps/documenteditor/mobile/app/controller/Search.js index 43830f635..9c7642f65 100644 --- a/apps/documenteditor/mobile/app/controller/Search.js +++ b/apps/documenteditor/mobile/app/controller/Search.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.Search', (function() { return { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/phone/Main.js b/apps/documenteditor/mobile/app/controller/phone/Main.js index b5891ad19..68beace02 100644 --- a/apps/documenteditor/mobile/app/controller/phone/Main.js +++ b/apps/documenteditor/mobile/app/controller/phone/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.phone.Main', { extend: 'DE.controller.Main', diff --git a/apps/documenteditor/mobile/app/controller/tablet/Main.js b/apps/documenteditor/mobile/app/controller/tablet/Main.js index 50c5e6576..7387f09a7 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/Main.js +++ b/apps/documenteditor/mobile/app/controller/tablet/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.Main', { extend: 'DE.controller.Main', diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/Font.js b/apps/documenteditor/mobile/app/controller/tablet/panel/Font.js index 518cc2aba..4b53019e2 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/Font.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/Font.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.Font', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/FontStyle.js b/apps/documenteditor/mobile/app/controller/tablet/panel/FontStyle.js index 43a047e14..3a0607938 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/FontStyle.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/FontStyle.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.FontStyle', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/Insert.js b/apps/documenteditor/mobile/app/controller/tablet/panel/Insert.js index c90a2569a..2cf37703d 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/Insert.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/Insert.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.Insert', { extend: 'Ext.app.Controller', @@ -53,10 +85,10 @@ Ext.define('DE.controller.tablet.panel.Insert', { mpImg.imageLoadListeners.push(function() { var canvas = document.createElement('canvas'), - imgProperty = new CImgProperty(); + imgProperty = new Asc.asc_CImgProperty(); mpImg.render(canvas, { maxWidth: 1024, maxHeight: 1024 }); - imgProperty.put_WrappingStyle((input == inputInlineMedia) ? c_oAscWrapStyle2.Inline : c_oAscWrapStyle2.Square); + imgProperty.put_WrappingStyle((input == inputInlineMedia) ? Asc.c_oAscWrapStyle2.Inline : Asc.c_oAscWrapStyle2.Square); me.api.AddImageUrl(canvas.toDataURL(), imgProperty); @@ -207,7 +239,7 @@ Ext.define('DE.controller.tablet.panel.Insert', { if (selectedElements && selectedElements.length > 0) { var elementType = selectedElements[0].get_ObjectType(); - if (c_oAscTypeSelectElement.Table == elementType) { + if (Asc.c_oAscTypeSelectElement.Table == elementType) { type === 'row' ? this.api.addRowBelow() : type === 'column' diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/ParagraphAlignment.js b/apps/documenteditor/mobile/app/controller/tablet/panel/ParagraphAlignment.js index 089216332..8d2866595 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/ParagraphAlignment.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/ParagraphAlignment.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.ParagraphAlignment', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/Spacing.js b/apps/documenteditor/mobile/app/controller/tablet/panel/Spacing.js index 59073ff9e..c8794a70a 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/Spacing.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/Spacing.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.Spacing', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/Style.js b/apps/documenteditor/mobile/app/controller/tablet/panel/Style.js index e47d0353c..c69d2d9b5 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/Style.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/Style.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.Style', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/tablet/panel/TextColor.js b/apps/documenteditor/mobile/app/controller/tablet/panel/TextColor.js index 2ae8c01a6..c2f439a32 100644 --- a/apps/documenteditor/mobile/app/controller/tablet/panel/TextColor.js +++ b/apps/documenteditor/mobile/app/controller/tablet/panel/TextColor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.tablet.panel.TextColor', { extend: 'Ext.app.Controller', @@ -139,7 +171,7 @@ Ext.define('DE.controller.tablet.panel.TextColor', { textColorList.select(record); var color = record.get('color'), - ascColor = new CAscColor(); + ascColor = new Asc.asc_CColor(); ascColor.put_r(parseInt((color[0] + color[1]), 16)); ascColor.put_g(parseInt((color[2] + color[3]), 16)); diff --git a/apps/documenteditor/mobile/app/controller/toolbar/Edit.js b/apps/documenteditor/mobile/app/controller/toolbar/Edit.js index 3b2d4bc73..f098e9b58 100644 --- a/apps/documenteditor/mobile/app/controller/toolbar/Edit.js +++ b/apps/documenteditor/mobile/app/controller/toolbar/Edit.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.toolbar.Edit', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/controller/toolbar/View.js b/apps/documenteditor/mobile/app/controller/toolbar/View.js index 3f2caeae8..ea48a9a53 100644 --- a/apps/documenteditor/mobile/app/controller/toolbar/View.js +++ b/apps/documenteditor/mobile/app/controller/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.controller.toolbar.View', { extend: 'Ext.app.Controller', diff --git a/apps/documenteditor/mobile/app/profile/Phone.js b/apps/documenteditor/mobile/app/profile/Phone.js index c6597b16d..aceb00f37 100644 --- a/apps/documenteditor/mobile/app/profile/Phone.js +++ b/apps/documenteditor/mobile/app/profile/Phone.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.profile.Phone', { extend: 'Ext.app.Profile', diff --git a/apps/documenteditor/mobile/app/profile/Tablet.js b/apps/documenteditor/mobile/app/profile/Tablet.js index f14d20d5b..942eb7257 100644 --- a/apps/documenteditor/mobile/app/profile/Tablet.js +++ b/apps/documenteditor/mobile/app/profile/Tablet.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.profile.Tablet', { extend: 'Ext.app.Profile', diff --git a/apps/documenteditor/mobile/app/view/Main.js b/apps/documenteditor/mobile/app/view/Main.js index 4a67dde65..408be57f1 100644 --- a/apps/documenteditor/mobile/app/view/Main.js +++ b/apps/documenteditor/mobile/app/view/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.Main', { extend: 'Ext.Container', diff --git a/apps/documenteditor/mobile/app/view/phone/Main.js b/apps/documenteditor/mobile/app/view/phone/Main.js index 7c67addd2..edcc45e78 100644 --- a/apps/documenteditor/mobile/app/view/phone/Main.js +++ b/apps/documenteditor/mobile/app/view/phone/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.phone.Main', { extend: 'DE.view.Main', alias: 'widget.dephonemain', diff --git a/apps/documenteditor/mobile/app/view/phone/toolbar/Search.js b/apps/documenteditor/mobile/app/view/phone/toolbar/Search.js index 44391c859..850f2318c 100644 --- a/apps/documenteditor/mobile/app/view/phone/toolbar/Search.js +++ b/apps/documenteditor/mobile/app/view/phone/toolbar/Search.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.phone.toolbar.Search', { extend: 'Ext.Toolbar', xtype: 'searchtoolbar', diff --git a/apps/documenteditor/mobile/app/view/phone/toolbar/View.js b/apps/documenteditor/mobile/app/view/phone/toolbar/View.js index 30e120069..ef45076cc 100644 --- a/apps/documenteditor/mobile/app/view/phone/toolbar/View.js +++ b/apps/documenteditor/mobile/app/view/phone/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.phone.toolbar.View', { extend: 'Ext.Toolbar', xtype: 'viewtoolbar', diff --git a/apps/documenteditor/mobile/app/view/tablet/Main.js b/apps/documenteditor/mobile/app/view/tablet/Main.js index aabeb7e6f..c73f763e5 100644 --- a/apps/documenteditor/mobile/app/view/tablet/Main.js +++ b/apps/documenteditor/mobile/app/view/tablet/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.Main', { extend: 'DE.view.Main', alias: 'widget.detabletmain', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/Font.js b/apps/documenteditor/mobile/app/view/tablet/panel/Font.js index 9f879c16a..2b7a406b1 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/Font.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/Font.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.Font', { extend: 'Common.view.PopoverPanel', alias: 'widget.fontpanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/FontStyle.js b/apps/documenteditor/mobile/app/view/tablet/panel/FontStyle.js index a91a6c2ff..a61fa2cab 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/FontStyle.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/FontStyle.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.FontStyle', { extend: 'Common.view.PopoverPanel', alias: 'widget.fontstylepanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/Insert.js b/apps/documenteditor/mobile/app/view/tablet/panel/Insert.js index 9340c5bf2..548e2b44e 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/Insert.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/Insert.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.Insert', { extend: 'Common.view.PopoverPanel', alias: 'widget.insertpanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/ListStyle.js b/apps/documenteditor/mobile/app/view/tablet/panel/ListStyle.js index 6dc1f37b5..c43238323 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/ListStyle.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/ListStyle.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.ListStyle', { extend: 'Common.view.PopoverPanel', alias: 'widget.liststylepanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/ParagraphAlignment.js b/apps/documenteditor/mobile/app/view/tablet/panel/ParagraphAlignment.js index 5efe5390f..811d2dcf8 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/ParagraphAlignment.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/ParagraphAlignment.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.ParagraphAlignment', { extend: 'Common.view.PopoverPanel', alias: 'widget.paragraphalignmentpanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/Spacing.js b/apps/documenteditor/mobile/app/view/tablet/panel/Spacing.js index 6f6d97fdb..04b302d11 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/Spacing.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/Spacing.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.Spacing', { extend: 'Common.view.PopoverPanel', alias: 'widget.spacingpanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/panel/TextColor.js b/apps/documenteditor/mobile/app/view/tablet/panel/TextColor.js index fdae00c0f..740667e9e 100644 --- a/apps/documenteditor/mobile/app/view/tablet/panel/TextColor.js +++ b/apps/documenteditor/mobile/app/view/tablet/panel/TextColor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.panel.TextColor', { extend: 'Common.view.PopoverPanel', alias: 'widget.textcolorsettingspanel', diff --git a/apps/documenteditor/mobile/app/view/tablet/toolbar/Edit.js b/apps/documenteditor/mobile/app/view/tablet/toolbar/Edit.js index 2a67bbf96..e8b02c4f1 100644 --- a/apps/documenteditor/mobile/app/view/tablet/toolbar/Edit.js +++ b/apps/documenteditor/mobile/app/view/tablet/toolbar/Edit.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.toolbar.Edit', { extend: 'Ext.Toolbar', xtype: 'edittoolbar', diff --git a/apps/documenteditor/mobile/app/view/tablet/toolbar/Search.js b/apps/documenteditor/mobile/app/view/tablet/toolbar/Search.js index 690e9fdce..804f42389 100644 --- a/apps/documenteditor/mobile/app/view/tablet/toolbar/Search.js +++ b/apps/documenteditor/mobile/app/view/tablet/toolbar/Search.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.toolbar.Search', { extend: 'Ext.Toolbar', xtype: 'searchtoolbar', diff --git a/apps/documenteditor/mobile/app/view/tablet/toolbar/View.js b/apps/documenteditor/mobile/app/view/tablet/toolbar/View.js index 1939f9fc7..2da3b6b9a 100644 --- a/apps/documenteditor/mobile/app/view/tablet/toolbar/View.js +++ b/apps/documenteditor/mobile/app/view/tablet/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('DE.view.tablet.toolbar.View', { extend: 'Ext.Toolbar', xtype: 'viewtoolbar', diff --git a/apps/documenteditor/mobile/index.html b/apps/documenteditor/mobile/index.html index 4a060ea75..4ba0132ba 100644 --- a/apps/documenteditor/mobile/index.html +++ b/apps/documenteditor/mobile/index.html @@ -215,10 +215,12 @@ - - - - + + - + + - - - + + diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index 6ba05fca9..9978f153f 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -292,8 +292,8 @@ - - + + diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index df51eca41..4bae81599 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ var ApplicationController = new(function(){ var me, api, @@ -136,7 +168,7 @@ var ApplicationController = new(function(){ if (docConfig) { permissions = $.extend(permissions, docConfig.permissions); - var docInfo = new CDocInfo(); + var docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(docConfig.key); docInfo.put_Url(docConfig.url); docInfo.put_Title(docConfig.title); @@ -182,7 +214,7 @@ var ApplicationController = new(function(){ var text = ''; switch (id) { - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: text = 'Downloading document...'; break; default: @@ -190,7 +222,7 @@ var ApplicationController = new(function(){ break; } - if (type == c_oAscAsyncActionType['BlockInteraction']) { + if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { $('#id-loadmask .cmd-loader-title').html(text); showMask(); } @@ -327,19 +359,19 @@ var ApplicationController = new(function(){ switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: message = me.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: message = me.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: message = me.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: message = me.downloadErrorText; break; @@ -348,7 +380,7 @@ var ApplicationController = new(function(){ break; } - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, message); @@ -399,7 +431,7 @@ var ApplicationController = new(function(){ } function onDownloadAs() { - if (api) api.asc_DownloadAs(c_oAscFileType.PPTX, true); + if (api) api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true); } // Helpers // ------------------------- @@ -680,13 +712,12 @@ var ApplicationController = new(function(){ }, 2000); }); - api = new asc_docs_api("editor_sdk"); + api = new Asc.asc_docs_api({ + 'id-view' : 'editor_sdk' + }); if (api){ - api.CreateComponents(); - api.asc_SetFontsPath("../../../sdk/Fonts/"); - api.SetThemesPath("../../../sdk/PowerPoint/themes/"); - api.Init(); + api.SetThemesPath("../../../../sdkjs/slide/themes/"); api.asc_registerCallback('asc_onError', onError); api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady); diff --git a/apps/presentationeditor/embed/js/ApplicationView.js b/apps/presentationeditor/embed/js/ApplicationView.js index 8e3677a73..a42c5c2cc 100644 --- a/apps/presentationeditor/embed/js/ApplicationView.js +++ b/apps/presentationeditor/embed/js/ApplicationView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ var ApplicationView = new(function(){ // Initialize view diff --git a/apps/presentationeditor/embed/js/application.js b/apps/presentationeditor/embed/js/application.js index e8bdeab02..541640578 100644 --- a/apps/presentationeditor/embed/js/application.js +++ b/apps/presentationeditor/embed/js/application.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ (function ($) { $(function(){ diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index 00d1e505e..ab2809514 100644 --- a/apps/presentationeditor/main/app.js +++ b/apps/presentationeditor/main/app.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * app.js * @@ -24,8 +56,8 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', - allfonts : '../sdk/Common/AllFonts', - sdk : '../sdk/PowerPoint/sdk-all', + allfonts : '../../sdkjs/common/AllFonts', + sdk : '../../sdkjs/slide/sdk-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', diff --git a/apps/presentationeditor/main/app/collection/ShapeGroups.js b/apps/presentationeditor/main/app/collection/ShapeGroups.js index 08155b921..d171cf170 100644 --- a/apps/presentationeditor/main/app/collection/ShapeGroups.js +++ b/apps/presentationeditor/main/app/collection/ShapeGroups.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeGroups.js * diff --git a/apps/presentationeditor/main/app/collection/SlideLayouts.js b/apps/presentationeditor/main/app/collection/SlideLayouts.js index c716a3e72..ef69e9bb7 100644 --- a/apps/presentationeditor/main/app/collection/SlideLayouts.js +++ b/apps/presentationeditor/main/app/collection/SlideLayouts.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * SlideLayouts.js * diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 714fcb8ce..f44a78564 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentHolder.js * diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index afe048c4e..ff3520ff6 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * LeftMenu.js * @@ -180,15 +212,12 @@ define([ /** coauthoring begin **/ if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline) { value = Common.localStorage.getItem("pe-settings-coauthmode"); - var fast_coauth = (value===null || parseInt(value) == 1); this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1); } /** coauthoring end **/ - if (this.mode.canAutosave) { - value = Common.localStorage.getItem("pe-settings-autosave"); - this.api.asc_setAutoSaveGap(parseInt(value)); - } + value = Common.localStorage.getItem("pe-settings-autosave"); + this.api.asc_setAutoSaveGap(parseInt(value)); value = Common.localStorage.getItem("pe-settings-showsnaplines"); this.api.put_ShowSnapLines(value===null || parseInt(value) == 1); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index f3c745176..a60df5b53 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Main.js * @@ -73,16 +105,14 @@ define([ // Initialize api - this.api = new asc_docs_api("editor_sdk"); + window["flat_desine"] = true; + this.api = new Asc.asc_docs_api({ + 'id-view' : 'editor_sdk' + }); if (this.api){ - window["flat_desine"] = true; - - this.api.CreateComponents(); this.api.SetDrawingFreeze(true); - this.api.asc_SetFontsPath("../../../sdk/Fonts/"); - this.api.SetThemesPath("../../../sdk/PowerPoint/themes/"); - this.api.Init(); + this.api.SetThemesPath("../../../../sdkjs/slide/themes/"); this.api.asc_registerCallback('asc_onError', _.bind(this.onError, this)); this.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(this.onDocumentContentReady, this)); @@ -124,7 +154,7 @@ define([ /* * TODO: Workaround bug #25004. Clipboard feature processing in sdk. */ - if (!(Common.Utils.isSafari && Common.Utils.isMac)) { + if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) { me.api.asc_enableKeyEvents(true); if (/msg-reply/.test(e.target.className)) me.dontCloseDummyComment = false; @@ -186,6 +216,7 @@ define([ this.appOptions.recent = this.editorConfig.recent; this.appOptions.createUrl = this.editorConfig.createUrl; this.appOptions.lang = this.editorConfig.lang; + this.appOptions.location = (typeof (this.editorConfig.location) == 'string') ? this.editorConfig.location.toLowerCase() : ''; this.appOptions.sharingSettingsUrl = this.editorConfig.sharingSettingsUrl; this.appOptions.canAnalytics = false; this.appOptions.customization = this.editorConfig.customization; @@ -200,6 +231,9 @@ define([ if (this.editorConfig.lang) this.api.asc_setLocale(this.editorConfig.lang); + + if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') + Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); }, loadDocument: function(data) { @@ -211,13 +245,13 @@ define([ if (data.doc) { this.permissions = $.extend(this.permissions, data.doc.permissions); - var _user = new CUserInfo(); + var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); _user.put_FirstName(this.appOptions.user.firstname); _user.put_LastName(this.appOptions.user.lastname); _user.put_FullName(this.appOptions.user.fullname); - docInfo = new CDocInfo(); + docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(data.doc.key); docInfo.put_Url(data.doc.url); docInfo.put_Title(data.doc.title); @@ -271,7 +305,7 @@ define([ }, onDownloadAs: function() { - this.api.asc_DownloadAs(c_oAscFileType.PPTX, true); + this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true); }, onProcessMouse: function(data) { @@ -327,31 +361,31 @@ define([ this.updateWindowTitle(true); - action = this.stackLongActions.get({type: c_oAscAsyncActionType.Information}); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); if (action) { this.setLongActionView(action) } else { - if (this._state.fastCoauth && this._state.usersCount>1 && id==c_oAscAsyncAction['Save']) { + if (this._state.fastCoauth && this._state.usersCount>1 && id==Asc.c_oAscAsyncAction['Save']) { var me = this; if (me._state.timerSave===undefined) me._state.timerSave = setInterval(function(){ - if ((new Date()) - me._state.isSaving>2000) { + if ((new Date()) - me._state.isSaving>500) { clearInterval(me._state.timerSave); me.getApplication().getController('Statusbar').setStatusCaption(''); me._state.timerSave = undefined; } - }, 2000); + }, 500); } else this.getApplication().getController('Statusbar').setStatusCaption(''); } - action = this.stackLongActions.get({type: c_oAscAsyncActionType.BlockInteraction}); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide(); - if (id==c_oAscAsyncAction['Save'] && (!this._state.fastCoauth || this._state.usersCount<2)) + if (id==Asc.c_oAscAsyncAction['Save'] && (!this._state.fastCoauth || this._state.usersCount<2)) this.synchronizeChanges(); - if (type == c_oAscAsyncActionType.BlockInteraction && !((id == c_oAscAsyncAction['LoadDocumentFonts'] || id == c_oAscAsyncAction['ApplyChanges']) && this.dontCloseDummyComment )) { + if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && this.dontCloseDummyComment )) { this.onEditComplete(this.loadMask); this.api.asc_enableKeyEvents(true); } @@ -361,63 +395,63 @@ define([ var title = '', text = ''; switch (action.id) { - case c_oAscAsyncAction['Open']: + case Asc.c_oAscAsyncAction['Open']: title = this.openTitleText; text = this.openTextText; break; - case c_oAscAsyncAction['Save']: + case Asc.c_oAscAsyncAction['Save']: this._state.isSaving = new Date(); title = this.saveTitleText; text = this.saveTextText; break; - case c_oAscAsyncAction['LoadDocumentFonts']: + case Asc.c_oAscAsyncAction['LoadDocumentFonts']: title = this.loadFontsTitleText; text = this.loadFontsTextText; break; - case c_oAscAsyncAction['LoadDocumentImages']: + case Asc.c_oAscAsyncAction['LoadDocumentImages']: title = this.loadImagesTitleText; text = this.loadImagesTextText; break; - case c_oAscAsyncAction['LoadFont']: + case Asc.c_oAscAsyncAction['LoadFont']: title = this.loadFontTitleText; text = this.loadFontTextText; break; - case c_oAscAsyncAction['LoadImage']: + case Asc.c_oAscAsyncAction['LoadImage']: title = this.loadImageTitleText; text = this.loadImageTextText; break; - case c_oAscAsyncAction['DownloadAs']: + case Asc.c_oAscAsyncAction['DownloadAs']: title = this.downloadTitleText; text = this.downloadTextText; break; - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: title = this.printTitleText; text = this.printTextText; break; - case c_oAscAsyncAction['UploadImage']: + case Asc.c_oAscAsyncAction['UploadImage']: title = this.uploadImageTitleText; text = this.uploadImageTextText; break; - case c_oAscAsyncAction['LoadTheme']: + case Asc.c_oAscAsyncAction['LoadTheme']: title = this.loadThemeTitleText; text = this.loadThemeTextText; break; - case c_oAscAsyncAction['ApplyChanges']: + case Asc.c_oAscAsyncAction['ApplyChanges']: title = this.applyChangesTitleText; text = this.applyChangesTextText; break; - case c_oAscAsyncAction['PrepareToSave']: + case Asc.c_oAscAsyncAction['PrepareToSave']: title = this.savePreparingText; text = this.savePreparingTitle; break; @@ -433,7 +467,7 @@ define([ break; } - if (action.type == c_oAscAsyncActionType['BlockInteraction']) { + if (action.type == Asc.c_oAscAsyncActionType['BlockInteraction']) { if (!this.loadMask) this.loadMask = new Common.UI.LoadMask({owner: $('#viewport')}); @@ -454,7 +488,7 @@ define([ data.requestrights = true; this.appOptions.isEdit= true; - this.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); + this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); var me = this; setTimeout(function(){ @@ -490,7 +524,7 @@ define([ me.api.asc_registerCallback('asc_onFocusObject', _.bind(me.onFocusObject, me)); me.api.asc_registerCallback('asc_onUpdateLayout', _.bind(me.fillLayoutsStore, me)); // slide layouts loading me.updateThemeColors(); - var shapes = me.api.get_PropertyEditorShapes(); + var shapes = me.api.asc_getPropertyEditorShapes(); if (shapes) me.fillAutoShapes(shapes[0], shapes[1]); me.fillTextArt(me.api.asc_getTextArtPreviews()); @@ -515,26 +549,32 @@ define([ return; var me = this, - value, - tips = []; + value; me._isDocReady = true; me.api.SetDrawingFreeze(false); me.hidePreloader(); - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); value = Common.localStorage.getItem("pe-settings-zoom"); var zf = (value!==null) ? parseInt(value) : -1; (zf == -1) ? this.api.zoomFitToPage() : this.api.zoom(zf); - if (!window['AscDesktopEditor']) { - Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - !Common.Utils.isGecko && (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}')); + function checkWarns() { + if (!window['AscDesktopEditor']) { + var tips = []; + Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - if (tips.length) me.showTips(tips); + if (tips.length) me.showTips(tips); + } + document.removeEventListener('visibilitychange', checkWarns); } + if (typeof document.hidden !== 'undefined' && document.hidden) { + document.addEventListener('visibilitychange', checkWarns); + } else checkWarns(); + me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me)); me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me)); me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me)); @@ -589,6 +629,10 @@ define([ application.getController('Viewport').getView('DocumentPreview').setApi(me.api).setMode(me.appOptions).on('editcomplete', _.bind(me.onEditComplete, me)); if (me.appOptions.isEdit) { + value = Common.localStorage.getItem("pe-settings-autosave"); + value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : 1; + me.api.asc_setAutoSaveGap(value); + if (me.needToUpdateVersion) Common.NotificationCenter.trigger('api:disconnect'); var timer_sl = setInterval(function(){ @@ -604,7 +648,7 @@ define([ me.api.asc_registerCallback('asc_onFocusObject', _.bind(me.onFocusObject, me)); me.api.asc_registerCallback('asc_onUpdateLayout', _.bind(me.fillLayoutsStore, me)); // slide layouts loading me.updateThemeColors(); - var shapes = me.api.get_PropertyEditorShapes(); + var shapes = me.api.asc_getPropertyEditorShapes(); if (shapes) me.fillAutoShapes(shapes[0], shapes[1]); me.fillTextArt(me.api.asc_getTextArtPreviews()); @@ -616,14 +660,6 @@ define([ }, 50); } - if (me.appOptions.canAutosave) { - value = Common.localStorage.getItem("pe-settings-autosave"); - value = (value!==null) ? parseInt(value) : 1; - } else { - value = 0; - } - me.api.asc_setAutoSaveGap(value); - if (this.appOptions.canAnalytics && false) Common.component.Analytics.initialize('UA-12442749-13', 'Presentation Editor'); @@ -644,14 +680,19 @@ define([ if (now - value > 86400000) { Common.localStorage.setItem("de-license-warning", now); Common.UI.info({ + width: 400, title: this.textNoLicenseTitle, msg : this.warnNoLicense, - buttons: ['custom'], - primary: 'custom', - customButtonText: this.textBuyNow, + buttons: [ + {value: 'buynow', caption: this.textBuyNow}, + {value: 'contact', caption: this.textContactUs} + ], + primary: 'buynow', callback: function(btn) { - if (btn == 'custom') + if (btn == 'buynow') window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank"); + else if (btn == 'contact') + window.open('mailto:sales@onlyoffice.com', "_blank"); } }); } @@ -675,7 +716,6 @@ define([ (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined this.appOptions.isEdit = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; this.appOptions.canDownload = !this.appOptions.nativeApp && this.permissions.download !== false; - this.appOptions.canAutosave = this.editorConfig.canAutosave !== false && params.asc_getIsAutosaveEnable(); this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); this.appOptions.canComments = this.appOptions.canLicense && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false); this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false); @@ -700,7 +740,7 @@ define([ if (!this.appOptions.isEdit) { this.hidePreloader(); - this.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } }, @@ -736,7 +776,7 @@ define([ translateChart.asc_setSeries(this.txtSeries); this.api.asc_setChartTranslate(translateChart); - var translateArt = new asc_TextArtTranslate(); + var translateArt = new Asc.asc_TextArtTranslate(); translateArt.asc_setDefaultText(this.txtArt); this.api.asc_setTextArtTranslate(translateArt); } @@ -789,7 +829,9 @@ define([ } var value = Common.localStorage.getItem('pe-settings-unit'); - Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); + value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); + Common.Utils.Metric.setCurrentMetric(value); + me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); value = Common.localStorage.getItem('pe-hidden-rulers'); if (me.api.asc_SetViewRulers) me.api.asc_SetViewRulers(value===null || parseInt(value) === 0); @@ -806,11 +848,11 @@ define([ me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); /** coauthoring end **/ - if (me.stackLongActions.exist({id: ApplyEditRights, type: c_oAscAsyncActionType['BlockInteraction']})) { - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); + if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); } else if (!this._isDocReady) { me.hidePreloader(); - me.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } // Message on window close @@ -830,7 +872,7 @@ define([ onError: function(id, level, errData) { this.hidePreloader(); - this.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); var config = { closable: false @@ -838,79 +880,79 @@ define([ switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: config.msg = this.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: config.msg = this.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: config.msg = this.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: config.msg = this.downloadErrorText; break; - case c_oAscError.ID.UplImageSize: + case Asc.c_oAscError.ID.UplImageSize: config.msg = this.uploadImageSizeMessage; break; - case c_oAscError.ID.UplImageExt: + case Asc.c_oAscError.ID.UplImageExt: config.msg = this.uploadImageExtMessage; break; - case c_oAscError.ID.UplImageFileCount: + case Asc.c_oAscError.ID.UplImageFileCount: config.msg = this.uploadImageFileCountMessage; break; - case c_oAscError.ID.SplitCellMaxRows: + case Asc.c_oAscError.ID.SplitCellMaxRows: config.msg = this.splitMaxRowsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellMaxCols: + case Asc.c_oAscError.ID.SplitCellMaxCols: config.msg = this.splitMaxColsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellRowsDivider: + case Asc.c_oAscError.ID.SplitCellRowsDivider: config.msg = this.splitDividerErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.VKeyEncrypt: + case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorKeyEncrypt; break; - case c_oAscError.ID.KeyExpire: + case Asc.c_oAscError.ID.KeyExpire: config.msg = this.errorKeyExpire; break; - case c_oAscError.ID.UserCountExceed: + case Asc.c_oAscError.ID.UserCountExceed: config.msg = this.errorUsersExceed; break; - case c_oAscError.ID.CoAuthoringDisconnect: + case Asc.c_oAscError.ID.CoAuthoringDisconnect: config.msg = this.errorCoAuthoringDisconnect; break; - case c_oAscError.ID.ConvertationPassword: + case Asc.c_oAscError.ID.ConvertationPassword: config.msg = this.errorFilePassProtect; break; - case c_oAscError.ID.StockChartError: + case Asc.c_oAscError.ID.StockChartError: config.msg = this.errorStockChart; break; - case c_oAscError.ID.DataRangeError: + case Asc.c_oAscError.ID.DataRangeError: config.msg = this.errorDataRange; break; - case c_oAscError.ID.Database: + case Asc.c_oAscError.ID.Database: config.msg = this.errorDatabaseConnection; break; - case c_oAscError.ID.UserDrop: + case Asc.c_oAscError.ID.UserDrop: if (this._state.lostEditingRights) { this._state.lostEditingRights = false; return; @@ -919,7 +961,7 @@ define([ config.msg = this.errorUserDrop; break; - case c_oAscError.ID.Warning: + case Asc.c_oAscError.ID.Warning: config.msg = this.errorConnectToServer; break; @@ -929,7 +971,7 @@ define([ } - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, config.msg); @@ -951,7 +993,7 @@ define([ config.iconCls = 'warn'; config.buttons = ['ok']; config.callback = _.bind(function(btn){ - if (id == c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { + if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { Common.UI.Menu.Manager.hideAll(); (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas'); } @@ -972,20 +1014,6 @@ define([ // this.getFileMenu().setMode({isDisconnected:true}); }, - getBrowseZoomLevel: function() { - if (Common.Utils.isIE) { - return screen.logicalXDPI/screen.deviceXDPI; - } else { - var zoom = window.outerWidth / document.documentElement.clientWidth; - - if (Common.Utils.isSafari) { - zoom = Math.floor(zoom * 10) / 10; - } - - return zoom; - } - }, - showTips: function(strings) { var me = this; if (!strings.length) return; @@ -1140,14 +1168,14 @@ define([ onUpdateVersion: function(callback) { var me = this; me.needToUpdateVersion = true; - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); Common.UI.error({ msg: this.errorUpdateVersion, callback: function() { _.defer(function() { Common.Gateway.updateVersion(); if (callback) callback.call(me); - me.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); }) } }); @@ -1229,7 +1257,9 @@ define([ unitsChanged: function(m) { var value = Common.localStorage.getItem("pe-settings-unit"); - Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); + value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); + Common.Utils.Metric.setCurrentMetric(value); + this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); this.getApplication().getController('RightMenu').updateMetricUnit(); }, @@ -1563,8 +1593,9 @@ define([ textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.
    Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.', textStrict: 'Strict mode', textBuyNow: 'Buy now', - textNoLicenseTitle: 'License expired', - warnNoLicense: 'The license expired. You cannot create or edit files.
    Click the \'Buy now\' button to prolong the license.' + textNoLicenseTitle: 'License expired or not found', + warnNoLicense: 'The license could not be found or expired. You cannot edit files.
    Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.', + textContactUs: 'Contact us' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js index a6a677608..cc4919e67 100644 --- a/apps/presentationeditor/main/app/controller/RightMenu.js +++ b/apps/presentationeditor/main/app/controller/RightMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * RightMenu.js * @@ -71,7 +103,7 @@ define([ this.rightmenu.fireEvent('editcomplete', this.rightmenu); }, - onFocusObject: function(SelectedObjects) { + onFocusObject: function(SelectedObjects, open) { if (!this.editMode) return; @@ -147,7 +179,7 @@ define([ } } - if (!this.rightmenu.minimizedMode) { + if (!this.rightmenu.minimizedMode || open) { var active; if (priorityactive>-1) active = priorityactive; @@ -156,7 +188,7 @@ define([ else active = Common.Utils.documentSettingsType.Slide; if (active !== undefined) { - this.rightmenu.SetActivePane(active); + this.rightmenu.SetActivePane(active, open); this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props); } } @@ -214,8 +246,12 @@ define([ this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this)); var selectedElements = this.api.getSelectedElements(); - if (selectedElements.length>0) - this.onFocusObject(selectedElements); + if (selectedElements.length>0) { + var open = Common.localStorage.getItem("pe-hide-right-settings"); + open = (open===null || parseInt(open) == 0); + + this.onFocusObject(selectedElements, open); + } } }, @@ -244,17 +280,17 @@ define([ getDocumentSettingsType: function(type) { switch (type) { - case c_oAscTypeSelectElement.Paragraph: + case Asc.c_oAscTypeSelectElement.Paragraph: return Common.Utils.documentSettingsType.Paragraph; - case c_oAscTypeSelectElement.Table: + case Asc.c_oAscTypeSelectElement.Table: return Common.Utils.documentSettingsType.Table; - case c_oAscTypeSelectElement.Image: + case Asc.c_oAscTypeSelectElement.Image: return Common.Utils.documentSettingsType.Image; - case c_oAscTypeSelectElement.Shape: + case Asc.c_oAscTypeSelectElement.Shape: return Common.Utils.documentSettingsType.Shape; - case c_oAscTypeSelectElement.Slide: + case Asc.c_oAscTypeSelectElement.Slide: return Common.Utils.documentSettingsType.Slide; - case c_oAscTypeSelectElement.Chart: + case Asc.c_oAscTypeSelectElement.Chart: return Common.Utils.documentSettingsType.Chart; } } diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index 71c2f03d6..b409cf6f4 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Statusbar.js * @@ -89,18 +121,23 @@ define([ }, onPreview: function(btn, e) { - var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel) { + var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), + me = this; + if (previewPanel && me.api) { previewPanel.show(); - if (!this.statusbar.mode.isDesktopApp) - this.fullScreen(document.documentElement); + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); - if (this.api) { - var current = this.api.getCurrentPage(); - this.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); + var current = me.api.getCurrentPage(); + me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); Common.component.Analytics.trackEvent('Status Bar', 'Preview'); - } + }; + if (!me.statusbar.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 51e233882..0b2bf0b24 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Toolbar.js * @@ -37,6 +69,7 @@ define([ slidelayoutdisable:undefined, shapecontrolsdisable:undefined, no_paragraph: undefined, + no_text: undefined, no_object: undefined, clrtext: undefined, linespace: undefined, @@ -255,8 +288,6 @@ define([ this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this)); - this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight()); - this.onSetupCopyStyleButton(); }, @@ -429,9 +460,9 @@ define([ btnVerticalAlign = this.toolbar.btnVerticalAlign; switch (v) { - case c_oAscVerticalTextAlign.TEXT_ALIGN_TOP: index = 0; align = 'btn-align-top'; break; - case c_oAscVerticalTextAlign.TEXT_ALIGN_CTR: index = 1; align = 'btn-align-middle'; break; - case c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM: index = 2; align = 'btn-align-bottom'; break; + case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP: index = 0; align = 'btn-align-top'; break; + case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR: index = 1; align = 'btn-align-middle'; break; + case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM: index = 2; align = 'btn-align-bottom'; break; default: index = -255; align = 'btn-align-middle'; break; } @@ -530,21 +561,26 @@ define([ slide_deleted = undefined, slide_layout_lock = undefined, no_paragraph = true, + no_text = true, no_object = true; while (++i < selectedObjects.length) { type = selectedObjects[i].get_ObjectType(); pr = selectedObjects[i].get_ObjectValue(); - if (type == c_oAscTypeSelectElement.Paragraph) { + if (type == Asc.c_oAscTypeSelectElement.Paragraph) { paragraph_locked = pr.get_Locked(); no_paragraph = false; + no_text = false; no_object = false; - } else if (type == c_oAscTypeSelectElement.Slide) { + } else if (type == Asc.c_oAscTypeSelectElement.Slide) { slide_deleted = pr.get_LockDelete(); slide_layout_lock = pr.get_LockLayout(); - } else if (type == c_oAscTypeSelectElement.Image || type == c_oAscTypeSelectElement.Shape || type == c_oAscTypeSelectElement.Chart || type == c_oAscTypeSelectElement.Table) { + } else if (type == Asc.c_oAscTypeSelectElement.Image || type == Asc.c_oAscTypeSelectElement.Shape || type == Asc.c_oAscTypeSelectElement.Chart || type == Asc.c_oAscTypeSelectElement.Table) { shape_locked = pr.get_Locked(); no_object = false; + if (type !== Asc.c_oAscTypeSelectElement.Image) { + no_text = false; + } } } @@ -559,9 +595,14 @@ define([ this.toolbar.lockToolbar(PE.enumLock.noParagraphSelected, no_paragraph, {array: [me.toolbar.btnCopyStyle]}); } + if (this._state.no_text !== no_text) { + if (this._state.activated) this._state.no_text = no_text; + this.toolbar.lockToolbar(PE.enumLock.noTextSelected, no_text, {array: me.toolbar.paragraphControls}); + } + if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) { if (this._state.activated) this._state.shapecontrolsdisable = shape_locked; - this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls}); + this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls)}); } if (this._state.no_object !== no_object ) { @@ -705,18 +746,23 @@ define([ }, onPreview: function(btn, e) { - var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel) { + var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), + me = this; + if (previewPanel && me.api) { previewPanel.show(); - if (!this.toolbar.mode.isDesktopApp) - this.fullScreen(document.documentElement); + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); - if (this.api) { - var current = this.api.getCurrentPage(); - this.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); + var current = me.api.getCurrentPage(); + me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); Common.component.Analytics.trackEvent('ToolBar', 'Preview'); - } + }; + if (!me.toolbar.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } }, @@ -1155,7 +1201,7 @@ define([ slides: _arr }); - props = new CHyperlinkProperty(); + props = new Asc.CHyperlinkProperty(); props.put_Text(text); win.show(); @@ -1488,7 +1534,7 @@ define([ var picker = this.toolbar.mnuFontColorPicker; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; } else clr = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); @@ -1598,11 +1644,6 @@ define([ me.toolbar.btnInsertText.menu.hide(); Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertText); Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art'); - - if (e.type !== 'click') - me.toolbar.btnInsertText.menu.hide(); - Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertText); - Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art'); } }); } @@ -1720,6 +1761,7 @@ define([ }, activateControls: function() { + this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight()); this.toolbar.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.toolbar.slideOnlyControls.concat(this.toolbar.shapeControls)}); this._state.activated = true; }, diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index baff926e6..fce3c2cf0 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Viewport.js * @@ -91,6 +123,7 @@ define([ onWindowResize: function(e) { this.onLayoutChanged('window'); + Common.NotificationCenter.trigger('window:resize'); } }); }); diff --git a/apps/presentationeditor/main/app/model/Pages.js b/apps/presentationeditor/main/app/model/Pages.js index 0099848da..39eab43f5 100644 --- a/apps/presentationeditor/main/app/model/Pages.js +++ b/apps/presentationeditor/main/app/model/Pages.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ 'backbone' diff --git a/apps/presentationeditor/main/app/model/ShapeGroup.js b/apps/presentationeditor/main/app/model/ShapeGroup.js index 995ba227c..f9a5a42f4 100644 --- a/apps/presentationeditor/main/app/model/ShapeGroup.js +++ b/apps/presentationeditor/main/app/model/ShapeGroup.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeGroup.js * diff --git a/apps/presentationeditor/main/app/model/SlideLayout.js b/apps/presentationeditor/main/app/model/SlideLayout.js index f6a166f24..3a7ba8777 100644 --- a/apps/presentationeditor/main/app/model/SlideLayout.js +++ b/apps/presentationeditor/main/app/model/SlideLayout.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * SlideLayout.js * diff --git a/apps/presentationeditor/main/app/template/ParagraphSettings.template b/apps/presentationeditor/main/app/template/ParagraphSettings.template index b6a5f2137..5c680a54c 100644 --- a/apps/presentationeditor/main/app/template/ParagraphSettings.template +++ b/apps/presentationeditor/main/app/template/ParagraphSettings.template @@ -1,19 +1,22 @@ + + +
    - +
    -
    		-
    + +
    diff --git a/apps/presentationeditor/main/app/template/RightMenu.template b/apps/presentationeditor/main/app/template/RightMenu.template index 6a34f6b22..d8119b24b 100644 --- a/apps/presentationeditor/main/app/template/RightMenu.template +++ b/apps/presentationeditor/main/app/template/RightMenu.template @@ -14,6 +14,8 @@
    +
    +
    diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index c981ea9a6..0d6d3fde5 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -196,7 +196,7 @@
    -
    +
    diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 4d98f69c2..175d1d459 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ChartSettings.js * @@ -39,7 +71,8 @@ define([ ChartStyle: 1, ChartType: -1, SeveralCharts: false, - DisabledControls: false + DisabledControls: false, + keepRatio: false }; this._nRatio = 1; this.spinners = []; @@ -76,31 +109,31 @@ define([ { id: 'menu-chart-group-stock', caption: me.textStock } ]), store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} ]), itemTemplate: _.template('
    ') }); @@ -181,15 +214,16 @@ define([ this.btnRatio.render($('#chart-button-ratio')) ; this.lockedControls.push(this.btnRatio); - var value = Common.localStorage.getItem("pe-settings-chartratio"); - if (value!==null && parseInt(value) == 1) { - this.btnRatio.toggle(true); - } this.btnRatio.on('click', _.bind(function(btn, e) { if (btn.pressed && this.spnHeight.getNumberValue()>0) { this._nRatio = this.spnWidth.getNumberValue()/this.spnHeight.getNumberValue(); } - Common.localStorage.setItem("pe-settings-chartratio", (btn.pressed) ? 1 : 0); + if (this.api) { + var props = new Asc.CAscChartProp(); + props.asc_putLockAspect(btn.pressed); + this.api.ChartApply(props); + } + this.fireEvent('editcomplete', this); }, this)); }, @@ -217,7 +251,7 @@ define([ this.disableControls(this._locked); if (props){ - this._originalProps = new CAscChartProp(props); + this._originalProps = new Asc.CAscChartProp(props); this._noApply = true; var value = props.get_SeveralCharts() || this._locked; @@ -280,6 +314,12 @@ define([ if (props.get_Height()>0) this._nRatio = props.get_Width()/props.get_Height(); + + value = props.asc_getLockAspect(); + if (this._state.keepRatio!==value) { + this.btnRatio.toggle(value); + this._state.keepRatio=value; + } } }, @@ -287,8 +327,8 @@ define([ if (this.spinners) { for (var i=0; i0) { var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel && !previewPanel.isVisible()) { + if (previewPanel && !previewPanel.isVisible() && me.api) { previewPanel.show(); - if (!me.mode.isDesktopApp) - me.fullScreen(document.documentElement); - if (me.api) { + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); me.api.StartDemonstration('presentation-preview', 0); - } + }; + if (!me.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } } }; @@ -889,16 +928,21 @@ define([ caption : me.txtPreview }).on('click', function(item) { var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel) { + if (previewPanel && me.api) { previewPanel.show(); - me.fullScreen(document.documentElement); + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); - if (me.api) { var current = me.api.getCurrentPage(); me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); Common.component.Analytics.trackEvent('DocumentHolder', 'Preview'); - } + }; + if (!me.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } }); @@ -946,7 +990,7 @@ define([ lockedLayout = false; if (selectedElements && _.isArray(selectedElements)){ _.each(selectedElements, function(element, index) { - if (c_oAscTypeSelectElement.Slide == element.get_ObjectType()) { + if (Asc.c_oAscTypeSelectElement.Slide == element.get_ObjectType()) { var elValue = element.get_ObjectValue(); locked = elValue.get_LockDelete(); lockedDeleted = elValue.get_LockRemove(); @@ -1070,7 +1114,7 @@ define([ menu : (function(){ function onItemClick(item, e) { if (me.api) { - var properties = new CTableProp(); + var properties = new Asc.CTableProp(); properties.put_CellsVAlign(item.value); me.api.tblApply(properties); } @@ -1086,19 +1130,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popuptablecellalign', - value : c_oAscVertAlignJc.Top + value : Asc.c_oAscVertAlignJc.Top }).on('click', _.bind(onItemClick, me)), me.menuTableCellCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popuptablecellalign', - value : c_oAscVertAlignJc.Center + value : Asc.c_oAscVertAlignJc.Center }).on('click', _.bind(onItemClick, me)), me.menuTableCellBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popuptablecellalign', - value : c_oAscVertAlignJc.Bottom + value : Asc.c_oAscVertAlignJc.Bottom }).on('click', _.bind(onItemClick, me)) ] }) @@ -1117,7 +1161,7 @@ define([ elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Table == elType) { + if (Asc.c_oAscTypeSelectElement.Table == elType) { (new PE.Views.TableSettingsAdvanced( { tableProps: elValue, @@ -1150,7 +1194,7 @@ define([ elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Image == elType) { + if (Asc.c_oAscTypeSelectElement.Image == elType) { var imgsizeOriginal; if (!menuImgOriginalSize.isDisabled()) { @@ -1190,7 +1234,7 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Shape == elType) { + if (Asc.c_oAscTypeSelectElement.Shape == elType) { (new PE.Views.ShapeSettingsAdvanced( { shapeProps: elValue, @@ -1223,7 +1267,7 @@ define([ elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Paragraph == elType) { + if (Asc.c_oAscTypeSelectElement.Paragraph == elType) { (new PE.Views.ParagraphSettingsAdvanced( { paragraphProps: elValue, @@ -1411,32 +1455,32 @@ define([ new Common.UI.MenuItem({ caption : me.textShapeAlignLeft, iconCls : 'mnu-shape-align-left', - value : c_oAscAlignShapeType.ALIGN_LEFT + value : Asc.c_oAscAlignShapeType.ALIGN_LEFT }).on('click', _.bind(onItemClick, me)), new Common.UI.MenuItem({ caption : me.textShapeAlignCenter, iconCls : 'mnu-shape-align-center', - value : c_oAscAlignShapeType.ALIGN_CENTER + value : Asc.c_oAscAlignShapeType.ALIGN_CENTER }).on('click', _.bind(onItemClick, me)), new Common.UI.MenuItem({ caption : me.textShapeAlignRight, iconCls : 'mnu-shape-align-right', - value : c_oAscAlignShapeType.ALIGN_RIGHT + value : Asc.c_oAscAlignShapeType.ALIGN_RIGHT }).on('click', _.bind(onItemClick, me)), new Common.UI.MenuItem({ caption : me.textShapeAlignTop, iconCls : 'mnu-shape-align-top', - value : c_oAscAlignShapeType.ALIGN_TOP + value : Asc.c_oAscAlignShapeType.ALIGN_TOP }).on('click', _.bind(onItemClick, me)), new Common.UI.MenuItem({ caption : me.textShapeAlignMiddle, iconCls : 'mnu-shape-align-middle', - value : c_oAscAlignShapeType.ALIGN_MIDDLE + value : Asc.c_oAscAlignShapeType.ALIGN_MIDDLE }).on('click', _.bind(onItemClick, me)), new Common.UI.MenuItem({ caption : me.textShapeAlignBottom, iconCls : 'mnu-shape-align-bottom', - value : c_oAscAlignShapeType.ALIGN_BOTTOM + value : Asc.c_oAscAlignShapeType.ALIGN_BOTTOM }).on('click', _.bind(onItemClick, me)), {caption : '--'}, new Common.UI.MenuItem({ @@ -1475,7 +1519,7 @@ define([ menu : (function(){ function onItemClick(item) { if (me.api) { - var properties = new CAscShapeProp(); + var properties = new Asc.asc_CShapeProperty(); properties.put_VerticalTextAlign(item.value); me.api.ShapeApply(properties); @@ -1492,19 +1536,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP }).on('click', _.bind(onItemClick, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR }).on('click', _.bind(onItemClick, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM }).on('click', _.bind(onItemClick, me)) ] }) @@ -1513,7 +1557,7 @@ define([ var paragraphDirection = function(item, e) { if (me.api) { - var properties = new CAscShapeProp(); + var properties = new Asc.asc_CShapeProperty(); properties.put_Vert(item.options.direction); me.api.ShapeApply(properties); } @@ -1532,7 +1576,7 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphdirect', - direction : c_oAscVertDrawingText.normal + direction : Asc.c_oAscVertDrawingText.normal }).on('click', _.bind(paragraphDirection, me)), me.menuParagraphDirect90 = new Common.UI.MenuItem({ caption : me.direct90Text, @@ -1540,7 +1584,7 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphdirect', - direction : c_oAscVertDrawingText.vert + direction : Asc.c_oAscVertDrawingText.vert }).on('click', _.bind(paragraphDirection, me)), me.menuParagraphDirect270 = new Common.UI.MenuItem({ caption : me.direct270Text, @@ -1548,7 +1592,7 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphdirect', - direction : c_oAscVertDrawingText.vert270 + direction : Asc.c_oAscVertDrawingText.vert270 }).on('click', _.bind(paragraphDirection, me)) ] }) @@ -1565,7 +1609,7 @@ define([ var originalImageSize = me.api.get_OriginalSizeImage(); if (originalImageSize) { - var properties = new CImgProperty(); + var properties = new Asc.asc_CImgProperty(); properties.put_Width(originalImageSize.get_ImageWidth()); properties.put_Height(originalImageSize.get_ImageHeight()); @@ -1658,14 +1702,14 @@ define([ menuParagraphDirection.setVisible(isInShape && !isInChart); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! if (isInShape || isInChart) { var align = value.shapeProps.value.get_VerticalTextAlign(); - me.menuParagraphTop.setChecked(align == c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - me.menuParagraphCenter.setChecked(align == c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - me.menuParagraphBottom.setChecked(align == c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); + me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); + me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); var dir = value.shapeProps.value.get_Vert(); - me.menuParagraphDirectH.setChecked(dir == c_oAscVertDrawingText.normal); - me.menuParagraphDirect90.setChecked(dir == c_oAscVertDrawingText.vert); - me.menuParagraphDirect270.setChecked(dir == c_oAscVertDrawingText.vert270); + me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); + me.menuParagraphDirect90.setChecked(dir == Asc.c_oAscVertDrawingText.vert); + me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270); } menuParagraphVAlign.setDisabled(disabled); menuParagraphDirection.setDisabled(disabled); @@ -1683,7 +1727,7 @@ define([ if (text!==false) { menuAddHyperlinkPara.hyperProps = {}; - menuAddHyperlinkPara.hyperProps.value = new CHyperlinkProperty(); + menuAddHyperlinkPara.hyperProps.value = new Asc.CHyperlinkProperty(); menuAddHyperlinkPara.hyperProps.value.put_Text(text); } @@ -1736,9 +1780,9 @@ define([ var disabled = (value.slideProps!==undefined && value.slideProps.locked); - me.menuTableCellTop.setChecked(value.tableProps.value.get_CellsVAlign() == c_oAscVertAlignJc.Top); - me.menuTableCellCenter.setChecked(value.tableProps.value.get_CellsVAlign() == c_oAscVertAlignJc.Center); - me.menuTableCellBottom.setChecked(value.tableProps.value.get_CellsVAlign() == c_oAscVertAlignJc.Bottom); + me.menuTableCellTop.setChecked(value.tableProps.value.get_CellsVAlign() == Asc.c_oAscVertAlignJc.Top); + me.menuTableCellCenter.setChecked(value.tableProps.value.get_CellsVAlign() == Asc.c_oAscVertAlignJc.Center); + me.menuTableCellBottom.setChecked(value.tableProps.value.get_CellsVAlign() == Asc.c_oAscVertAlignJc.Bottom); if (me.api) { mnuTableMerge.setDisabled(value.tableProps.locked || disabled || !me.api.CheckBeforeMergeCells()); @@ -1767,7 +1811,7 @@ define([ if (text!==false) { menuAddHyperlinkTable.hyperProps = {}; - menuAddHyperlinkTable.hyperProps.value = new CHyperlinkProperty(); + menuAddHyperlinkTable.hyperProps.value = new Asc.CHyperlinkProperty(); menuAddHyperlinkTable.hyperProps.value.put_Text(text); } if (!_.isUndefined(value.paraProps)) { diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js index 414f787fa..4d7256ed7 100644 --- a/apps/presentationeditor/main/app/view/DocumentPreview.js +++ b/apps/presentationeditor/main/app/view/DocumentPreview.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentPreview.js * diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index 57e717ab8..0c472a950 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FileMenu.js * diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index f5d98440a..02e377579 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FileMenuPanels.js * @@ -21,8 +53,8 @@ define([ menu: undefined, formats: [[ - {name: 'PDF', imgCls: 'pdf', type: c_oAscFileType.PDF}, - {name: 'PPTX', imgCls: 'pptx', type: c_oAscFileType.PPTX} + {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX} ]], @@ -159,6 +191,8 @@ define([ { value: 0, displayValue: this.strStrict, descValue: this.strCoAuthModeDescStrict } ] }).on('selected', _.bind(function(combo, record) { + if (record.value == 1 && (this.chAutosave.getValue()!=='checked')) + this.chAutosave.setValue(1); this.lblCoAuthMode.text(record.descValue); }, this)); @@ -168,7 +202,12 @@ define([ this.chAutosave = new Common.UI.CheckBox({ el: $('#fms-chb-autosave'), labelText: this.strAutosave - }); + }).on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (field.getValue()!=='checked' && this.cmbCoAuthMode.getValue()) { + this.cmbCoAuthMode.setValue(0); + this.lblCoAuthMode.text(this.strCoAuthModeDescStrict); + } + }, this)); this.lblAutosave = $('#fms-lbl-autosave'); this.chAlignGuides = new Common.UI.CheckBox({ @@ -183,7 +222,8 @@ define([ cls : 'input-group-nr', data : [ { value: Common.Utils.Metric.c_MetricUnits['cm'], displayValue: this.txtCm }, - { value: Common.Utils.Metric.c_MetricUnits['pt'], displayValue: this.txtPt } + { value: Common.Utils.Metric.c_MetricUnits['pt'], displayValue: this.txtPt }, + { value: Common.Utils.Metric.c_MetricUnits['inch'], displayValue: this.txtInch } ] }); @@ -212,8 +252,8 @@ define([ setMode: function(mode) { this.mode = mode; $('tr.edit', this.el)[mode.isEdit?'show':'hide'](); - $('tr.autosave', this.el)[mode.isEdit && mode.canAutosave ? 'show' : 'hide'](); - if (this.mode.isDesktopApp) { + $('tr.autosave', this.el)[mode.isEdit ? 'show' : 'hide'](); + if (this.mode.isDesktopApp && this.mode.isOffline) { this.chAutosave.setCaption(this.strAutoRecover); this.lblAutosave.text(this.textAutoRecover); } @@ -233,6 +273,8 @@ define([ /** coauthoring begin **/ value = Common.localStorage.getItem("pe-settings-coauthmode"); + var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline); + item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)}); this.cmbCoAuthMode.setValue(item ? item.get('value') : 1); this.lblCoAuthMode.text(item ? item.get('descValue') : this.strCoAuthModeDescFast); @@ -240,11 +282,11 @@ define([ value = Common.localStorage.getItem("pe-settings-unit"); item = this.cmbUnit.store.findWhere({value: parseInt(value)}); - this.cmbUnit.setValue(item ? parseInt(item.get('value')) : 0); + this.cmbUnit.setValue(item ? parseInt(item.get('value')) : Common.Utils.Metric.getDefaultMetric()); this._oldUnits = this.cmbUnit.getValue(); value = Common.localStorage.getItem("pe-settings-autosave"); - this.chAutosave.setValue(value===null || parseInt(value) == 1); + this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1)); value = Common.localStorage.getItem("pe-settings-showsnaplines"); this.chAlignGuides.setValue(value===null || parseInt(value) == 1); @@ -294,7 +336,8 @@ define([ strFast: 'Fast', strStrict: 'Strict', textAutoRecover: 'Autorecover', - strAutoRecover: 'Turn on autorecover' + strAutoRecover: 'Turn on autorecover', + txtInch: 'Inch' }, PE.Views.FileMenuPanels.Settings || {})); PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js index 28d0aa3b1..f3054bc89 100644 --- a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * HyperlinkSettingsDialog.js * @@ -127,7 +159,7 @@ define([ me.inputTip = new Common.UI.InputField({ el : $('#id-dlg-hyperlink-tip'), style : 'width: 100%;', - maxLength : c_oAscMaxTooltipLength + maxLength : Asc.c_oAscMaxTooltipLength }); me.radioNext = new Common.UI.RadioBox({ @@ -205,7 +237,7 @@ define([ getSettings: function () { var me = this, - props = new CHyperlinkProperty(); + props = new Asc.CHyperlinkProperty(); var def_display = ''; if (me.cmbLinkType.getValue() == c_oHyperlinkType.InternalLink) { var url = "ppaction://hlink"; diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 503f4fdbf..f0eec7850 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ImageSettings.js * @@ -91,10 +123,10 @@ define([ updateMetricUnit: function() { var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width); - this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height); - this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); }, createDelayedElements: function() { @@ -110,17 +142,17 @@ define([ this.disableControls(this._locked); if (props ){ - this._originalProps = new CImgProperty(props); + this._originalProps = new Asc.asc_CImgProperty(props); var value = props.get_Width(); if ( Math.abs(this._state.Width-value)>0.001 ) { - this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); this._state.Width = value; } value = props.get_Height(); if ( Math.abs(this._state.Height-value)>0.001 ) { - this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); this._state.Height = value; } @@ -134,10 +166,10 @@ define([ var w = imgsize.get_ImageWidth(); var h = imgsize.get_ImageHeight(); - this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; - this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]; + this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); + this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName(); - var properties = new CImgProperty(); + var properties = new Asc.asc_CImgProperty(); properties.put_Width(w); properties.put_Height(h); this.api.ImgApply(properties); @@ -153,7 +185,7 @@ define([ if (me.api) { var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { - var props = new CImgProperty(); + var props = new Asc.asc_CImgProperty(); props.put_ImageUrl(checkUrl); me.api.ImgApply(props); } @@ -175,7 +207,7 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Image == elType) { + if (Asc.c_oAscTypeSelectElement.Image == elType) { var imgsizeOriginal; if (!me.btnOriginalSize.isDisabled()) { imgsizeOriginal = me.api.get_OriginalSizeImage(); diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index 59c282931..48d9cfcc5 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ImageSettingsAdvanced.js * @@ -18,7 +50,8 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem contentWidth: 340, height: 235, sizeOriginal: {width: 0, height: 0}, - sizeMax: {width: 55.88, height: 55.88} + sizeMax: {width: 55.88, height: 55.88}, + storageName: 'pe-img-settings-adv-category' }, initialize : function(options) { @@ -151,6 +184,10 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem afterRender: function() { this.updateMetricUnit(); this._setDefaults(this._originalProps); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, _setDefaults: function(props) { @@ -162,10 +199,8 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined); - var value = Common.localStorage.getItem("pe-settings-imageratio"); - if (value===null || parseInt(value) == 1) { - this.btnRatio.toggle(true); - } + var value = props.asc_getLockAspect(); + this.btnRatio.toggle(value); if (props.get_Position()) { var Position = {X: props.get_Position().get_X(), Y: props.get_Position().get_Y()}; @@ -179,15 +214,14 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem }, getSettings: function() { - Common.localStorage.setItem("pe-settings-imageratio", (this.btnRatio.pressed) ? 1 : 0); - - var properties = new CImgProperty(); + var properties = new Asc.asc_CImgProperty(); if (this.spnHeight.getValue()!=='') properties.put_Height(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue())); if (this.spnWidth.getValue()!=='') properties.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); + properties.asc_putLockAspect(this.btnRatio.pressed); - var Position = new CPosition(); + var Position = new Asc.CPosition(); if (this.spnX.getValue() !== '') Position.put_X(Common.Utils.Metric.fnRecalcToMM(this.spnX.getNumberValue())); if (this.spnY.getValue() !== '') @@ -201,8 +235,8 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem if (this.spinners) { for (var i=0; i= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Paragraph == elType) { + if (Asc.c_oAscTypeSelectElement.Paragraph == elType) { (new PE.Views.ParagraphSettingsAdvanced( { paragraphProps: elValue, @@ -334,7 +366,7 @@ define([ } }, - strParagraphSpacing: 'Spacing', + strParagraphSpacing: 'Paragraph Spacing', strLineHeight: 'Line Spacing', strSpacingBefore: 'Before', strSpacingAfter: 'After', diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js index 11c441e0c..0f4651210 100644 --- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ParagraphSettingsAdvanced.js * @@ -19,7 +51,8 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced options: { contentWidth: 320, height: 394, - toggleGroup: 'paragraph-adv-settings-group' + toggleGroup: 'paragraph-adv-settings-group', + storageName: 'pe-para-settings-adv-category' }, initialize : function(options) { @@ -43,7 +76,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.spinners = []; this.api = this.options.api; - this._originalProps = new CParagraphProp(this.options.paragraphProps); + this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps); }, render: function() { @@ -66,7 +99,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.numFirstLine.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new CParagraphInd()); + this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_FirstLine(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -86,7 +119,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced var numval = field.getNumberValue(); if (this._changedProps) { if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new CParagraphInd()); + this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(numval)); } this.numFirstLine.setMinValue(-numval); @@ -108,7 +141,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.numIndentsRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new CParagraphInd()); + this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -167,7 +200,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this._changedProps.put_TextSpacing(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } if (this.api && !this._noApply) { - var properties = (this._originalProps) ? this._originalProps : new CParagraphProp(); + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); properties.put_TextSpacing(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', properties); } @@ -260,9 +293,9 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced getSettings: function() { if ( this._tabListChanged ) { if (this._changedProps.get_Tabs()===null || this._changedProps.get_Tabs()===undefined) - this._changedProps.put_Tabs(new CParagraphTabs()); + this._changedProps.put_Tabs(new Asc.asc_CParagraphTabs()); this.tabList.store.each(function (item, index) { - var tab = new CParagraphTab(Common.Utils.Metric.fnRecalcToMM(item.get('tabPos')), item.get('tabAlign')); + var tab = new Asc.asc_CParagraphTab(Common.Utils.Metric.fnRecalcToMM(item.get('tabPos')), item.get('tabAlign')); this._changedProps.get_Tabs().add_Tab(tab); }, this); } @@ -271,7 +304,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced _setDefaults: function(props) { if (props ){ - this._originalProps = new CParagraphProp(props); + this._originalProps = new Asc.asc_CParagraphProperty(props); this.numIndentsLeft.setValue((props.get_Ind() !== null && props.get_Ind().get_Left() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Left()) : '', true); this.numFirstLine.setMinValue(-this.numIndentsLeft.getNumberValue()); @@ -305,7 +338,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced var rec = new Common.UI.DataViewModel(); rec.set({ tabPos: pos, - value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()], + value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), tabAlign: tab.get_Value() }); arr.push(rec); @@ -317,7 +350,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this._noApply = false; - this._changedProps = new CParagraphProp(); + this._changedProps = new Asc.asc_CParagraphProperty(); } }, @@ -325,11 +358,11 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced if (this.spinners) { for (var i=0; i .active').removeClass('active'); target_pane.addClass("active"); @@ -189,7 +228,7 @@ define([ target_pane_parent.css("display", "none" ); $(this.el).width(SCALE_MIN); this.minimizedMode = true; - Common.localStorage.setItem("pe-hidden-right-settings", 1); + Common.localStorage.setItem("pe-hide-right-settings", 1); } this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); @@ -245,7 +284,6 @@ define([ target_pane.css("display", "none" ); $(this.el).width(SCALE_MIN); this.minimizedMode = true; - Common.localStorage.setItem("pe-hidden-right-settings", 1); Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); }, diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 859edfd7e..e27af602b 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeSettings.js * @@ -46,18 +78,20 @@ define([ this._sendUndoPoint = true; this._sliderChanged = false; + this.txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt); + this._state = { Transparency: null, - FillType: c_oAscFill.FILL_TYPE_SOLID, + FillType: Asc.c_oAscFill.FILL_TYPE_SOLID, ShapeColor: 'transparent', - BlipFillType: c_oAscFillBlipType.STRETCH, - StrokeType: c_oAscStrokeType.STROKE_COLOR, + BlipFillType: Asc.c_oAscFillBlipType.STRETCH, + StrokeType: Asc.c_oAscStrokeType.STROKE_COLOR, StrokeWidth: this._pt2mm(1), StrokeColor: '000000', FGColor: '000000', BGColor: 'ffffff', GradColor: '000000', - GradFillType: c_oAscFillGradType.GRAD_LINEAR, + GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, DisabledFillPanels: false, DisabledControls: false, HideShapeOnlySettings: false, @@ -66,10 +100,10 @@ define([ this.lockedControls = []; this._locked = false; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.ShapeColor = {Value: 1, Color: 'transparent'}; // value=1 - цвет определен - прозрачный или другой, value=0 - цвет не определен, рисуем прозрачным - this.BlipFillType = c_oAscFillBlipType.STRETCH; - this.GradFillType = c_oAscFillGradType.GRAD_LINEAR; + this.BlipFillType = Asc.c_oAscFillBlipType.STRETCH; + this.GradFillType = Asc.c_oAscFillGradType.GRAD_LINEAR; this.GradColor = { values: [0, 100], colors: ['000000', 'ffffff'], currentIdx: 0}; this.GradRadialDirectionIdx = 0; this.GradLinearDirectionType = 0; @@ -88,11 +122,11 @@ define([ this.render(); this._arrFillSrc = [ - {displayValue: this.textColor, value: c_oAscFill.FILL_TYPE_SOLID}, - {displayValue: this.textGradientFill, value: c_oAscFill.FILL_TYPE_GRAD}, - {displayValue: this.textImageTexture, value: c_oAscFill.FILL_TYPE_BLIP}, - {displayValue: this.textPatternFill, value: c_oAscFill.FILL_TYPE_PATT}, - {displayValue: this.textNoFill, value: c_oAscFill.FILL_TYPE_NOFILL} + {displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID}, + {displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD}, + {displayValue: this.textImageTexture, value: Asc.c_oAscFill.FILL_TYPE_BLIP}, + {displayValue: this.textPatternFill, value: Asc.c_oAscFill.FILL_TYPE_PATT}, + {displayValue: this.textNoFill, value: Asc.c_oAscFill.FILL_TYPE_NOFILL} ]; this.cmbFillSrc = new Common.UI.ComboBox({ @@ -272,8 +306,8 @@ define([ this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); this._arrFillType = [ - {displayValue: this.textStretch, value: c_oAscFillBlipType.STRETCH}, - {displayValue: this.textTile, value: c_oAscFillBlipType.TILE} + {displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH}, + {displayValue: this.textTile, value: Asc.c_oAscFillBlipType.TILE} ]; this.cmbFillType = new Common.UI.ComboBox({ @@ -332,8 +366,8 @@ define([ this.lblTransparencyEnd = $(this.el).find('#shape-lbl-transparency-end'); this._arrGradType = [ - {displayValue: this.textLinear, value: c_oAscFillGradType.GRAD_LINEAR}, - {displayValue: this.textRadial, value: c_oAscFillGradType.GRAD_PATH} + {displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR}, + {displayValue: this.textRadial, value: Asc.c_oAscFillGradType.GRAD_PATH} ]; this.cmbGradType = new Common.UI.ComboBox({ @@ -535,10 +569,8 @@ define([ setApi: function(api) { this.api = api; if (this.api) { - this.api.SetInterfaceDrawImagePlaceShape('shape-texture-img'); - var textures = this.api.get_PropertyStandartTextures(); - if (textures) - this.onInitStandartTextures(textures); + this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img'); + this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this)); } return this; }, @@ -546,31 +578,31 @@ define([ onFillSrcSelect: function(combo, record) { this.ShowHideElem(record.value); switch (record.value){ - case c_oAscFill.FILL_TYPE_SOLID: - this._state.FillType = c_oAscFill.FILL_TYPE_SOLID; + case Asc.c_oAscFill.FILL_TYPE_SOLID: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_SOLID; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_SOLID); - fill.put_fill( new CAscFillSolid()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID); + fill.put_fill( new Asc.asc_CFillSolid()); fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor((this.ShapeColor.Color=='transparent') ? {color: '4f81bd', effectId: 24} : this.ShapeColor.Color)); props.put_fill(fill); this.api.ShapeApply(props); } break; - case c_oAscFill.FILL_TYPE_GRAD: - this._state.FillType = c_oAscFill.FILL_TYPE_GRAD; + case Asc.c_oAscFill.FILL_TYPE_GRAD: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_GRAD; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(), HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex(); @@ -587,16 +619,16 @@ define([ this.api.ShapeApply(props); } break; - case c_oAscFill.FILL_TYPE_BLIP: - this._state.FillType = c_oAscFill.FILL_TYPE_BLIP; + case Asc.c_oAscFill.FILL_TYPE_BLIP: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_BLIP; break; - case c_oAscFill.FILL_TYPE_PATT: - this._state.FillType = c_oAscFill.FILL_TYPE_PATT; + case Asc.c_oAscFill.FILL_TYPE_PATT: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_PATT; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); fill.get_fill().put_pattern_type(this.PatternFillType); var fHexColor = Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color).get_color().get_hex(); @@ -615,12 +647,12 @@ define([ this.api.ShapeApply(props); } break; - case c_oAscFill.FILL_TYPE_NOFILL: - this._state.FillType = c_oAscFill.FILL_TYPE_NOFILL; + case Asc.c_oAscFill.FILL_TYPE_NOFILL: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; if (!this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_NOFILL); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.put_fill(null); props.put_fill(fill); this.api.ShapeApply(props); @@ -635,15 +667,15 @@ define([ this.ShapeColor = {Value: 1, Color: color}; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); if (this.ShapeColor.Color=='transparent') { - fill.put_type(c_oAscFill.FILL_TYPE_NOFILL); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.put_fill(null); } else { - fill.put_type(c_oAscFill.FILL_TYPE_SOLID); - fill.put_fill( new CAscFillSolid()); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID); + fill.put_fill( new Asc.asc_CFillSolid()); fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(this.ShapeColor.Color)); } @@ -660,12 +692,12 @@ define([ onPatternSelect: function(combo, record){ if (this.api && !this._noApply) { this.PatternFillType = record.get('type'); - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); fill.get_fill().put_pattern_type(this.PatternFillType); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.get_fill().put_color_fg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); fill.get_fill().put_color_bg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -679,12 +711,12 @@ define([ this.btnFGColor.setColor(color); this.FGColor = {Value: 1, Color: color}; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); fill.get_fill().put_color_fg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.get_fill().put_pattern_type(this.PatternFillType); fill.get_fill().put_color_bg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -698,11 +730,11 @@ define([ this.btnBGColor.setColor(color); this.BGColor = {Value: 1, Color: color}; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_PATT); - fill.put_fill( new CAscFillHatch()); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT); + fill.put_fill( new Asc.asc_CFillHatch()); + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.get_fill().put_pattern_type(this.PatternFillType); fill.get_fill().put_color_fg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); } @@ -716,11 +748,11 @@ define([ onFillTypeSelect: function(combo, record) { this.BlipFillType = record.value; - if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == c_oAscFill.FILL_TYPE_BLIP) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); + if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == Asc.c_oAscFill.FILL_TYPE_BLIP) { + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); fill.get_fill().put_type(this.BlipFillType); @@ -734,8 +766,8 @@ define([ this.sldrTransparency.setValue(field.getNumberValue(), true); if (this.api) { var num = field.getNumberValue(); - var props = new CAscShapeProp(); - var fill = new CAscFill(); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); fill.put_transparent(num * 2.55); props.put_fill(fill); this.api.ShapeApply(props); @@ -764,8 +796,8 @@ define([ _transparencyApplyFunc: function() { if (this._sliderChanged!==undefined) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); fill.put_transparent(this._sliderChanged * 2.55); props.put_fill(fill); this.api.ShapeApply(props); @@ -776,7 +808,7 @@ define([ onGradTypeSelect: function(combo, record){ this.GradFillType = record.value; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { this.mnuDirectionPicker.store.reset(this._viewDataLinear); this.mnuDirectionPicker.cmpEl.width(175); this.mnuDirectionPicker.restoreHeight = 174; @@ -786,7 +818,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - } else if (this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); this.mnuDirectionPicker.cmpEl.width(60); this.mnuDirectionPicker.restoreHeight = 58; @@ -798,12 +830,12 @@ define([ } if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } @@ -832,13 +864,13 @@ define([ } this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls); - (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; + (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; if (this.api) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); fill.get_fill().put_linear_angle(rawData.type * 60000); fill.get_fill().put_linear_scale(true); @@ -857,15 +889,15 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color)); if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); fill.get_fill().put_colors([Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]), Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1])]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } @@ -899,15 +931,15 @@ define([ _gradientApplyFunc: function() { if (this._sliderChanged) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_GRAD); - fill.put_fill( new CAscFillGrad()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); + fill.put_fill( new Asc.asc_CFillGrad()); fill.get_fill().put_grad_type(this.GradFillType); fill.get_fill().put_positions([this.GradColor.values[0]*1000, this.GradColor.values[1]*1000]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true); } @@ -925,16 +957,16 @@ define([ this.BorderSize = value; if (this.api && !this._noApply) { - var props = new CAscShapeProp(); - var stroke = new CAscStroke(); + var props = new Asc.asc_CShapeProperty(); + var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.put_type( c_oAscStrokeType.STROKE_NONE); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { - stroke.put_type( c_oAscStrokeType.STROKE_COLOR); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); if (this.BorderColor.Color == 'transparent' || this.BorderColor.Color.color == 'transparent') stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29})); - else if (this._state.StrokeType == c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) + else if (this._state.StrokeType == Asc.c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(this.BorderColor.Color))); stroke.put_width(this._pt2mm(this.BorderSize)); } @@ -951,8 +983,9 @@ define([ onBorderSizeChanged: function(before, combo, record, e) { var me = this; if (before) { - var value = parseFloat(record.value); - if (!(/^\s*(\d*(\.|,)?\d+)\s*(pt)?\s*$/.exec(record.value)) || value<0 || value>1584) { + var value = parseFloat(record.value), + expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); + if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; Common.UI.error({ msg: this.textBorderSizeErr, @@ -975,12 +1008,12 @@ define([ this.btnBorderColor.setColor(color); this.BorderColor = {Value: 1, Color: color}; if (this.api && this.BorderSize>0 && !this._noApply) { - var props = new CAscShapeProp(); - var stroke = new CAscStroke(); + var props = new Asc.asc_CShapeProperty(); + var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.put_type( c_oAscStrokeType.STROKE_NONE); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { - stroke.put_type( c_oAscStrokeType.STROKE_COLOR); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_color(Common.Utils.ThemeColor.getRgbColor(this.BorderColor.Color)); stroke.put_width(this._pt2mm(this.BorderSize)); } @@ -999,10 +1032,10 @@ define([ var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { if (me.BlipFillType !== null) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); fill.get_fill().put_type(me.BlipFillType); fill.get_fill().put_url(checkUrl); @@ -1029,7 +1062,7 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Shape == elType) { + if (Asc.c_oAscTypeSelectElement.Shape == elType) { (new PE.Views.ShapeSettingsAdvanced( { shapeProps: elValue, @@ -1086,13 +1119,13 @@ define([ if (fill===null || fill_type===null) { // заливка не совпадает у неск. фигур this.OriginalFillType = null; - } else if (fill_type==c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет - this.OriginalFillType = c_oAscFill.FILL_TYPE_NOFILL; - } else if (fill_type==c_oAscFill.FILL_TYPE_SOLID) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) { fill = fill.get_fill(); color = fill.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.ShapeColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1100,23 +1133,23 @@ define([ } else this.ShapeColor = {Value: 0, Color: 'transparent'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.FGColor = (this.ShapeColor.Color!=='transparent') ? {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color)} : {Value: 1, Color: '000000'}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.GradColor.colors[0] = (this.ShapeColor.Color!=='transparent') ? Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color) : '000000'; this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_BLIP) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_BLIP) { fill = fill.get_fill(); this.BlipFillType = fill.get_type(); // null - не совпадают у нескольких фигур if (this._state.BlipFillType !== this.BlipFillType) { - if (this.BlipFillType == c_oAscFillBlipType.STRETCH || this.BlipFillType == c_oAscFillBlipType.TILE) { + if (this.BlipFillType == Asc.c_oAscFillBlipType.STRETCH || this.BlipFillType == Asc.c_oAscFillBlipType.TILE) { this.cmbFillType.setValue(this.BlipFillType); } else this.cmbFillType.setValue(''); this._state.BlipFillType = this.BlipFillType; } - this.OriginalFillType = c_oAscFill.FILL_TYPE_BLIP; - } else if (fill_type==c_oAscFill.FILL_TYPE_PATT) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_BLIP; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_PATT) { fill = fill.get_fill(); this.PatternFillType = fill.get_pattern_type(); // null - не совпадают у нескольких фигур if (this._state.PatternFillType !== this.PatternFillType) { @@ -1131,7 +1164,7 @@ define([ color = fill.get_color_fg(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1141,7 +1174,7 @@ define([ color = fill.get_color_bg(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1149,17 +1182,17 @@ define([ } else this.BGColor = {Value: 1, Color: 'ffffff'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_PATT; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color); this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_GRAD) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_GRAD) { fill = fill.get_fill(); var gradfilltype = fill.get_grad_type(); // null - не совпадают у нескольких фигур if (this._state.GradFillType !== gradfilltype || this.GradFillType !== gradfilltype) { this.GradFillType = gradfilltype; rec = undefined; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.cmbGradType.setValue(this.GradFillType); rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); this.onGradTypeSelect(this.cmbGradType, rec.attributes); @@ -1170,7 +1203,7 @@ define([ this._state.GradFillType = this.GradFillType; } - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR ) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR ) { var value = Math.floor(fill.get_linear_angle()/60000); if (Math.abs(this.GradLinearDirectionType-value)>0.001) { this.GradLinearDirectionType=value; @@ -1187,7 +1220,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -1198,7 +1231,7 @@ define([ color = colors[1]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -1226,7 +1259,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; @@ -1269,10 +1302,10 @@ define([ var strokeType = stroke.get_type(); if (stroke) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { color = stroke.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BorderColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else @@ -1312,10 +1345,10 @@ define([ this._state.StrokeColor = this.BorderColor.Color; } - if (this._state.StrokeType !== strokeType || strokeType == c_oAscStrokeType.STROKE_COLOR) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !(/pt\s*$/.test(this.cmbBorderSize.getRawValue())); + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; @@ -1329,11 +1362,11 @@ define([ if (_selectedItem) this.cmbBorderSize.selectRecord(_selectedItem); else { - this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' pt' : ''); + this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' ' + this.txtPt : ''); } this.BorderSize = w; } - } else if (strokeType == c_oAscStrokeType.STROKE_NONE) { + } else if (strokeType == Asc.c_oAscStrokeType.STROKE_NONE) { this._state.StrokeWidth = 0; this.BorderSize = this.cmbBorderSize.store.at(0).get('value'); this.cmbBorderSize.setValue(this.BorderSize); @@ -1491,11 +1524,11 @@ define([ this._fromTextureCmb = false; if (this.api) { - var props = new CAscShapeProp(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); - fill.get_fill().put_type(c_oAscFillBlipType.TILE); + var props = new Asc.asc_CShapeProperty(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); + fill.get_fill().put_type(Asc.c_oAscFillBlipType.TILE); fill.get_fill().put_texture_id(record.get('type')); props.put_fill(fill); this.api.ShapeApply(props); @@ -1569,11 +1602,11 @@ define([ }, ShowHideElem: function(value) { - this.FillColorContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_SOLID); - this.FillImageContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_BLIP); - this.FillPatternContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_PATT); - this.FillGradientContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_GRAD); - this.TransparencyContainer.toggleClass('settings-hidden', (value === c_oAscFill.FILL_TYPE_NOFILL || value === null)); + this.FillColorContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_SOLID); + this.FillImageContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_BLIP); + this.FillPatternContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_PATT); + this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD); + this.TransparencyContainer.toggleClass('settings-hidden', (value === Asc.c_oAscFill.FILL_TYPE_NOFILL || value === null)); }, setLocked: function (locked) { diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index e2ce8710b..624dc92cd 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeSettingsAdvanced.js * @@ -20,7 +52,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem toggleGroup: 'shape-adv-settings-group', sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, - properties: null + properties: null, + storageName: 'pe-shape-settings-adv-category' }, initialize : function(options) { @@ -117,6 +150,9 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem if (btn.pressed && this.spnHeight.getNumberValue()>0) { this._nRatio = this.spnWidth.getNumberValue()/this.spnHeight.getNumberValue(); } + if (this._changedProps) { + this._changedProps.asc_putLockAspect(btn.pressed); + } }, this)); // Margins @@ -132,7 +168,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.spnMarginTop.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_paddings()===null || this._changedProps.get_paddings()===undefined) - this._changedProps.put_paddings(new CPaddings()); + this._changedProps.put_paddings(new Asc.asc_CPaddings()); this._changedProps.get_paddings().put_Top(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -150,7 +186,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.spnMarginBottom.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_paddings()===null || this._changedProps.get_paddings()===undefined) - this._changedProps.put_paddings(new CPaddings()); + this._changedProps.put_paddings(new Asc.asc_CPaddings()); this._changedProps.get_paddings().put_Bottom(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -168,7 +204,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.spnMarginLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_paddings()===null || this._changedProps.get_paddings()===undefined) - this._changedProps.put_paddings(new CPaddings()); + this._changedProps.put_paddings(new Asc.asc_CPaddings()); this._changedProps.get_paddings().put_Left(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -186,7 +222,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.spnMarginRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_paddings()===null || this._changedProps.get_paddings()===undefined) - this._changedProps.put_paddings(new CPaddings()); + this._changedProps.put_paddings(new Asc.asc_CPaddings()); this._changedProps.get_paddings().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); } }, this)); @@ -194,9 +230,9 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem // Shape this._arrCapType = [ - {displayValue: this.textFlat, value: c_oAscLineCapType.Flat}, - {displayValue: this.textRound, value: c_oAscLineCapType.Round}, - {displayValue: this.textSquare, value: c_oAscLineCapType.Square} + {displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat}, + {displayValue: this.textRound, value: Asc.c_oAscLineCapType.Round}, + {displayValue: this.textSquare, value: Asc.c_oAscLineCapType.Square} ]; this.cmbCapType = new Common.UI.ComboBox({ @@ -206,20 +242,20 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem editable: false, data: this._arrCapType }); - this.cmbCapType.setValue(c_oAscLineCapType.Flat); + this.cmbCapType.setValue(Asc.c_oAscLineCapType.Flat); this.cmbCapType.on('selected', _.bind(function(combo, record){ if (this._changedProps) { if (this._changedProps.get_stroke()===null) - this._changedProps.put_stroke(new CAscStroke()); + this._changedProps.put_stroke(new Asc.asc_CStroke()); this._changedProps.get_stroke().put_linecap(record.value); } }, this)); this._arrJoinType = [ - {displayValue: this.textRound, value: c_oAscLineJoinType.Round}, - {displayValue: this.textBevel, value: c_oAscLineJoinType.Bevel}, - {displayValue: this.textMiter, value: c_oAscLineJoinType.Miter} + {displayValue: this.textRound, value: Asc.c_oAscLineJoinType.Round}, + {displayValue: this.textBevel, value: Asc.c_oAscLineJoinType.Bevel}, + {displayValue: this.textMiter, value: Asc.c_oAscLineJoinType.Miter} ]; this.cmbJoinType = new Common.UI.ComboBox({ el: $('#shape-advanced-join-type'), @@ -228,11 +264,11 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem editable: false, data: this._arrJoinType }); - this.cmbJoinType.setValue(c_oAscLineJoinType.Round); + this.cmbJoinType.setValue(Asc.c_oAscLineJoinType.Round); this.cmbJoinType.on('selected', _.bind(function(combo, record){ if (this._changedProps) { if (this._changedProps.get_stroke()===null) - this._changedProps.put_stroke(new CAscStroke()); + this._changedProps.put_stroke(new Asc.asc_CStroke()); this._changedProps.get_stroke().put_linejoin(record.value); } @@ -243,25 +279,25 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem for ( var i=0; i<6; i++ ) _arrStyles.push({value: i, offsetx: 80*i+10, offsety: 0}); - _arrStyles[0].type = c_oAscLineBeginType.None; - _arrStyles[1].type = c_oAscLineBeginType.Triangle; - _arrStyles[2].type = c_oAscLineBeginType.Arrow; - _arrStyles[3].type = c_oAscLineBeginType.Stealth; - _arrStyles[4].type = c_oAscLineBeginType.Diamond; - _arrStyles[5].type = c_oAscLineBeginType.Oval; + _arrStyles[0].type = Asc.c_oAscLineBeginType.None; + _arrStyles[1].type = Asc.c_oAscLineBeginType.Triangle; + _arrStyles[2].type = Asc.c_oAscLineBeginType.Arrow; + _arrStyles[3].type = Asc.c_oAscLineBeginType.Stealth; + _arrStyles[4].type = Asc.c_oAscLineBeginType.Diamond; + _arrStyles[5].type = Asc.c_oAscLineBeginType.Oval; for ( i=0; i<9; i++ ) _arrSize.push({value: i, offsetx: 80+10, offsety: 20*(i+1)}); - _arrSize[0].type = c_oAscLineBeginSize.small_small; - _arrSize[1].type = c_oAscLineBeginSize.small_mid; - _arrSize[2].type = c_oAscLineBeginSize.small_large; - _arrSize[3].type = c_oAscLineBeginSize.mid_small; - _arrSize[4].type = c_oAscLineBeginSize.mid_mid; - _arrSize[5].type = c_oAscLineBeginSize.mid_large; - _arrSize[6].type = c_oAscLineBeginSize.large_small; - _arrSize[7].type = c_oAscLineBeginSize.large_mid; - _arrSize[8].type = c_oAscLineBeginSize.large_large; + _arrSize[0].type = Asc.c_oAscLineBeginSize.small_small; + _arrSize[1].type = Asc.c_oAscLineBeginSize.small_mid; + _arrSize[2].type = Asc.c_oAscLineBeginSize.small_large; + _arrSize[3].type = Asc.c_oAscLineBeginSize.mid_small; + _arrSize[4].type = Asc.c_oAscLineBeginSize.mid_mid; + _arrSize[5].type = Asc.c_oAscLineBeginSize.mid_large; + _arrSize[6].type = Asc.c_oAscLineBeginSize.large_small; + _arrSize[7].type = Asc.c_oAscLineBeginSize.large_mid; + _arrSize[8].type = Asc.c_oAscLineBeginSize.large_large; this.btnBeginStyle = new Common.UI.ComboBox({ @@ -380,6 +416,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem afterRender: function() { this.updateMetricUnit(); this._setDefaults(this._originalProps); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, _setDefaults: function(props) { @@ -390,10 +430,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem if (props.get_Height()>0) this._nRatio = props.get_Width()/props.get_Height(); - var value = Common.localStorage.getItem("pe-settings-shaperatio"); - if (value!==null && parseInt(value) == 1) { - this.btnRatio.toggle(true); - } + var value = props.asc_getLockAspect(); + this.btnRatio.toggle(value); this._setShapeDefaults(props); @@ -410,7 +448,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem } this.btnsCategory[2].setDisabled(null === margins); // Margins - this._changedProps = new CAscShapeProp(); + this._changedProps = new Asc.asc_CShapeProperty(); } }, @@ -496,8 +534,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem if (this.spinners) { for (var i=0; i0.001) { this.GradLinearDirectionType=value; @@ -1224,7 +1254,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -1235,7 +1265,7 @@ define([ color = colors[1]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -1263,7 +1293,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.SlideColor = {Value: 1, Color: this.GradColor.colors[0]}; @@ -1533,6 +1563,7 @@ define([ textRadial: 'Radial', textDirection: 'Direction', textStyle: 'Style', - textGradient: 'Gradient' + textGradient: 'Gradient', + textSec: 's' }, PE.Views.SlideSettings || {})); }); diff --git a/apps/presentationeditor/main/app/view/SlideSizeSettings.js b/apps/presentationeditor/main/app/view/SlideSizeSettings.js index ecef6124f..c09639fa8 100644 --- a/apps/presentationeditor/main/app/view/SlideSizeSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSizeSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * SlideSizeSettings.js * @@ -169,11 +201,10 @@ define([ if (this.spinners) { for (var i=0; i -1 || !visible) { if (updateBorders.get_Left()===null || updateBorders.get_Left()===undefined) - updateBorders.put_Left(new CBorder()); + updateBorders.put_Left(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Left(), visible); } if (border.indexOf('t') > -1 || !visible) { if (updateBorders.get_Top()===null || updateBorders.get_Top()===undefined) - updateBorders.put_Top(new CBorder()); + updateBorders.put_Top(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Top(), visible); } if (border.indexOf('r') > -1 || !visible) { if (updateBorders.get_Right()===null || updateBorders.get_Right()===undefined) - updateBorders.put_Right(new CBorder()); + updateBorders.put_Right(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Right(), visible); } if (border.indexOf('b') > -1 || !visible) { if (updateBorders.get_Bottom()===null || updateBorders.get_Bottom()===undefined) - updateBorders.put_Bottom(new CBorder()); + updateBorders.put_Bottom(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_Bottom(), visible); } if (border.indexOf('c') > -1 || !visible) { if (updateBorders.get_InsideV()===null || updateBorders.get_InsideV()===undefined) - updateBorders.put_InsideV(new CBorder()); + updateBorders.put_InsideV(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_InsideV(), visible); } if (border.indexOf('m') > -1 || !visible) { if (updateBorders.get_InsideH()===null || updateBorders.get_InsideH()===undefined) - updateBorders.put_InsideH(new CBorder()); + updateBorders.put_InsideH(new Asc.asc_CTextBorder()); this._UpdateBorderStyle (updateBorders.get_InsideH(), visible); } }, _UpdateBorderStyle: function(border, visible) { if (null == border) - border = new CBorder(); + border = new Asc.asc_CTextBorder(); if (visible && this.BorderSize > 0){ var size = parseFloat(this.BorderSize); @@ -627,7 +659,7 @@ define([ for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].get_ObjectType(); elValue = selectedElements[i].get_ObjectValue(); - if (c_oAscTypeSelectElement.Table == elType) { + if (Asc.c_oAscTypeSelectElement.Table == elType) { (new PE.Views.TableSettingsAdvanced( { tableProps: elValue, diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js index cad523fbd..86e95f05e 100644 --- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableSettingsAdvanced.js * @@ -16,7 +48,8 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem options: { alias: 'TableSettingsAdvanced', contentWidth: 280, - height: 385 + height: 385, + storageName: 'pe-table-settings-adv-category' }, initialize : function(options) { @@ -57,7 +90,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem }; this._initialMarginsDefault = false; // если для всех выделенных ячеек пришло одинаковое значение Flag=0 (Use Default Margins) - this._originalProps = new CTableProp(this.options.tableProps); + this._originalProps = new Asc.CTableProp(this.options.tableProps); }, render: function() { @@ -86,7 +119,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Top'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Top((this.TableMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Top) : null); this.TableMargins.isChanged = true; } @@ -106,7 +139,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Bottom'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Bottom((this.TableMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Bottom) : null); this.TableMargins.isChanged = true; } @@ -126,7 +159,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Left'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Left((this.TableMargins.Left!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Left) : null); this.TableMargins.isChanged = true; } @@ -146,7 +179,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'table', 'Right'); if (this._changedProps) { if (this._changedProps.get_DefaultMargins()===undefined) - this._changedProps.put_DefaultMargins(new CPaddings()); + this._changedProps.put_DefaultMargins(new Asc.asc_CPaddings()); this._changedProps.get_DefaultMargins().put_Right((this.TableMargins.Right!==null) ? Common.Utils.Metric.fnRecalcToMM(this.TableMargins.Right) : null); this.TableMargins.isChanged = true; } @@ -176,7 +209,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this.CellMargins.Flag = field.getValue(); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Left( ( this.CellMargins.Left!== null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Left) : null); this._changedProps.get_CellMargins().put_Top((this.CellMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Top) : null); this._changedProps.get_CellMargins().put_Bottom((this.CellMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Bottom) : null); @@ -198,7 +231,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Top'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Top((this.CellMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Top) : null); setCellFlag(); } @@ -218,7 +251,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Bottom'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Bottom((this.CellMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Bottom) : null); setCellFlag(); } @@ -238,7 +271,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Left'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Left((this.CellMargins.Left!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Left) : null); setCellFlag(); } @@ -258,7 +291,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Right'); if (this._changedProps) { if (this._changedProps.get_CellMargins()===undefined) - this._changedProps.put_CellMargins(new CMargins()); + this._changedProps.put_CellMargins(new Asc.CMargins()); this._changedProps.get_CellMargins().put_Right((this.CellMargins.Right!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Right) : null); setCellFlag(); } @@ -272,6 +305,10 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem afterRender: function() { this.updateMetricUnit(); this._setDefaults(this._originalProps); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, getSettings: function() { @@ -316,7 +353,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem } this.fillMargins(this.CellMargins.Flag); - this._changedProps = new CTableProp(); + this._changedProps = new Asc.CTableProp(); } }, @@ -348,8 +385,8 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem if (this.spinners) { for (var i=0; i1584) { + var value = parseFloat(record.value), + expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); + if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; Common.UI.error({ msg: this.textBorderSizeErr, @@ -1005,12 +1038,12 @@ define([ this.btnBorderColor.setColor(color); this.BorderColor = {Value: 1, Color: color}; if (this.api && this.BorderSize>0 && !this._noApply) { - var props = new asc_TextArtProperties(); - var stroke = new CAscStroke(); + var props = new Asc.asc_TextArtProperties(); + var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.put_type( c_oAscStrokeType.STROKE_NONE); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { - stroke.put_type( c_oAscStrokeType.STROKE_COLOR); + stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_color(Common.Utils.ThemeColor.getRgbColor(this.BorderColor.Color)); stroke.put_width(this._pt2mm(this.BorderSize)); } @@ -1030,10 +1063,10 @@ define([ var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { if (me.BlipFillType !== null) { - var props = new asc_TextArtProperties(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); + var props = new Asc.asc_TextArtProperties(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); fill.get_fill().put_type(me.BlipFillType); fill.get_fill().put_url(checkUrl); @@ -1051,7 +1084,7 @@ define([ ChangeSettings: function(props) { if (this.shapeprops==null) { - this.shapeprops = new CAscShapeProp(); + this.shapeprops = new Asc.asc_CShapeProperty(); } if (this._initSettings) @@ -1086,13 +1119,13 @@ define([ if (fill===null || fill===undefined || fill_type===null) { // заливка не совпадает у неск. фигур this.OriginalFillType = null; - } else if (fill_type==c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет - this.OriginalFillType = c_oAscFill.FILL_TYPE_NOFILL; - } else if (fill_type==c_oAscFill.FILL_TYPE_SOLID) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) { fill = fill.get_fill(); color = fill.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.ShapeColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1100,23 +1133,23 @@ define([ } else this.ShapeColor = {Value: 0, Color: 'transparent'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.FGColor = (this.ShapeColor.Color!=='transparent') ? {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color)} : {Value: 1, Color: '000000'}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.GradColor.colors[0] = (this.ShapeColor.Color!=='transparent') ? Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color) : '000000'; this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_BLIP) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_BLIP) { fill = fill.get_fill(); this.BlipFillType = fill.get_type(); // null - не совпадают у нескольких фигур if (this._state.BlipFillType !== this.BlipFillType) { - if (this.BlipFillType == c_oAscFillBlipType.STRETCH || this.BlipFillType == c_oAscFillBlipType.TILE) { + if (this.BlipFillType == Asc.c_oAscFillBlipType.STRETCH || this.BlipFillType == Asc.c_oAscFillBlipType.TILE) { this.cmbFillType.setValue(this.BlipFillType); } else this.cmbFillType.setValue(''); this._state.BlipFillType = this.BlipFillType; } - this.OriginalFillType = c_oAscFill.FILL_TYPE_BLIP; - } else if (fill_type==c_oAscFill.FILL_TYPE_PATT) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_BLIP; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_PATT) { fill = fill.get_fill(); this.PatternFillType = fill.get_pattern_type(); // null - не совпадают у нескольких фигур if (this._state.PatternFillType !== this.PatternFillType) { @@ -1131,7 +1164,7 @@ define([ color = fill.get_color_fg(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1141,7 +1174,7 @@ define([ color = fill.get_color_bg(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else { this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())}; @@ -1149,17 +1182,17 @@ define([ } else this.BGColor = {Value: 1, Color: 'ffffff'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_PATT; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color); this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_GRAD) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_GRAD) { fill = fill.get_fill(); var gradfilltype = fill.get_grad_type(); // null - не совпадают у нескольких фигур if (this._state.GradFillType !== gradfilltype || this.GradFillType !== gradfilltype) { this.GradFillType = gradfilltype; rec = undefined; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.cmbGradType.setValue(this.GradFillType); rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); this.onGradTypeSelect(this.cmbGradType, rec.attributes); @@ -1170,7 +1203,7 @@ define([ this._state.GradFillType = this.GradFillType; } - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR ) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR ) { var value = Math.floor(fill.get_linear_angle()/60000); if (Math.abs(this.GradLinearDirectionType-value)>0.001) { this.GradLinearDirectionType=value; @@ -1187,7 +1220,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -1198,7 +1231,7 @@ define([ color = colors[1]; if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -1226,7 +1259,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; @@ -1269,10 +1302,10 @@ define([ strokeType = (stroke) ? stroke.get_type() : null; if (stroke) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { color = stroke.get_color(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BorderColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }}; } else @@ -1311,10 +1344,10 @@ define([ this._state.StrokeColor = this.BorderColor.Color; } - if (this._state.StrokeType !== strokeType || strokeType == c_oAscStrokeType.STROKE_COLOR) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !(/pt\s*$/.test(this.cmbBorderSize.getRawValue())); + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; @@ -1328,11 +1361,11 @@ define([ if (_selectedItem) this.cmbBorderSize.selectRecord(_selectedItem); else { - this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' pt' : ''); + this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' ' + this.txtPt : ''); } this.BorderSize = w; } - } else if (strokeType == c_oAscStrokeType.STROKE_NONE) { + } else if (strokeType == Asc.c_oAscStrokeType.STROKE_NONE) { this._state.StrokeWidth = 0; this.BorderSize = this.cmbBorderSize.store.at(0).get('value'); this.cmbBorderSize.setValue(this.BorderSize); @@ -1465,7 +1498,7 @@ define([ this.PatternFillType = this.patternViewData[0].type; } this.UpdateThemeColors(); - this.fillTransform(this.api.get_PropertyEditorTextArts()); + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); }, onInitStandartTextures: function(texture) { @@ -1498,11 +1531,11 @@ define([ this._fromTextureCmb = false; if (this.api) { - var props = new asc_TextArtProperties(); - var fill = new CAscFill(); - fill.put_type(c_oAscFill.FILL_TYPE_BLIP); - fill.put_fill( new CAscFillBlip()); - fill.get_fill().put_type(c_oAscFillBlipType.TILE); + var props = new Asc.asc_TextArtProperties(); + var fill = new Asc.asc_CShapeFill(); + fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP); + fill.put_fill( new Asc.asc_CFillBlip()); + fill.get_fill().put_type(Asc.c_oAscFillBlipType.TILE); fill.get_fill().put_texture_id(record.get('type')); props.asc_putFill(fill); this.shapeprops.put_TextArtProperties(props); @@ -1530,7 +1563,7 @@ define([ onTextArtSelect: function(combo, record){ if (this.api && !this._noApply) { - var props = new asc_TextArtProperties(); + var props = new Asc.asc_TextArtProperties(); props.asc_putStyle(record.get('data')); this.shapeprops.put_TextArtProperties(props); this.api.ShapeApply(this.shapeprops); @@ -1563,7 +1596,7 @@ define([ onTransformSelect: function(combo, record){ if (this.api && !this._noApply) { - var props = new asc_TextArtProperties(); + var props = new Asc.asc_TextArtProperties(); props.asc_putForm(record.get('type')); this.shapeprops.put_TextArtProperties(props); this.api.ShapeApply(this.shapeprops); @@ -1588,11 +1621,11 @@ define([ }, ShowHideElem: function(value) { - this.FillColorContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_SOLID); - this.FillImageContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_BLIP); - this.FillPatternContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_PATT); - this.FillGradientContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_GRAD); - this.TransparencyContainer.toggleClass('settings-hidden', (value === c_oAscFill.FILL_TYPE_NOFILL || value === null)); + this.FillColorContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_SOLID); + this.FillImageContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_BLIP); + this.FillPatternContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_PATT); + this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD); + this.TransparencyContainer.toggleClass('settings-hidden', (value === Asc.c_oAscFill.FILL_TYPE_NOFILL || value === null)); }, setLocked: function (locked) { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index c1d0e7f29..70ff8d149 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Toolbar.js * @@ -47,7 +79,8 @@ define([ noParagraphSelected: 'no-paragraph', noObjectSelected: 'no-object', disableOnStart: 'on-start', - cantPrint: 'cant-print' + cantPrint: 'cant-print', + noTextSelected: 'no-text' }; PE.Views.Toolbar = Backbone.View.extend(_.extend({ @@ -250,7 +283,7 @@ define([ menuCls : 'scrollable-menu', menuStyle : 'min-width: 325px;', hint : me.tipFontName, - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], store : new Common.Collections.Fonts() }); me.paragraphControls.push(me.cmbFontName); @@ -259,7 +292,7 @@ define([ cls : 'input-group-nr', menuStyle : 'min-width: 55px;', hint : me.tipFontSize, - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], data : [ { value: 8, displayValue: "8" }, { value: 9, displayValue: "9" }, @@ -285,7 +318,7 @@ define([ id : 'id-toolbar-btn-bold', cls : 'btn-toolbar', iconCls : 'btn-bold', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.textBold + Common.Utils.String.platformKey('Ctrl+B'), enableToggle: true }); @@ -295,7 +328,7 @@ define([ id : 'id-toolbar-btn-italic', cls : 'btn-toolbar', iconCls : 'btn-italic', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.textItalic + Common.Utils.String.platformKey('Ctrl+I'), enableToggle: true }); @@ -305,7 +338,7 @@ define([ id : 'id-toolbar-btn-underline', cls : 'btn-toolbar', iconCls : 'btn-underline', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.textUnderline + Common.Utils.String.platformKey('Ctrl+U'), enableToggle: true }); @@ -315,7 +348,7 @@ define([ id : 'id-toolbar-btn-strikeout', cls : 'btn-toolbar', iconCls : 'btn-strikeout', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.textStrikeout, enableToggle: true }); @@ -325,7 +358,7 @@ define([ id : 'id-toolbar-btn-superscript', cls : 'btn-toolbar', iconCls : 'btn-superscript', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.textSuperscript, enableToggle: true, toggleGroup : 'superscriptGroup' @@ -336,7 +369,7 @@ define([ id : 'id-toolbar-btn-subscript', cls : 'btn-toolbar', iconCls : 'btn-subscript', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.textSubscript, enableToggle: true, toggleGroup : 'superscriptGroup' @@ -347,7 +380,7 @@ define([ id : 'id-toolbar-btn-fontcolor', cls : 'btn-toolbar', iconCls : 'btn-fontcolor', - lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], hint : me.tipFontColor, split : true, menu : new Common.UI.Menu({ @@ -536,7 +569,7 @@ define([ icls : 'btn-align-top', checkable : true, toggleGroup : 'valignGroup', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP }, { caption : me.textAlignMiddle, @@ -544,7 +577,7 @@ define([ icls : 'btn-align-middle', checkable : true, toggleGroup : 'valignGroup', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_CTR, + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR, checked : true }, { @@ -553,7 +586,7 @@ define([ icls : 'btn-align-bottom', checkable : true, toggleGroup : 'valignGroup', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM } ] }) @@ -664,31 +697,31 @@ define([ { id: 'menu-chart-group-stock', caption: me.textStock } ]), store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked, allowSelected: true, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer, allowSelected: true, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3d, allowSelected: true, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked3d, allowSelected: true, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer3d, allowSelected: true, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3dPerspective, allowSelected: true, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineNormal, allowSelected: true, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStacked, allowSelected: true, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStackedPer, allowSelected: true, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.line3d, allowSelected: true, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie, allowSelected: true, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.doughnut, allowSelected: true, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie3d, allowSelected: true, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal, allowSelected: true, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked, allowSelected: true, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer, allowSelected: true, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal3d, allowSelected: true, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked3d, allowSelected: true, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer3d, allowSelected: true, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaNormal, allowSelected: true, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStacked, allowSelected: true, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'} + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, allowSelected: true, iconCls: 'column-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, allowSelected: true, iconCls: 'column-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, allowSelected: true, iconCls: 'column-3d-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, allowSelected: true, iconCls: 'column-3d-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, allowSelected: true, iconCls: 'column-3d-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, allowSelected: true, iconCls: 'column-3d-normal-per'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, allowSelected: true, iconCls: 'line-normal'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, allowSelected: true, iconCls: 'line-stack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, allowSelected: true, iconCls: 'line-pstack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, allowSelected: true, iconCls: 'line-3d'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, allowSelected: true, iconCls: 'pie-normal'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, allowSelected: true, iconCls: 'pie-doughnut'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, allowSelected: true, iconCls: 'pie-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, allowSelected: true, iconCls: 'bar-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, allowSelected: true, iconCls: 'bar-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, allowSelected: true, iconCls: 'bar-pstack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, allowSelected: true, iconCls: 'bar-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, allowSelected: true, iconCls: 'bar-3d-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, allowSelected: true, iconCls: 'bar-3d-pstack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, allowSelected: true, iconCls: 'area-normal'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, allowSelected: true, iconCls: 'area-stack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'}, + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'} ]), itemTemplate: _.template('
    ') }) @@ -865,32 +898,32 @@ define([ { caption : me.textShapeAlignLeft, iconCls : 'mnu-shape-align-left', - value : c_oAscAlignShapeType.ALIGN_LEFT + value : Asc.c_oAscAlignShapeType.ALIGN_LEFT }, { caption : me.textShapeAlignCenter, iconCls : 'mnu-shape-align-center', - value : c_oAscAlignShapeType.ALIGN_CENTER + value : Asc.c_oAscAlignShapeType.ALIGN_CENTER }, { caption : me.textShapeAlignRight, iconCls : 'mnu-shape-align-right', - value : c_oAscAlignShapeType.ALIGN_RIGHT + value : Asc.c_oAscAlignShapeType.ALIGN_RIGHT }, { caption : me.textShapeAlignTop, iconCls : 'mnu-shape-align-top', - value : c_oAscAlignShapeType.ALIGN_TOP + value : Asc.c_oAscAlignShapeType.ALIGN_TOP }, { caption : me.textShapeAlignMiddle, iconCls : 'mnu-shape-align-middle', - value : c_oAscAlignShapeType.ALIGN_MIDDLE + value : Asc.c_oAscAlignShapeType.ALIGN_MIDDLE }, { caption : me.textShapeAlignBottom, iconCls : 'mnu-shape-align-bottom', - value : c_oAscAlignShapeType.ALIGN_BOTTOM + value : Asc.c_oAscAlignShapeType.ALIGN_BOTTOM }, {caption: '--' }, { diff --git a/apps/presentationeditor/main/app/view/Viewport.js b/apps/presentationeditor/main/app/view/Viewport.js index 741ad9a15..155e81817 100644 --- a/apps/presentationeditor/main/app/view/Viewport.js +++ b/apps/presentationeditor/main/app/view/Viewport.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Viewport.js * diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js new file mode 100644 index 000000000..506d587d3 --- /dev/null +++ b/apps/presentationeditor/main/app_dev.js @@ -0,0 +1,218 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * app.js + * + * Created by Julia Radzhabova on 26 March 2014 + * Copyright (c) 2014 Ascensio System SIA. All rights reserved. + * + */ + +'use strict'; +var reqerr; +require.config({ + // The shim config allows us to configure dependencies for + // scripts that do not call define() to register a module + baseUrl: '../../', + paths: { + jquery : '../vendor/jquery/jquery', + underscore : '../vendor/underscore/underscore', + backbone : '../vendor/backbone/backbone', + bootstrap : '../vendor/bootstrap/dist/js/bootstrap', + text : '../vendor/requirejs-text/text', + perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', + jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', + xregexp : '../vendor/xregexp/xregexp-all-min', + sockjs : '../vendor/sockjs/sockjs.min', + jsziputils : '../vendor/jszip-utils/jszip-utils.min', + jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', + api : 'api/documents/api', + core : 'common/main/lib/core/application', + notification : 'common/main/lib/core/NotificationCenter', + keymaster : 'common/main/lib/core/keymaster', + tip : 'common/main/lib/util/Tip', + localstorage : 'common/main/lib/util/LocalStorage', + analytics : 'common/Analytics', + gateway : 'common/Gateway', + locale : 'common/locale', + irregularstack : 'common/IrregularStack' + }, + shim: { + underscore: { + exports: '_' + }, + backbone: { + deps: [ + 'underscore', + 'jquery' + ], + exports: 'Backbone' + }, + bootstrap: { + deps: [ + 'jquery' + ] + }, + perfectscrollbar: { + deps: [ + 'jmousewheel' + ] + }, + notification: { + deps: [ + 'backbone' + ] + }, + core: { + deps: [ + 'backbone', + 'notification', + 'irregularstack' + ] + }, + gateway: { + deps: [ + 'jquery' + ] + }, + analytics: { + deps: [ + 'jquery' + ] + } + } +}); + +require([ + 'backbone', + 'bootstrap', + 'core', + 'api', + 'analytics', + 'gateway', + 'locale', + 'jsziputils', + 'jsrsasign', + 'sockjs', + 'xregexp', + 'underscore' +], function (Backbone, Bootstrap, Core) { + Backbone.history.start(); + + /** + * Application instance with PE namespace defined + */ + var app = new Backbone.Application({ + nameSpace: 'PE', + autoCreate: false, + controllers : [ + 'Viewport', + 'DocumentHolder', + 'Toolbar', + 'Statusbar', + 'RightMenu', + 'LeftMenu', + 'Main', + 'Common.Controllers.Fonts' + /** coauthoring begin **/ + , 'Common.Controllers.Chat', + 'Common.Controllers.Comments', + /** coauthoring end **/ + 'Common.Controllers.ExternalDiagramEditor' + ] + }); + + Common.Locale.apply(); + + require([ + 'presentationeditor/main/app/controller/Viewport', + 'presentationeditor/main/app/controller/DocumentHolder', + 'presentationeditor/main/app/controller/Toolbar', + 'presentationeditor/main/app/controller/Statusbar', + 'presentationeditor/main/app/controller/RightMenu', + 'presentationeditor/main/app/controller/LeftMenu', + 'presentationeditor/main/app/controller/Main', + 'presentationeditor/main/app/view/ParagraphSettings', + 'presentationeditor/main/app/view/ImageSettings', + 'presentationeditor/main/app/view/ShapeSettings', + 'presentationeditor/main/app/view/SlideSettings', + 'presentationeditor/main/app/view/TableSettings', + 'presentationeditor/main/app/view/TextArtSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts' + /** coauthoring begin **/ + ,'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat', + /** coauthoring end **/ + 'presentationeditor/main/app/view/ChartSettings', + 'common/main/lib/controller/ExternalDiagramEditor' + ], function() { + app.start(); + }); +}, function(err) { + if (err.requireType == 'timeout' && !reqerr) { + var getUrlParams = function() { + var e, + a = /\+/g, // Regex for replacing addition symbol with a space + r = /([^&=]+)=?([^&]*)/g, + d = function (s) { return decodeURIComponent(s.replace(a, " ")); }, + q = window.location.search.substring(1), + urlParams = {}; + + while (e = r.exec(q)) + urlParams[d(e[1])] = d(e[2]); + + return urlParams; + }; + + var encodeUrlParam = function(str) { + return str.replace(/&/g, '&') + .replace(/"/g, '"') + .replace(/'/g, ''') + .replace(//g, '>'); + }; + + var lang = (getUrlParams()["lang"] || 'en').split("-")[0]; + + if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; + else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; + else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; + else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; + else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; + + window.alert(reqerr); + window.location.reload(); + } +}); \ No newline at end of file diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index f5b9c3ec5..f432bbacf 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -229,12 +229,26 @@
    + + + + + + + + - + \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index b2323e4d2..b56b91066 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1,4 +1,6 @@ { + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
    Only two users can co-edit the document simultaneously.
    Want more? Consider buying ONLYOFFICE Enterprise Edition.
    Read more", @@ -144,8 +146,10 @@ "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", "PE.Controllers.Main.textAnonymous": "Anonymous", + "PE.Controllers.Main.textBuyNow": "Buy now", "PE.Controllers.Main.textCloseTip": "\nClick to close the tip", - "PE.Controllers.Main.textLoadingDocument": "Loading document", + "PE.Controllers.Main.textLoadingDocument": "Loading presentation", + "PE.Controllers.Main.textNoLicenseTitle": "License expired or not found", "PE.Controllers.Main.textShape": "Shape", "PE.Controllers.Main.textStrict": "Strict mode", "PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.
    Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.", @@ -210,10 +214,9 @@ "PE.Controllers.Main.uploadImageTitleText": "Uploading Image", "PE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher", "PE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", + "PE.Controllers.Main.warnNoLicense": "The license could not be found or expired. You cannot edit files.
    Click 'Buy now' to purchase Enterprise Edition license or 'Contact us' if you use Integration Edition.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "PE.Controllers.Main.textBuyNow": "Buy now", - "PE.Controllers.Main.textNoLicenseTitle": "License expired", - "PE.Controllers.Main.warnNoLicense": "The license expired. You cannot create or edit files.
    Click the \'Buy now\' button to prolong the license.", + "PE.Controllers.Main.textContactUs": "Contact us", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
    The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
    Do you want to continue?", "PE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.", @@ -345,8 +348,8 @@ "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights", "PE.Views.FileMenuPanels.Settings.okButtonText": "Apply", "PE.Views.FileMenuPanels.Settings.strAlignGuides": "Turn on alignment guides", - "PE.Views.FileMenuPanels.Settings.strAutosave": "Turn on autosave", "PE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover", + "PE.Views.FileMenuPanels.Settings.strAutosave": "Turn on autosave", "PE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing Mode", "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once", "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", @@ -361,8 +364,8 @@ "PE.Views.FileMenuPanels.Settings.text5Minutes": "Every 5 Minutes", "PE.Views.FileMenuPanels.Settings.text60Minutes": "Every Hour", "PE.Views.FileMenuPanels.Settings.textAlignGuides": "Alignment Guides", - "PE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave", "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover", + "PE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave", "PE.Views.FileMenuPanels.Settings.textDisabled": "Disabled", "PE.Views.FileMenuPanels.Settings.textMinute": "Every Minute", "PE.Views.FileMenuPanels.Settings.txtAll": "View All", @@ -371,6 +374,7 @@ "PE.Views.FileMenuPanels.Settings.txtInput": "Alternate Input", "PE.Views.FileMenuPanels.Settings.txtLast": "View Last", "PE.Views.FileMenuPanels.Settings.txtPt": "Point", + "PE.Views.FileMenuPanels.Settings.txtInch": "Inch", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancel", "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Display", @@ -418,7 +422,7 @@ "PE.Views.LeftMenu.tipSupport": "Feedback & Support", "PE.Views.LeftMenu.tipTitles": "Titles", "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing", - "PE.Views.ParagraphSettings.strParagraphSpacing": "Spacing", + "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "PE.Views.ParagraphSettings.strSpacingAfter": "After", "PE.Views.ParagraphSettings.strSpacingBefore": "Before", "PE.Views.ParagraphSettings.textAdvanced": "Show advanced settings", @@ -572,6 +576,7 @@ "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Reset Changes", "PE.Views.SlideSettings.textRight": "Right", + "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Select", "PE.Views.SlideSettings.textSmoothly": "Smoothly", "PE.Views.SlideSettings.textSplit": "Split", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 512eba473..6a22d5d92 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -1,4 +1,6 @@ { + "Common.Utils.Metric.txtCm": "см", + "Common.Utils.Metric.txtPt": "пт", "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", "Common.Controllers.Chat.textUserLimit": "Вы используете бесплатную версию ONLYOFFICE.
    Только два пользователя одновременно могут совместно редактировать документ.
    Требуется больше? Рекомендуем приобрести корпоративную версию ONLYOFFICE.
    Читать дальше", @@ -23,6 +25,7 @@ "Common.UI.SearchDialog.textTitle": "Поиск", "Common.UI.SearchDialog.textTitle2": "Поиск", "Common.UI.SearchDialog.textWholeWords": "Только слово целиком", + "Common.UI.SearchDialog.txtBtnHideReplace": "Скрыть поле замены", "Common.UI.SearchDialog.txtBtnReplace": "Заменить", "Common.UI.SearchDialog.txtBtnReplaceAll": "Заменить все", "Common.UI.SynchronizeTip.textDontShow": "Больше не показывать это сообщение", @@ -143,8 +146,10 @@ "PE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1.", "PE.Controllers.Main.textAnonymous": "Аноним", + "PE.Controllers.Main.textBuyNow": "Купить", "PE.Controllers.Main.textCloseTip": "\nЩелкните, чтобы закрыть эту подсказку", - "PE.Controllers.Main.textLoadingDocument": "Загрузка документа", + "PE.Controllers.Main.textLoadingDocument": "Загрузка презентации", + "PE.Controllers.Main.textNoLicenseTitle": "Лицензия не найдена или истек ее срок действия", "PE.Controllers.Main.textShape": "Фигура", "PE.Controllers.Main.textStrict": "Строгий режим", "PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
    Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.", @@ -209,10 +214,8 @@ "PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "PE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "PE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0", + "PE.Controllers.Main.warnNoLicense": "Лицензия не найдена или истек ее срок действия. Вы не можете редактировать файлы.
    Нажмите кнопку 'Купить' для покупки лицензии на Enterprise Edition или 'Связаться с нами', если вы используете Integration Edition.", "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", - "PE.Controllers.Main.textBuyNow": "Купить", - "PE.Controllers.Main.textNoLicenseTitle": "Истек срок действия лицензии", - "PE.Controllers.Main.warnNoLicense": "Истек срок действия лицензии. Вы не можете создавать и редактировать файлы.
    Нажмите кнопку \'Купить\' для продления лицензии.", "PE.Controllers.Statusbar.zoomText": "Масштаб {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы собираетесь сохранить, недоступен на этом устройстве.
    Стиль текста будет отображаться с использованием одного из системных шрифтов; сохраненный шрифт будет использоваться, когда он будет доступен.
    Вы хотите продолжить?", "PE.Controllers.Toolbar.textEmptyImgUrl": "Необходимо указать URL изображения.", @@ -344,6 +347,7 @@ "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Люди, имеющие права", "PE.Views.FileMenuPanels.Settings.okButtonText": "Применить", "PE.Views.FileMenuPanels.Settings.strAlignGuides": "Включить направляющие выравнивания", + "PE.Views.FileMenuPanels.Settings.strAutoRecover": "Включить автовосстановление", "PE.Views.FileMenuPanels.Settings.strAutosave": "Включить автосохранение", "PE.Views.FileMenuPanels.Settings.strCoAuthMode": "Режим совместного редактирования", "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Другие пользователи будут сразу же видеть ваши изменения", @@ -359,6 +363,7 @@ "PE.Views.FileMenuPanels.Settings.text5Minutes": "Каждые 5 минут", "PE.Views.FileMenuPanels.Settings.text60Minutes": "Каждый час", "PE.Views.FileMenuPanels.Settings.textAlignGuides": "Направляющие выравнивания", + "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Автосохранение", "PE.Views.FileMenuPanels.Settings.textDisabled": "Отключено", "PE.Views.FileMenuPanels.Settings.textMinute": "Каждую минуту", @@ -368,6 +373,7 @@ "PE.Views.FileMenuPanels.Settings.txtInput": "Альтернативный ввод", "PE.Views.FileMenuPanels.Settings.txtLast": "Последние", "PE.Views.FileMenuPanels.Settings.txtPt": "Пункт", + "PE.Views.FileMenuPanels.Settings.txtInch": "Дюйм", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Отмена", "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Отображать", @@ -414,8 +420,8 @@ "PE.Views.LeftMenu.tipSlides": "Слайды", "PE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка", "PE.Views.LeftMenu.tipTitles": "Заголовки", - "PE.Views.ParagraphSettings.strLineHeight": "Междустрочный", - "PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал", + "PE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", + "PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "PE.Views.ParagraphSettings.strSpacingAfter": "После", "PE.Views.ParagraphSettings.strSpacingBefore": "Перед", "PE.Views.ParagraphSettings.textAdvanced": "Дополнительные параметры", @@ -569,6 +575,7 @@ "PE.Views.SlideSettings.textRadial": "Радиальный", "PE.Views.SlideSettings.textReset": "Сбросить изменения", "PE.Views.SlideSettings.textRight": "Справа", + "PE.Views.SlideSettings.textSec": "сек", "PE.Views.SlideSettings.textSelectTexture": "Выбрать", "PE.Views.SlideSettings.textSmoothly": "Плавно", "PE.Views.SlideSettings.textSplit": "Панорама", diff --git a/apps/presentationeditor/main/resources/help/de/callback.js b/apps/presentationeditor/main/resources/help/de/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/presentationeditor/main/resources/help/de/callback.js +++ b/apps/presentationeditor/main/resources/help/de/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/presentationeditor/main/resources/help/de/images/AddSlide.png b/apps/presentationeditor/main/resources/help/de/images/addslide.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/AddSlide.png rename to apps/presentationeditor/main/resources/help/de/images/addslide.png diff --git a/apps/presentationeditor/main/resources/help/de/images/ColorScheme.png b/apps/presentationeditor/main/resources/help/de/images/colorscheme.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/ColorScheme.png rename to apps/presentationeditor/main/resources/help/de/images/colorscheme.png diff --git a/apps/presentationeditor/main/resources/help/de/images/GreenCircle.png b/apps/presentationeditor/main/resources/help/de/images/greencircle.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/GreenCircle.png rename to apps/presentationeditor/main/resources/help/de/images/greencircle.png diff --git a/apps/presentationeditor/main/resources/help/de/images/Image_Settings_Icon.png b/apps/presentationeditor/main/resources/help/de/images/image_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/Image_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/de/images/image_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/de/images/RowsandColumns.png b/apps/presentationeditor/main/resources/help/de/images/rowsandcolumns.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/RowsandColumns.png rename to apps/presentationeditor/main/resources/help/de/images/rowsandcolumns.png diff --git a/apps/presentationeditor/main/resources/help/de/images/SearchDownButton.png b/apps/presentationeditor/main/resources/help/de/images/searchdownbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/SearchDownButton.png rename to apps/presentationeditor/main/resources/help/de/images/searchdownbutton.png diff --git a/apps/presentationeditor/main/resources/help/de/images/SearchUpButton.png b/apps/presentationeditor/main/resources/help/de/images/searchupbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/SearchUpButton.png rename to apps/presentationeditor/main/resources/help/de/images/searchupbutton.png diff --git a/apps/presentationeditor/main/resources/help/de/images/SelectSlideSizeIcon.png b/apps/presentationeditor/main/resources/help/de/images/selectslidesizeicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/SelectSlideSizeIcon.png rename to apps/presentationeditor/main/resources/help/de/images/selectslidesizeicon.png diff --git a/apps/presentationeditor/main/resources/help/de/images/Shape_Settings_Icon.png b/apps/presentationeditor/main/resources/help/de/images/shape_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/Shape_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/de/images/shape_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/de/images/Slide_Settings_Icon.png b/apps/presentationeditor/main/resources/help/de/images/slide_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/Slide_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/de/images/slide_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/de/images/ViewSettingsIcon.png b/apps/presentationeditor/main/resources/help/de/images/viewsettingsicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/de/images/ViewSettingsIcon.png rename to apps/presentationeditor/main/resources/help/de/images/viewsettingsicon.png diff --git a/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm b/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm index 16a7ea562..f4cd4fa78 100644 --- a/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm +++ b/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm b/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm index f19571018..7ecd927f0 100644 --- a/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertText.htm b/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertText.htm index 8fdcb35d0..de2b57fed 100644 --- a/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertText.htm +++ b/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertText.htm @@ -134,9 +134,13 @@
  • put the cursor within the paragraph you need, or select several paragraphs with the mouse,
  • use the corresponding fields of the Text Settings Icon Text Settings tab at the right sidebar to achieve the desired results:
      -
    • Line Spacing - set the line height for the text lines within the paragraph. You can select among three options: at least (sets the minimum line spacing that is needed to fit the largest font or graphic on the line), multiple (sets line spacing that can be expressed in numbers greater than 1), exactly (sets fixed line spacing). In the At field you can specify the necessary value.
      • -
    • Before - set the amount of space before the paragraph.
      • -
    • After - set the amount of space after the paragraph.
      • +
    • Line Spacing - set the line height for the text lines within the paragraph. You can select among three options: at least (sets the minimum line spacing that is needed to fit the largest font or graphic on the line), multiple (sets line spacing that can be expressed in numbers greater than 1), exactly (sets fixed line spacing). You can specify the necessary value in the field on the right.
      • +
    • Paragraph Spacing - set the amount of space between paragraphs. +
        +
      • Before - set the amount of space before the paragraph.
        • +
      • After - set the amount of space after the paragraph.
        • +
      +
    • diff --git a/apps/presentationeditor/main/resources/help/en/callback.js b/apps/presentationeditor/main/resources/help/en/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/presentationeditor/main/resources/help/en/callback.js +++ b/apps/presentationeditor/main/resources/help/en/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/presentationeditor/main/resources/help/en/images/AddSlide.png b/apps/presentationeditor/main/resources/help/en/images/addslide.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/AddSlide.png rename to apps/presentationeditor/main/resources/help/en/images/addslide.png diff --git a/apps/presentationeditor/main/resources/help/en/images/ColorScheme.png b/apps/presentationeditor/main/resources/help/en/images/colorscheme.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/ColorScheme.png rename to apps/presentationeditor/main/resources/help/en/images/colorscheme.png diff --git a/apps/presentationeditor/main/resources/help/en/images/GreenCircle.png b/apps/presentationeditor/main/resources/help/en/images/greencircle.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/GreenCircle.png rename to apps/presentationeditor/main/resources/help/en/images/greencircle.png diff --git a/apps/presentationeditor/main/resources/help/en/images/Hanging.png b/apps/presentationeditor/main/resources/help/en/images/hanging.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/Hanging.png rename to apps/presentationeditor/main/resources/help/en/images/hanging.png diff --git a/apps/presentationeditor/main/resources/help/en/images/Image_Settings_Icon.png b/apps/presentationeditor/main/resources/help/en/images/image_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/Image_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/en/images/image_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/en/images/RowsandColumns.png b/apps/presentationeditor/main/resources/help/en/images/rowsandcolumns.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/RowsandColumns.png rename to apps/presentationeditor/main/resources/help/en/images/rowsandcolumns.png diff --git a/apps/presentationeditor/main/resources/help/en/images/SearchDownButton.png b/apps/presentationeditor/main/resources/help/en/images/searchdownbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/SearchDownButton.png rename to apps/presentationeditor/main/resources/help/en/images/searchdownbutton.png diff --git a/apps/presentationeditor/main/resources/help/en/images/SearchUpButton.png b/apps/presentationeditor/main/resources/help/en/images/searchupbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/SearchUpButton.png rename to apps/presentationeditor/main/resources/help/en/images/searchupbutton.png diff --git a/apps/presentationeditor/main/resources/help/en/images/SelectSlideSizeIcon.png b/apps/presentationeditor/main/resources/help/en/images/selectslidesizeicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/SelectSlideSizeIcon.png rename to apps/presentationeditor/main/resources/help/en/images/selectslidesizeicon.png diff --git a/apps/presentationeditor/main/resources/help/en/images/Shape_Settings_Icon.png b/apps/presentationeditor/main/resources/help/en/images/shape_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/Shape_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/en/images/shape_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/en/images/Slide_Settings_Icon.png b/apps/presentationeditor/main/resources/help/en/images/slide_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/Slide_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/en/images/slide_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/en/images/SlideSizeSettingsWindow.png b/apps/presentationeditor/main/resources/help/en/images/slidesizesettingswindow.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/SlideSizeSettingsWindow.png rename to apps/presentationeditor/main/resources/help/en/images/slidesizesettingswindow.png diff --git a/apps/presentationeditor/main/resources/help/en/images/Table_Settings_Icon.png b/apps/presentationeditor/main/resources/help/en/images/table_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/Table_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/en/images/table_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/en/images/textsettingstab.png b/apps/presentationeditor/main/resources/help/en/images/textsettingstab.png index eb5adcbe2..77308a6be 100644 Binary files a/apps/presentationeditor/main/resources/help/en/images/textsettingstab.png and b/apps/presentationeditor/main/resources/help/en/images/textsettingstab.png differ diff --git a/apps/presentationeditor/main/resources/help/en/images/ViewSettingsIcon.png b/apps/presentationeditor/main/resources/help/en/images/viewsettingsicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/en/images/ViewSettingsIcon.png rename to apps/presentationeditor/main/resources/help/en/images/viewsettingsicon.png diff --git a/apps/presentationeditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm b/apps/presentationeditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm index ebaf5935d..e4cad0511 100644 --- a/apps/presentationeditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/presentationeditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/presentationeditor/main/resources/help/es/callback.js b/apps/presentationeditor/main/resources/help/es/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/presentationeditor/main/resources/help/es/callback.js +++ b/apps/presentationeditor/main/resources/help/es/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/presentationeditor/main/resources/help/es/images/AddSlide.png b/apps/presentationeditor/main/resources/help/es/images/addslide.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/AddSlide.png rename to apps/presentationeditor/main/resources/help/es/images/addslide.png diff --git a/apps/presentationeditor/main/resources/help/es/images/ColorScheme.png b/apps/presentationeditor/main/resources/help/es/images/colorscheme.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/ColorScheme.png rename to apps/presentationeditor/main/resources/help/es/images/colorscheme.png diff --git a/apps/presentationeditor/main/resources/help/es/images/GreenCircle.png b/apps/presentationeditor/main/resources/help/es/images/greencircle.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/GreenCircle.png rename to apps/presentationeditor/main/resources/help/es/images/greencircle.png diff --git a/apps/presentationeditor/main/resources/help/es/images/Hanging.png b/apps/presentationeditor/main/resources/help/es/images/hanging.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/Hanging.png rename to apps/presentationeditor/main/resources/help/es/images/hanging.png diff --git a/apps/presentationeditor/main/resources/help/es/images/Image_Settings_Icon.png b/apps/presentationeditor/main/resources/help/es/images/image_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/Image_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/es/images/image_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/es/images/RowsandColumns.png b/apps/presentationeditor/main/resources/help/es/images/rowsandcolumns.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/RowsandColumns.png rename to apps/presentationeditor/main/resources/help/es/images/rowsandcolumns.png diff --git a/apps/presentationeditor/main/resources/help/es/images/SearchDownButton.png b/apps/presentationeditor/main/resources/help/es/images/searchdownbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/SearchDownButton.png rename to apps/presentationeditor/main/resources/help/es/images/searchdownbutton.png diff --git a/apps/presentationeditor/main/resources/help/es/images/SearchUpButton.png b/apps/presentationeditor/main/resources/help/es/images/searchupbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/SearchUpButton.png rename to apps/presentationeditor/main/resources/help/es/images/searchupbutton.png diff --git a/apps/presentationeditor/main/resources/help/es/images/SelectSlideSizeIcon.png b/apps/presentationeditor/main/resources/help/es/images/selectslidesizeicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/SelectSlideSizeIcon.png rename to apps/presentationeditor/main/resources/help/es/images/selectslidesizeicon.png diff --git a/apps/presentationeditor/main/resources/help/es/images/Shape_Settings_Icon.png b/apps/presentationeditor/main/resources/help/es/images/shape_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/Shape_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/es/images/shape_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/es/images/Slide_Settings_Icon.png b/apps/presentationeditor/main/resources/help/es/images/slide_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/Slide_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/es/images/slide_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/es/images/SlideSizeSettingsWindow.png b/apps/presentationeditor/main/resources/help/es/images/slidesizesettingswindow.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/SlideSizeSettingsWindow.png rename to apps/presentationeditor/main/resources/help/es/images/slidesizesettingswindow.png diff --git a/apps/presentationeditor/main/resources/help/es/images/Table_Settings_Icon.png b/apps/presentationeditor/main/resources/help/es/images/table_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/Table_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/es/images/table_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/es/images/ViewSettingsIcon.png b/apps/presentationeditor/main/resources/help/es/images/viewsettingsicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/es/images/ViewSettingsIcon.png rename to apps/presentationeditor/main/resources/help/es/images/viewsettingsicon.png diff --git a/apps/presentationeditor/main/resources/help/it/callback.js b/apps/presentationeditor/main/resources/help/it/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/presentationeditor/main/resources/help/it/callback.js +++ b/apps/presentationeditor/main/resources/help/it/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/presentationeditor/main/resources/help/it/images/AddSlide.png b/apps/presentationeditor/main/resources/help/it/images/addslide.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/AddSlide.png rename to apps/presentationeditor/main/resources/help/it/images/addslide.png diff --git a/apps/presentationeditor/main/resources/help/it/images/ColorScheme.png b/apps/presentationeditor/main/resources/help/it/images/colorscheme.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/ColorScheme.png rename to apps/presentationeditor/main/resources/help/it/images/colorscheme.png diff --git a/apps/presentationeditor/main/resources/help/it/images/GreenCircle.png b/apps/presentationeditor/main/resources/help/it/images/greencircle.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/GreenCircle.png rename to apps/presentationeditor/main/resources/help/it/images/greencircle.png diff --git a/apps/presentationeditor/main/resources/help/it/images/Image_Settings_Icon.png b/apps/presentationeditor/main/resources/help/it/images/image_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/Image_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/it/images/image_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/it/images/RowsandColumns.png b/apps/presentationeditor/main/resources/help/it/images/rowsandcolumns.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/RowsandColumns.png rename to apps/presentationeditor/main/resources/help/it/images/rowsandcolumns.png diff --git a/apps/presentationeditor/main/resources/help/it/images/SearchDownButton.png b/apps/presentationeditor/main/resources/help/it/images/searchdownbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/SearchDownButton.png rename to apps/presentationeditor/main/resources/help/it/images/searchdownbutton.png diff --git a/apps/presentationeditor/main/resources/help/it/images/SearchUpButton.png b/apps/presentationeditor/main/resources/help/it/images/searchupbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/SearchUpButton.png rename to apps/presentationeditor/main/resources/help/it/images/searchupbutton.png diff --git a/apps/presentationeditor/main/resources/help/it/images/SelectSlideSizeIcon.png b/apps/presentationeditor/main/resources/help/it/images/selectslidesizeicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/SelectSlideSizeIcon.png rename to apps/presentationeditor/main/resources/help/it/images/selectslidesizeicon.png diff --git a/apps/presentationeditor/main/resources/help/it/images/Shape_Settings_Icon.png b/apps/presentationeditor/main/resources/help/it/images/shape_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/Shape_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/it/images/shape_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/it/images/Slide_Settings_Icon.png b/apps/presentationeditor/main/resources/help/it/images/slide_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/Slide_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/it/images/slide_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/it/images/SlideSizeSettingsWindow.png b/apps/presentationeditor/main/resources/help/it/images/slidesizesettingswindow.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/SlideSizeSettingsWindow.png rename to apps/presentationeditor/main/resources/help/it/images/slidesizesettingswindow.png diff --git a/apps/presentationeditor/main/resources/help/it/images/Table_Settings_Icon.png b/apps/presentationeditor/main/resources/help/it/images/table_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/Table_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/it/images/table_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/it/images/ViewSettingsIcon.png b/apps/presentationeditor/main/resources/help/it/images/viewsettingsicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/it/images/ViewSettingsIcon.png rename to apps/presentationeditor/main/resources/help/it/images/viewsettingsicon.png diff --git a/apps/presentationeditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm b/apps/presentationeditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm index 7bdd91805..92d9e79fe 100644 --- a/apps/presentationeditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm +++ b/apps/presentationeditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm b/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm index 5ca312b21..52fbc2925 100644 --- a/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertText.htm b/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertText.htm index 2bd8f4e88..8d7eedfaf 100644 --- a/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertText.htm +++ b/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertText.htm @@ -134,9 +134,13 @@
  • установите курсор в пределах нужного абзаца, или выделите мышью несколько абзацев,
  • используйте соответствующие поля вкладки Значок Параметры текста Параметры текста на правой боковой панели, чтобы добиться нужного результата:
      -
    • Междустрочный - задайте высоту строки для строк текста в абзаце. Вы можете выбрать одну из трех опций: минимум (устанавливает минимальный междустрочный интервал, который требуется, чтобы соответствовать самому крупному шрифту или графическому элементу на строке), множитель (устанавливает междустрочный интервал, который может быть выражен в числах больше 1), точно (устанавливает фиксированный междустрочный интервал). В поле Значение вы можете указать необходимое значение.
      • -
    • Перед - задайте величину свободного места перед абзацем.
      • -
    • После - задайте величину свободного места после абзаца.
      • +
    • Междустрочный интервал - задайте высоту строки для строк текста в абзаце. Вы можете выбрать одну из трех опций: минимум (устанавливает минимальный междустрочный интервал, который требуется, чтобы соответствовать самому крупному шрифту или графическому элементу на строке), множитель (устанавливает междустрочный интервал, который может быть выражен в числах больше 1), точно (устанавливает фиксированный междустрочный интервал). Необходимое значение можно указать в поле справа.
      • +
    • Интервал между абзацами - задайте величину свободного пространства между абзацами. +
        +
      • Перед - задайте величину свободного пространства перед абзацем.
        • +
      • После - задайте величину свободного пространства после абзаца.
        • +
      +
    • diff --git a/apps/presentationeditor/main/resources/help/ru/callback.js b/apps/presentationeditor/main/resources/help/ru/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/presentationeditor/main/resources/help/ru/callback.js +++ b/apps/presentationeditor/main/resources/help/ru/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/presentationeditor/main/resources/help/ru/images/AddSlide.png b/apps/presentationeditor/main/resources/help/ru/images/addslide.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/AddSlide.png rename to apps/presentationeditor/main/resources/help/ru/images/addslide.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/ColorScheme.png b/apps/presentationeditor/main/resources/help/ru/images/colorscheme.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/ColorScheme.png rename to apps/presentationeditor/main/resources/help/ru/images/colorscheme.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/GreenCircle.png b/apps/presentationeditor/main/resources/help/ru/images/greencircle.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/GreenCircle.png rename to apps/presentationeditor/main/resources/help/ru/images/greencircle.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/Hanging.png b/apps/presentationeditor/main/resources/help/ru/images/hanging.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/Hanging.png rename to apps/presentationeditor/main/resources/help/ru/images/hanging.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/Image_Settings_Icon.png b/apps/presentationeditor/main/resources/help/ru/images/image_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/Image_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/ru/images/image_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/RowsandColumns.png b/apps/presentationeditor/main/resources/help/ru/images/rowsandcolumns.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/RowsandColumns.png rename to apps/presentationeditor/main/resources/help/ru/images/rowsandcolumns.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/SearchDownButton.png b/apps/presentationeditor/main/resources/help/ru/images/searchdownbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/SearchDownButton.png rename to apps/presentationeditor/main/resources/help/ru/images/searchdownbutton.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/SearchUpButton.png b/apps/presentationeditor/main/resources/help/ru/images/searchupbutton.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/SearchUpButton.png rename to apps/presentationeditor/main/resources/help/ru/images/searchupbutton.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/SelectSlideSizeIcon.png b/apps/presentationeditor/main/resources/help/ru/images/selectslidesizeicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/SelectSlideSizeIcon.png rename to apps/presentationeditor/main/resources/help/ru/images/selectslidesizeicon.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/Shape_Settings_Icon.png b/apps/presentationeditor/main/resources/help/ru/images/shape_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/Shape_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/ru/images/shape_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/ShapeSettingsTab.png b/apps/presentationeditor/main/resources/help/ru/images/shapesettingstab.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/ShapeSettingsTab.png rename to apps/presentationeditor/main/resources/help/ru/images/shapesettingstab.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/Slide_Settings_Icon.png b/apps/presentationeditor/main/resources/help/ru/images/slide_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/Slide_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/ru/images/slide_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/SlideSettingsTab.png b/apps/presentationeditor/main/resources/help/ru/images/slidesettingstab.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/SlideSettingsTab.png rename to apps/presentationeditor/main/resources/help/ru/images/slidesettingstab.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/SlideSizeSettingsWindow.png b/apps/presentationeditor/main/resources/help/ru/images/slidesizesettingswindow.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/SlideSizeSettingsWindow.png rename to apps/presentationeditor/main/resources/help/ru/images/slidesizesettingswindow.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/Table_Settings_Icon.png b/apps/presentationeditor/main/resources/help/ru/images/table_settings_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/Table_Settings_Icon.png rename to apps/presentationeditor/main/resources/help/ru/images/table_settings_icon.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/textart_transformation.png b/apps/presentationeditor/main/resources/help/ru/images/textart_transformation.png index 39f86f3b5..420160b10 100644 Binary files a/apps/presentationeditor/main/resources/help/ru/images/textart_transformation.png and b/apps/presentationeditor/main/resources/help/ru/images/textart_transformation.png differ diff --git a/apps/presentationeditor/main/resources/help/ru/images/textbox_boxselected.png b/apps/presentationeditor/main/resources/help/ru/images/textbox_boxselected.png index 18c3358fe..a1fed7b45 100644 Binary files a/apps/presentationeditor/main/resources/help/ru/images/textbox_boxselected.png and b/apps/presentationeditor/main/resources/help/ru/images/textbox_boxselected.png differ diff --git a/apps/presentationeditor/main/resources/help/ru/images/textbox_textselected.png b/apps/presentationeditor/main/resources/help/ru/images/textbox_textselected.png index d3a103dc3..c342ac519 100644 Binary files a/apps/presentationeditor/main/resources/help/ru/images/textbox_textselected.png and b/apps/presentationeditor/main/resources/help/ru/images/textbox_textselected.png differ diff --git a/apps/presentationeditor/main/resources/help/ru/images/TextSettingsTab.png b/apps/presentationeditor/main/resources/help/ru/images/textsettingstab.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/TextSettingsTab.png rename to apps/presentationeditor/main/resources/help/ru/images/textsettingstab.png diff --git a/apps/presentationeditor/main/resources/help/ru/images/ViewSettingsIcon.png b/apps/presentationeditor/main/resources/help/ru/images/viewsettingsicon.png similarity index 100% rename from apps/presentationeditor/main/resources/help/ru/images/ViewSettingsIcon.png rename to apps/presentationeditor/main/resources/help/ru/images/viewsettingsicon.png diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js index 982ea2779..856cda384 100644 --- a/apps/presentationeditor/mobile/app.js +++ b/apps/presentationeditor/mobile/app.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.application({ name: 'PE', diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index f5017cb36..228d389f2 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.controller.Main', { extend: 'Ext.app.Controller', editMode: false, @@ -28,13 +60,11 @@ Ext.define('PE.controller.Main', { app = this.getApplication(), profile = app.getCurrentProfile(); - api = new asc_docs_api("id-sdkeditor"); - api.SetMobileVersion(true); - api.CreateComponents(); - api.asc_SetFontsPath("../../../sdk/Fonts/"); - api.SetThemesPath("../../../sdk/PowerPoint/themes/"); - api.Init(); - api.initEvents2MobileAdvances(); + api = new Asc.asc_docs_api({ + 'id-view' : 'id-sdkeditor', + 'mobile' : true + }); + api.SetThemesPath("../../../../sdkjs/slide/themes/"); api.asc_registerCallback('asc_onStartAction', Ext.bind(this.onLongActionBegin, this)); api.asc_registerCallback('asc_onError', Ext.bind(this.onError, this)); @@ -70,6 +100,7 @@ Ext.define('PE.controller.Main', { }, loadConfig: function(data) { + this.editorConfig = Ext.merge(this.editorConfig, data.config); this.editorConfig.user = this._fillUserInfo(data.config.user, this.editorConfig.lang, this.textAnonymous); }, @@ -77,13 +108,13 @@ Ext.define('PE.controller.Main', { if (data.doc) { this.permissions = data.doc.permissions; - var _user = new CUserInfo(); + var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.editorConfig.user.id); _user.put_FirstName(this.editorConfig.user.firstname); _user.put_LastName(this.editorConfig.user.lastname); _user.put_FullName(this.editorConfig.user.fullname); - var docInfo = new CDocInfo(); + var docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(data.doc.key); docInfo.put_Url(data.doc.url); docInfo.put_Title(data.doc.title); @@ -140,11 +171,11 @@ Ext.define('PE.controller.Main', { var text = ''; switch (id) { - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: text = this.printText; } - if (type == c_oAscAsyncActionType['BlockInteraction']) { + if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { Ext.Viewport.setMasked({ xtype : 'loadmask', message : text @@ -166,55 +197,55 @@ Ext.define('PE.controller.Main', { switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: config.message = this.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: config.message = this.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: config.message = this.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: config.message = this.downloadErrorText; break; - case c_oAscError.ID.UplImageSize: + case Asc.c_oAscError.ID.UplImageSize: config.message = this.uploadImageSizeMessage; break; - case c_oAscError.ID.UplImageExt: + case Asc.c_oAscError.ID.UplImageExt: config.message = this.uploadImageExtMessage; break; - case c_oAscError.ID.UplImageFileCount: + case Asc.c_oAscError.ID.UplImageFileCount: config.message = this.uploadImageFileCountMessage; break; - case c_oAscError.ID.SplitCellMaxRows: + case Asc.c_oAscError.ID.SplitCellMaxRows: config.message = this.splitMaxRowsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellMaxCols: + case Asc.c_oAscError.ID.SplitCellMaxCols: config.message = this.splitMaxColsErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.SplitCellRowsDivider: + case Asc.c_oAscError.ID.SplitCellRowsDivider: config.message = this.splitDividerErrorText.replace('%1', errData.get_Value()); break; - case c_oAscError.ID.VKeyEncrypt: + case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorKeyEncrypt; break; - case c_oAscError.ID.KeyExpire: + case Asc.c_oAscError.ID.KeyExpire: config.msg = this.errorKeyExpire; break; - case c_oAscError.ID.UserCountExceed: + case Asc.c_oAscError.ID.UserCountExceed: config.msg = this.errorUsersExceed; break; @@ -225,7 +256,7 @@ Ext.define('PE.controller.Main', { - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, config.message); @@ -273,7 +304,7 @@ Ext.define('PE.controller.Main', { }, onDownloadAs: function() { - this.api.asc_DownloadAs(c_oAscFileType.PPTX, true); + this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true); }, _hideLoadSplash: function(){ diff --git a/apps/presentationeditor/mobile/app/controller/Presentation.js b/apps/presentationeditor/mobile/app/controller/Presentation.js index 46288aedf..85743ceb3 100644 --- a/apps/presentationeditor/mobile/app/controller/Presentation.js +++ b/apps/presentationeditor/mobile/app/controller/Presentation.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.controller.Presentation', { extend: 'Ext.app.Controller', diff --git a/apps/presentationeditor/mobile/app/controller/phone/Main.js b/apps/presentationeditor/mobile/app/controller/phone/Main.js index c07fcf315..843e2106c 100644 --- a/apps/presentationeditor/mobile/app/controller/phone/Main.js +++ b/apps/presentationeditor/mobile/app/controller/phone/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.controller.phone.Main', { extend: 'PE.controller.Main', diff --git a/apps/presentationeditor/mobile/app/controller/tablet/Main.js b/apps/presentationeditor/mobile/app/controller/tablet/Main.js index 8f690479a..20dd4fefc 100644 --- a/apps/presentationeditor/mobile/app/controller/tablet/Main.js +++ b/apps/presentationeditor/mobile/app/controller/tablet/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.controller.tablet.Main', { extend: 'PE.controller.Main', diff --git a/apps/presentationeditor/mobile/app/controller/toolbar/View.js b/apps/presentationeditor/mobile/app/controller/toolbar/View.js index 2364e032c..58888ad4d 100644 --- a/apps/presentationeditor/mobile/app/controller/toolbar/View.js +++ b/apps/presentationeditor/mobile/app/controller/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.controller.toolbar.View', { extend: 'Ext.app.Controller', diff --git a/apps/presentationeditor/mobile/app/profile/Phone.js b/apps/presentationeditor/mobile/app/profile/Phone.js index ed22493bc..99975d8d5 100644 --- a/apps/presentationeditor/mobile/app/profile/Phone.js +++ b/apps/presentationeditor/mobile/app/profile/Phone.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.profile.Phone', { extend: 'Ext.app.Profile', diff --git a/apps/presentationeditor/mobile/app/profile/Tablet.js b/apps/presentationeditor/mobile/app/profile/Tablet.js index 0bc8c5198..ea6e0a4b2 100644 --- a/apps/presentationeditor/mobile/app/profile/Tablet.js +++ b/apps/presentationeditor/mobile/app/profile/Tablet.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.profile.Tablet', { extend: 'Ext.app.Profile', diff --git a/apps/presentationeditor/mobile/app/view/Main.js b/apps/presentationeditor/mobile/app/view/Main.js index 2730303ea..443458714 100644 --- a/apps/presentationeditor/mobile/app/view/Main.js +++ b/apps/presentationeditor/mobile/app/view/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.view.Main', { extend: 'Ext.Container', diff --git a/apps/presentationeditor/mobile/app/view/phone/Main.js b/apps/presentationeditor/mobile/app/view/phone/Main.js index 7ac5adba5..82d781e9e 100644 --- a/apps/presentationeditor/mobile/app/view/phone/Main.js +++ b/apps/presentationeditor/mobile/app/view/phone/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.view.phone.Main', { extend: 'PE.view.Main', alias: 'widget.pephonemain', diff --git a/apps/presentationeditor/mobile/app/view/phone/toolbar/View.js b/apps/presentationeditor/mobile/app/view/phone/toolbar/View.js index 61b0a7ea1..4618aa665 100644 --- a/apps/presentationeditor/mobile/app/view/phone/toolbar/View.js +++ b/apps/presentationeditor/mobile/app/view/phone/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.view.phone.toolbar.View', { extend: 'Ext.Toolbar', xtype: 'viewtoolbar', diff --git a/apps/presentationeditor/mobile/app/view/tablet/Main.js b/apps/presentationeditor/mobile/app/view/tablet/Main.js index 0340a863f..49c8ee458 100644 --- a/apps/presentationeditor/mobile/app/view/tablet/Main.js +++ b/apps/presentationeditor/mobile/app/view/tablet/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.view.tablet.Main', { extend: 'PE.view.Main', alias: 'widget.petabletmain', diff --git a/apps/presentationeditor/mobile/app/view/tablet/toolbar/View.js b/apps/presentationeditor/mobile/app/view/tablet/toolbar/View.js index d63077fc0..db08c3a73 100644 --- a/apps/presentationeditor/mobile/app/view/tablet/toolbar/View.js +++ b/apps/presentationeditor/mobile/app/view/tablet/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('PE.view.tablet.toolbar.View', { extend: 'Ext.Toolbar', xtype: 'viewtoolbar', diff --git a/apps/presentationeditor/mobile/index.html b/apps/presentationeditor/mobile/index.html index 1d8cb3f2d..7e951db70 100644 --- a/apps/presentationeditor/mobile/index.html +++ b/apps/presentationeditor/mobile/index.html @@ -214,10 +214,12 @@ - - - - + + - + + - - - - + + diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index daf5f012b..1221bd95e 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -295,9 +295,9 @@ - - - + + + diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index d204a8c56..23bb64d1d 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ var ApplicationController = new(function(){ var me, api, @@ -128,7 +160,7 @@ var ApplicationController = new(function(){ if (docConfig) { permissions = $.extend(permissions, docConfig.permissions); - var docInfo = new CDocInfo(); + var docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(docConfig.key); docInfo.put_Url(docConfig.url); docInfo.put_Title(docConfig.title); @@ -284,7 +316,7 @@ var ApplicationController = new(function(){ var text = ''; switch (id) { - case c_oAscAsyncAction['Print']: + case Asc.c_oAscAsyncAction['Print']: text = 'Downloading document...'; break; default: @@ -292,16 +324,16 @@ var ApplicationController = new(function(){ break; } - if (type == c_oAscAsyncActionType['BlockInteraction']) { + if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { $('#id-loadmask .cmd-loader-title').html(text); showMask(); } } function onLongActionEnd(type, id){ - if (type === c_oAscAsyncActionType.BlockInteraction) { + if (type === Asc.c_oAscAsyncActionType.BlockInteraction) { switch (id) { - case c_oAscAsyncAction.Open: + case Asc.c_oAscAsyncAction.Open: if (api) { api.asc_Resize(); } @@ -322,19 +354,19 @@ var ApplicationController = new(function(){ switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: message = me.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: message = me.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: message = me.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: message = me.downloadErrorText; break; @@ -343,7 +375,7 @@ var ApplicationController = new(function(){ break; } - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, message); @@ -392,7 +424,7 @@ var ApplicationController = new(function(){ } function onDownloadAs() { - if (api) api.asc_DownloadAs(c_oAscFileType.XLSX, true); + if (api) api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true); } // Helpers @@ -656,11 +688,11 @@ var ApplicationController = new(function(){ }, 2000); }); - api = new Asc.spreadsheet_api("editor_sdk"); + api = new Asc.spreadsheet_api({ + 'id-view': 'editor_sdk' + }); if (api){ - api.asc_SetFontsPath("../../../sdk/Fonts/"); - api.asc_registerCallback('asc_onStartAction', onLongActionBegin); api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onError', onError); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationView.js b/apps/spreadsheeteditor/embed/js/ApplicationView.js index b917eb526..1b437ff2b 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationView.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationView.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ var ApplicationView = new(function(){ // Initialize view diff --git a/apps/spreadsheeteditor/embed/js/application.js b/apps/spreadsheeteditor/embed/js/application.js index e8bdeab02..541640578 100644 --- a/apps/spreadsheeteditor/embed/js/application.js +++ b/apps/spreadsheeteditor/embed/js/application.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ (function ($) { $(function(){ diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 95297ddaa..c0a989b12 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * app.js * @@ -24,8 +56,8 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', - allfonts : '../sdk/Common/AllFonts', - sdk : '../sdk/Excel/sdk-all', + allfonts : '../../sdkjs/common/AllFonts', + sdk : '../../sdkjs/cell/sdk-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', diff --git a/apps/spreadsheeteditor/main/app/collection/FormulaGroups.js b/apps/spreadsheeteditor/main/app/collection/FormulaGroups.js index 8c37606c6..3a040d12f 100644 --- a/apps/spreadsheeteditor/main/app/collection/FormulaGroups.js +++ b/apps/spreadsheeteditor/main/app/collection/FormulaGroups.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FormulaGroups.js * diff --git a/apps/spreadsheeteditor/main/app/collection/ShapeGroups.js b/apps/spreadsheeteditor/main/app/collection/ShapeGroups.js index d65422c93..83826b90d 100644 --- a/apps/spreadsheeteditor/main/app/collection/ShapeGroups.js +++ b/apps/spreadsheeteditor/main/app/collection/ShapeGroups.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeGroups.js * diff --git a/apps/spreadsheeteditor/main/app/collection/TableTemplates.js b/apps/spreadsheeteditor/main/app/collection/TableTemplates.js index 538f72bbb..d6dae8fea 100644 --- a/apps/spreadsheeteditor/main/app/collection/TableTemplates.js +++ b/apps/spreadsheeteditor/main/app/collection/TableTemplates.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableTemplates.js * diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js index 476bd397a..87902fe9c 100644 --- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * CellEditor.js * @@ -89,9 +121,9 @@ define([ }, onApiEditCell: function(state) { - if (state == c_oAscCellEditorState.editStart) + if (state == Asc.c_oAscCellEditorState.editStart) this.api.isCellEdited = true; - else if (state == c_oAscCellEditorState.editEnd) { + else if (state == Asc.c_oAscCellEditorState.editEnd) { this.api.isCellEdited = false; this.api.isCEditorFocused = false; } @@ -116,7 +148,7 @@ define([ }, onCellsRange: function(status) { - var isRangeSelection = (status != c_oAscSelectionDialogType.None); + var isRangeSelection = (status != Asc.c_oAscSelectionDialogType.None); if (isRangeSelection) { this.editor.$cellname.attr('disabled', 'disabled'); @@ -155,6 +187,9 @@ define([ this.api.isCEditorFocused = undefined; else if (this.api.isCellEdited) this.api.isCEditorFocused = true; + if (Common.Utils.isIE && !$('#menu-formula-selection').hasClass('open')) {// for formula menu + this.getApplication().getController('DocumentHolder').documentHolder.focus(); + } }, onKeyupCellEditor: function(e) { @@ -209,7 +244,7 @@ define([ locked: this.namedrange_locked, sheets: items, sheetNames: sheetNames, - ranges: this.api.asc_getDefinedNames(c_oAscGetDefinedNamesList.All), + ranges: this.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.All), props : this.api.asc_getDefaultDefinedName(), sort : this.rangeListSort })).on('close', function(win){ @@ -222,7 +257,7 @@ define([ }, onNameBeforeShow: function() { - var names = this.api.asc_getDefinedNames(c_oAscGetDefinedNamesList.WorksheetWorkbook), + var names = this.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.WorksheetWorkbook), rangesMenu = this.editor.btnNamedRanges.menu, prev_name=''; @@ -246,7 +281,7 @@ define([ }, onLockDefNameManager: function(state) { - this.namedrange_locked = (state == c_oAscDefinedNameReason.LockDefNameManager); + this.namedrange_locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager); } }); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a447b33f8..34c4bafec 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentHolder.js * @@ -120,7 +152,12 @@ define([ view.pmiInsertCells.menu.on('item:click', _.bind(me.onInsertCells, me)); view.pmiDeleteCells.menu.on('item:click', _.bind(me.onDeleteCells, me)); view.pmiSortCells.menu.on('item:click', _.bind(me.onSortCells, me)); + view.pmiFilterCells.menu.on('item:click', _.bind(me.onFilterCells, me)); + view.pmiReapply.on('click', _.bind(me.onReapply, me)); view.pmiClear.menu.on('item:click', _.bind(me.onClear, me)); + view.pmiSelectTable.menu.on('item:click', _.bind(me.onSelectTable, me)); + view.pmiInsertTable.menu.on('item:click', _.bind(me.onInsertTable, me)); + view.pmiDeleteTable.menu.on('item:click', _.bind(me.onDeleteTable, me)); view.pmiInsFunction.on('click', _.bind(me.onInsFunction, me)); view.menuAddHyperlink.on('click', _.bind(me.onInsHyperlink, me)); view.menuEditHyperlink.on('click', _.bind(me.onInsHyperlink, me)); @@ -252,11 +289,11 @@ define([ onInsertEntire: function(item) { if (this.api) { switch (this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()) { - case c_oAscSelectionType.RangeRow: - this.api.asc_insertCells(c_oAscInsertOptions.InsertRows); + case Asc.c_oAscSelectionType.RangeRow: + this.api.asc_insertCells(Asc.c_oAscInsertOptions.InsertRows); break; - case c_oAscSelectionType.RangeCol: - this.api.asc_insertCells(c_oAscInsertOptions.InsertColumns); + case Asc.c_oAscSelectionType.RangeCol: + this.api.asc_insertCells(Asc.c_oAscInsertOptions.InsertColumns); break; } @@ -277,11 +314,11 @@ define([ onDeleteEntire: function(item) { if (this.api) { switch (this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()) { - case c_oAscSelectionType.RangeRow: - this.api.asc_deleteCells(c_oAscDeleteOptions.DeleteRows); + case Asc.c_oAscSelectionType.RangeRow: + this.api.asc_deleteCells(Asc.c_oAscDeleteOptions.DeleteRows); break; - case c_oAscSelectionType.RangeCol: - this.api.asc_deleteCells(c_oAscDeleteOptions.DeleteColumns); + case Asc.c_oAscSelectionType.RangeCol: + this.api.asc_deleteCells(Asc.c_oAscDeleteOptions.DeleteColumns); break; } @@ -301,13 +338,48 @@ define([ onSortCells: function(menu, item) { if (this.api) { - this.api.asc_sortColFilter(item.value, ''); + this.api.asc_sortColFilter(item.value, '', undefined, (item.value==Asc.c_oAscSortOptions.ByColorFill) ? this.documentHolder.ssMenu.cellColor : this.documentHolder.ssMenu.fontColor); Common.NotificationCenter.trigger('edit:complete', this.documentHolder); Common.component.Analytics.trackEvent('DocumentHolder', 'Sort Cells'); } }, + onFilterCells: function(menu, item) { + if (this.api) { + var autoFilterObject = new Asc.AutoFiltersOptions(), + filterObj = new Asc.AutoFilterObj(); + if (item.value>0) { + filterObj.asc_setFilter(new Asc.ColorFilter()); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.ColorFilter); + + var colorFilter = filterObj.asc_getFilter(); + colorFilter.asc_setCellColor((item.value==1) ? null : false); + colorFilter.asc_setCColor((item.value==1) ? this.documentHolder.ssMenu.cellColor : this.documentHolder.ssMenu.fontColor); + } else { + filterObj.asc_setFilter(new Asc.CustomFilters()); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.CustomFilters); + + var customFilter = filterObj.asc_getFilter(); + customFilter.asc_setCustomFilters([new Asc.CustomFilter()]); + customFilter.asc_setAnd(true); + var customFilters = customFilter.asc_getCustomFilters(); + customFilters[0].asc_setOperator(Asc.c_oAscCustomAutoFilter.equals); +// customFilters[0].asc_setVal(''); + } + + autoFilterObject.asc_setFilterObj(filterObj); + this.api.asc_applyAutoFilterByType(autoFilterObject); + + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'Filter Cells'); + } + }, + + onReapply: function() { + this.api.asc_reapplyAutoFilter(this.documentHolder.ssMenu.formatTableName); + }, + onClear: function(menu, item) { if (this.api) { this.api.asc_emptyCells(item.value); @@ -317,6 +389,33 @@ define([ } }, + onSelectTable: function(menu, item) { + if (this.api && this.documentHolder.ssMenu.formatTableName) { + this.api.asc_changeSelectionFormatTable(this.documentHolder.ssMenu.formatTableName, item.value); + + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'Select Table'); + } + }, + + onInsertTable: function(menu, item) { + if (this.api && this.documentHolder.ssMenu.formatTableName) { + this.api.asc_insertCellsInTable(this.documentHolder.ssMenu.formatTableName, item.value); + + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'Insert to Table'); + } + }, + + onDeleteTable: function(menu, item) { + if (this.api && this.documentHolder.ssMenu.formatTableName) { + this.api.asc_deleteCellsInTable(this.documentHolder.ssMenu.formatTableName, item.value); + + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'Delete from Table'); + } + }, + onInsFunction: function(item) { var controller = this.getApplication().getController('FormulaDialog'); if (controller && this.api) { @@ -386,9 +485,9 @@ define([ (new SSE.Views.SetValueDialog({ title: item.caption, startvalue: item.options.action == 'row-height' ? me.api.asc_getRowHeight() : me.api.asc_getColumnWidth(), - maxvalue: item.options.action == 'row-height' ? c_oAscMaxRowHeight : c_oAscMaxColumnWidth, + maxvalue: item.options.action == 'row-height' ? Asc.c_oAscMaxRowHeight : Asc.c_oAscMaxColumnWidth, step: item.options.action == 'row-height' ? 0.75 : 1, - defaultUnit: item.options.action == 'row-height' ? "pt" : "sym", + defaultUnit: item.options.action == 'row-height' ? Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt) : me.textSym, handler: function(dlg, result) { if (result == 'ok') { var val = dlg.getSettings(); @@ -608,21 +707,21 @@ define([ index_column, index_row; for (var i = dataarray.length; i > 0; i--) { switch (dataarray[i-1].asc_getType()) { - case c_oAscMouseMoveType.Hyperlink: + case Asc.c_oAscMouseMoveType.Hyperlink: index_hyperlink = i; break; /** coauthoring begin **/ - case c_oAscMouseMoveType.Comment: + case Asc.c_oAscMouseMoveType.Comment: index_comments = i; break; /** coauthoring end **/ - case c_oAscMouseMoveType.LockedObject: + case Asc.c_oAscMouseMoveType.LockedObject: index_locked = i; break; - case c_oAscMouseMoveType.ResizeColumn: + case Asc.c_oAscMouseMoveType.ResizeColumn: index_column = i; break; - case c_oAscMouseMoveType.ResizeRow: + case Asc.c_oAscMouseMoveType.ResizeRow: index_row = i; break; } @@ -660,7 +759,7 @@ define([ var data = dataarray[index_hyperlink-1], props = data.asc_getHyperlink(); - if (props.asc_getType() == c_oAscHyperlinkType.WebLink) { + if (props.asc_getType() == Asc.c_oAscHyperlinkType.WebLink) { var linkstr = props.asc_getTooltip(); if (linkstr) { linkstr = Common.Utils.String.htmlEncode(linkstr) + '
    ' + me.textCtrlClick + ''; @@ -810,8 +909,8 @@ define([ coAuthTip.y_point = data.asc_getY(); var src = $(document.createElement("div")), - is_sheet_lock = data.asc_getLockedObjectType() == c_oAscMouseMoveLockedObjectType.Sheet || - data.asc_getLockedObjectType() == c_oAscMouseMoveLockedObjectType.TableProperties; + is_sheet_lock = data.asc_getLockedObjectType() == Asc.c_oAscMouseMoveLockedObjectType.Sheet || + data.asc_getLockedObjectType() == Asc.c_oAscMouseMoveLockedObjectType.TableProperties; coAuthTip.ref = src; @@ -871,12 +970,13 @@ define([ onApiAutofilter: function(config) { var me = this; - if (me.permissions.isEdit) { - var dlgFilter = new SSE.Views.AutoFilterDialog({api: this.api}).on({ + if (me.permissions.isEdit && !me.dlgFilter) { + me.dlgFilter = new SSE.Views.AutoFilterDialog({api: this.api}).on({ 'close': function () { if (me.api) { me.api.asc_enableKeyEvents(true); } + me.dlgFilter = undefined; } }); @@ -885,8 +985,19 @@ define([ } Common.UI.Menu.Manager.hideAll(); - dlgFilter.setSettings(config); - dlgFilter.show(); + me.dlgFilter.setSettings(config); + var offset = me.documentHolder.cmpEl.offset(), + rect = config.asc_getCellCoord(), + x = rect.asc_getX() + rect.asc_getWidth() +offset.left, + y = rect.asc_getY() + rect.asc_getHeight() + offset.top; + var doc = $(document), + docwidth = doc.width(), + docheight = doc.height(); + if (x+me.dlgFilter.options.width > docwidth) + x = docwidth - me.dlgFilter.options.width - 5; + if (y+me.dlgFilter.options.height > docheight) + y = docheight - me.dlgFilter.options.height - 5; + me.dlgFilter.show(x, y); } }, @@ -1013,21 +1124,21 @@ define([ cansort = false; if (this.permissions.isEditMailMerge) { - cansort = (seltype==c_oAscSelectionType.RangeCells); + cansort = (seltype==Asc.c_oAscSelectionType.RangeCells); } else if (this.permissions.isEditDiagram) { - insfunc = (seltype==c_oAscSelectionType.RangeCells); + insfunc = (seltype==Asc.c_oAscSelectionType.RangeCells); } else { switch (seltype) { - case c_oAscSelectionType.RangeCells: iscellmenu = true; break; - case c_oAscSelectionType.RangeRow: isrowmenu = true; break; - case c_oAscSelectionType.RangeCol: iscolmenu = true; break; - case c_oAscSelectionType.RangeMax: isallmenu = true; break; - case c_oAscSelectionType.RangeImage: isimagemenu = true; break; - case c_oAscSelectionType.RangeShape: isshapemenu = true; break; - case c_oAscSelectionType.RangeChart: ischartmenu = true; break; - case c_oAscSelectionType.RangeChartText:istextchartmenu = true; break; - case c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; + case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break; + case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break; + case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break; + case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break; + case Asc.c_oAscSelectionType.RangeImage: isimagemenu = true; break; + case Asc.c_oAscSelectionType.RangeShape: isshapemenu = true; break; + case Asc.c_oAscSelectionType.RangeChart: ischartmenu = true; break; + case Asc.c_oAscSelectionType.RangeChartText:istextchartmenu = true; break; + case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; } } @@ -1038,7 +1149,7 @@ define([ var has_chartprops = false; var selectedObjects = this.api.asc_getGraphicObjectProps(); for (var i = 0; i < selectedObjects.length; i++) { - if (selectedObjects[i].asc_getObjectType() == c_oAscTypeSelectElement.Image) { + if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) { var elValue = selectedObjects[i].asc_getObjectValue(); isObjLocked = isObjLocked || elValue.asc_getLocked(); var shapeprops = elValue.asc_getShapeProperties(); @@ -1077,19 +1188,19 @@ define([ for (var i = 0; i < selectedObjects.length; i++) { var elType = selectedObjects[i].asc_getObjectType(); - if (elType == c_oAscTypeSelectElement.Image) { + if (elType == Asc.c_oAscTypeSelectElement.Image) { var value = selectedObjects[i].asc_getObjectValue(), align = value.asc_getVerticalTextAlign(), direct = value.asc_getVert(); isObjLocked = isObjLocked || value.asc_getLocked(); - documentHolder.menuParagraphTop.setChecked(align == c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - documentHolder.menuParagraphCenter.setChecked(align == c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - documentHolder.menuParagraphBottom.setChecked(align == c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); + documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); + documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); - documentHolder.menuParagraphDirectH.setChecked(direct == c_oAscVertDrawingText.normal); - documentHolder.menuParagraphDirect90.setChecked(direct == c_oAscVertDrawingText.vert); - documentHolder.menuParagraphDirect270.setChecked(direct == c_oAscVertDrawingText.vert270); - } else if (elType == c_oAscTypeSelectElement.Paragraph) { + documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal); + documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert); + documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270); + } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) { documentHolder.pmiTextAdvanced.textInfo = selectedObjects[i].asc_getObjectValue(); isObjLocked = isObjLocked || documentHolder.pmiTextAdvanced.textInfo.asc_getLocked(); } @@ -1111,21 +1222,44 @@ define([ documentHolder.textInShapeMenu.items[3].setVisible( documentHolder.menuHyperlinkShape.isVisible() || documentHolder.menuAddHyperlinkShape.isVisible() || documentHolder.menuParagraphVAlign.isVisible()); - } else if (!this.permissions.isEditMailMerge && !this.permissions.isEditDiagram || (seltype !== c_oAscSelectionType.RangeImage && seltype !== c_oAscSelectionType.RangeShape && - seltype !== c_oAscSelectionType.RangeChart && seltype !== c_oAscSelectionType.RangeChartText && seltype !== c_oAscSelectionType.RangeShapeText)) { + } else if (!this.permissions.isEditMailMerge && !this.permissions.isEditDiagram || (seltype !== Asc.c_oAscSelectionType.RangeImage && seltype !== Asc.c_oAscSelectionType.RangeShape && + seltype !== Asc.c_oAscSelectionType.RangeChart && seltype !== Asc.c_oAscSelectionType.RangeChartText && seltype !== Asc.c_oAscSelectionType.RangeShapeText)) { if (!showMenu && !documentHolder.ssMenu.isVisible()) return; - var iscelledit = this.api.isCellEdited; + var iscelledit = this.api.isCellEdited, + formatTableInfo = cellinfo.asc_getFormatTableInfo(), + isintable = (formatTableInfo !== null); + documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; + documentHolder.ssMenu.cellColor = cellinfo.asc_getFill().asc_getColor(); + documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor(); documentHolder.pmiInsertEntire.setVisible(isrowmenu||iscolmenu); documentHolder.pmiInsertEntire.setCaption((isrowmenu) ? this.textInsertTop : this.textInsertLeft); documentHolder.pmiDeleteEntire.setVisible(isrowmenu||iscolmenu); - documentHolder.pmiInsertCells.setVisible(iscellmenu && !iscelledit); - documentHolder.pmiDeleteCells.setVisible(iscellmenu && !iscelledit); + documentHolder.pmiInsertCells.setVisible(iscellmenu && !iscelledit && !isintable); + documentHolder.pmiDeleteCells.setVisible(iscellmenu && !iscelledit && !isintable); + documentHolder.pmiSelectTable.setVisible(iscellmenu && !iscelledit && isintable); + documentHolder.pmiInsertTable.setVisible(iscellmenu && !iscelledit && isintable); + documentHolder.pmiDeleteTable.setVisible(iscellmenu && !iscelledit && isintable); documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); + documentHolder.pmiFilterCells.setVisible((iscellmenu||cansort) && !iscelledit); + documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); + documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); documentHolder.pmiInsFunction.setVisible(iscellmenu||insfunc); documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit); + if (isintable) { + documentHolder.pmiInsertTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsInsertRowAbove()); + documentHolder.pmiInsertTable.menu.items[1].setDisabled(!formatTableInfo.asc_getIsInsertRowBelow()); + documentHolder.pmiInsertTable.menu.items[2].setDisabled(!formatTableInfo.asc_getIsInsertColumnLeft()); + documentHolder.pmiInsertTable.menu.items[3].setDisabled(!formatTableInfo.asc_getIsInsertColumnRight()); + + documentHolder.pmiDeleteTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsDeleteRow()); + documentHolder.pmiDeleteTable.menu.items[1].setDisabled(!formatTableInfo.asc_getIsDeleteColumn()); + documentHolder.pmiDeleteTable.menu.items[2].setDisabled(!formatTableInfo.asc_getIsDeleteTable()); + + } + var hyperinfo = cellinfo.asc_getHyperlink(); documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit); documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit); @@ -1138,7 +1272,7 @@ define([ documentHolder.pmiFreezePanes.setCaption(this.api.asc_getSheetViewSettings().asc_getIsFreezePane() ? documentHolder.textUnFreezePanes : documentHolder.textFreezePanes); /** coauthoring begin **/ - documentHolder.ssMenu.items[10].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); + documentHolder.ssMenu.items[16].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); documentHolder.pmiAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); /** coauthoring end **/ documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu || isrowmenu || iscolmenu || isallmenu || insfunc); @@ -1156,18 +1290,22 @@ define([ documentHolder.pmiClear.menu.items[3].setVisible(!this.permissions.isEditDiagram); documentHolder.pmiClear.menu.items[4].setVisible(!this.permissions.isEditDiagram); - var filterInfo = cellinfo.asc_getAutoFilterInfo() && cellinfo.asc_getAutoFilterInfo().asc_getIsApplyAutoFilter(); - documentHolder.pmiInsertCells.menu.items[0].setDisabled(filterInfo); - documentHolder.pmiDeleteCells.menu.items[0].setDisabled(filterInfo); - documentHolder.pmiInsertCells.menu.items[1].setDisabled(filterInfo); - documentHolder.pmiDeleteCells.menu.items[1].setDisabled(filterInfo); + var filterInfo = cellinfo.asc_getAutoFilterInfo(), + isApplyAutoFilter = (filterInfo) ? filterInfo.asc_getIsApplyAutoFilter() : false; + filterInfo = (filterInfo) ? filterInfo.asc_getIsAutoFilter() : null; + documentHolder.pmiInsertCells.menu.items[0].setDisabled(isApplyAutoFilter); + documentHolder.pmiDeleteCells.menu.items[0].setDisabled(isApplyAutoFilter); + documentHolder.pmiInsertCells.menu.items[1].setDisabled(isApplyAutoFilter); + documentHolder.pmiDeleteCells.menu.items[1].setDisabled(isApplyAutoFilter); _.each(documentHolder.ssMenu.items, function(item) { item.setDisabled(isCellLocked); }); documentHolder.pmiCopy.setDisabled(false); + documentHolder.pmiSortCells.setDisabled(isCellLocked || (filterInfo==null)); + documentHolder.pmiReapply.setDisabled(isCellLocked || (isApplyAutoFilter!==true)); if (showMenu) this.showPopupMenu(documentHolder.ssMenu, {}, event); - } else if (this.permissions.isEditDiagram && seltype == c_oAscSelectionType.RangeChartText) { + } else if (this.permissions.isEditDiagram && seltype == Asc.c_oAscSelectionType.RangeChartText) { if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return; documentHolder.pmiTextAdvanced.textInfo = undefined; @@ -1246,7 +1384,7 @@ define([ var mnu = new Common.UI.MenuItem({ caption : menuItem }).on('click', function(item, e) { - me.api.asc_insertFormula(item.caption, c_oAscPopUpSelectorType.None, false ); + me.api.asc_insertFormula(item.caption, Asc.c_oAscPopUpSelectorType.None, false ); }); menu.addItem(mnu); }); @@ -1295,7 +1433,7 @@ define([ _.each(funcarr, function(menuItem, index) { var type = menuItem.asc_getType(), mnu = new Common.UI.MenuItem({ - iconCls: (type==c_oAscPopUpSelectorType.Func) ? 'mnu-popup-func': ((type==c_oAscPopUpSelectorType.Table) ? 'mnu-popup-table' : 'mnu-popup-range') , + iconCls: (type==Asc.c_oAscPopUpSelectorType.Func) ? 'mnu-popup-func': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'mnu-popup-table' : 'mnu-popup-range') , caption: menuItem.asc_getName() }).on('click', function(item, e) { setTimeout(function(){ me.api.asc_insertFormula(item.caption, type, false ); }, 10); @@ -1303,9 +1441,6 @@ define([ menu.addItem(mnu); }); - - Common.UI.Menu.Manager.hideAll(); - if (!menu.rendered) { // Prepare menu container if (menuContainer.length < 1) { @@ -1313,15 +1448,15 @@ define([ documentHolderView.cmpEl.append(menuContainer); } - menu.render(menuContainer); - menu.cmpEl.attr({tabindex: "-1"}); + menu.onAfterKeydownMenu = function(e) { + if (e.keyCode == Common.UI.Keys.RETURN && (e.ctrlKey || e.altKey)) return; + Common.UI.Menu.prototype.onAfterKeydownMenu.call(menu, e); - menu.parentEl.on('keydown.after.bs.dropdown', _.bind(function(e) { var li; if (arguments.length>1 && arguments[1] instanceof jQuery.Event) {// when typing in cell editor e = arguments[1]; if (menuContainer.hasClass('open')) { - if (e.keyCode == Common.UI.Keys.TAB || e.keyCode == Common.UI.Keys.RETURN) + if (e.keyCode == Common.UI.Keys.TAB || e.keyCode == Common.UI.Keys.RETURN && !e.ctrlKey && !e.altKey) li = menuContainer.find('a.focus').closest('li'); else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) { var innerEl = menu.cmpEl, @@ -1340,12 +1475,19 @@ define([ } } else if (e.keyCode == Common.UI.Keys.TAB) li = $(e.target).closest('li'); - + if (li) { if (li.length>0) li.click(); Common.UI.Menu.Manager.hideAll(); } - }, me)); + }; + + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + + menu.on('hide:after', function() { + if (Common.Utils.isIE) me.documentHolder.focus(); + }); } var coord = me.api.asc_getActiveCellCoord(), @@ -1355,9 +1497,14 @@ define([ menu.alignPosition(); var infocus = me.cellEditor.is(":focus"); + if (!menu.isVisible()) + Common.UI.Menu.Manager.hideAll(); _.delay(function() { - menu.show(); - if (menu.scroller) menu.scroller.scrollTop(0); + if (!menu.isVisible()) menu.show(); + if (menu.scroller) { + menu.scroller.update({alwaysVisibleY: true}); + menu.scroller.scrollTop(0); + } if (infocus) { me.cellEditor.focus(); _.delay(function() { @@ -1376,16 +1523,16 @@ define([ }, onCellsRange: function(status) { - this.rangeSelectionMode = (status != c_oAscSelectionDialogType.None); + this.rangeSelectionMode = (status != Asc.c_oAscSelectionDialogType.None); }, onApiEditCell: function(state) { - this.isEditFormula = (state == c_oAscCellEditorState.editFormula); - this.isEditCell = (state != c_oAscCellEditorState.editEnd); + this.isEditFormula = (state == Asc.c_oAscCellEditorState.editFormula); + this.isEditCell = (state != Asc.c_oAscCellEditorState.editEnd); }, onLockDefNameManager: function(state) { - this.namedrange_locked = (state == c_oAscDefinedNameReason.LockDefNameManager); + this.namedrange_locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager); }, guestText : 'Guest', @@ -1397,7 +1544,8 @@ define([ textChangeColumnWidth : 'Column Width {0} symbols ({1} pixels)', textChangeRowHeight : 'Row Height {0} points ({1} pixels)', textInsertLeft : 'Insert Left', - textInsertTop : 'Insert Top' + textInsertTop : 'Insert Top', + textSym : 'sym' }, SSE.Controllers.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js index f029ebf22..c2ffa769f 100644 --- a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FormulaDialog.js * @@ -51,7 +83,7 @@ define([ formulasGroups : this.formulasGroups, handler : function (func) { if (func && me.api) { - me.api.asc_insertFormula(func, c_oAscPopUpSelectorType.Func); + me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func); } } }); @@ -68,6 +100,11 @@ define([ return this; }, + setMode: function(mode) { + this.mode = mode; + return this; + }, + onLaunch: function () { this.formulasGroups = this.getApplication().getCollection('FormulaGroups'); }, @@ -100,6 +137,11 @@ define([ allFunctionsGroup = null; if (store) { + var value = Common.localStorage.getItem("sse-settings-func-locale"); + if (value===null) + value = ((this.mode.lang) ? this.mode.lang : 'en').split("-")[0].toLowerCase(); + value = SSE.Views.FormulaLang.getDescription(value); + allFunctionsGroup = new SSE.Models.FormulaGroup ({ name : 'All', index : index, @@ -128,11 +170,13 @@ define([ functions = []; for (j = 0; j < ascFunctions.length; j += 1) { + var funcname = ascFunctions[j].asc_getName(); var func = new SSE.Models.FormulaModel({ index : funcInd, group : ascGroupName, - name : ascFunctions[j].asc_getName(), - args : ascFunctions[j].asc_getArguments() + name : ascFunctions[j].asc_getLocaleName(), + args : (value && value[funcname]) ? value[funcname].a : '', + desc : (value && value[funcname]) ? value[funcname].d : '' }); funcInd += 1; diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index ed21a4d2a..efef9b4a9 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ 'core', 'common/main/lib/util/Shortcuts', @@ -155,7 +187,7 @@ define([ case 'back': break; case 'save': this.api.asc_Save(); break; case 'save-desktop': this.api.asc_DownloadAs(); break; - case 'print': this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break; + case 'print': Common.NotificationCenter.trigger('print', this.leftMenu); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': // this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); @@ -175,7 +207,7 @@ define([ }, clickSaveAsFormat: function(menu, format) { - if (format == c_oAscFileType.CSV) { + if (format == Asc.c_oAscFileType.CSV) { Common.UI.warning({ closable: false, title: this.textWarning, @@ -210,10 +242,8 @@ define([ } /** coauthoring end **/ - if (this.mode.canAutosave) { - value = Common.localStorage.getItem("sse-settings-autosave"); - this.api.asc_setAutoSaveGap(parseInt(value)); - } + value = Common.localStorage.getItem("sse-settings-autosave"); + this.api.asc_setAutoSaveGap(parseInt(value)); value = Common.localStorage.getItem("sse-settings-func-locale"); if (value) value = SSE.Views.FormulaLang.get(value); @@ -282,7 +312,7 @@ define([ options.asc_setIsWholeCell(opts.matchword); options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked); options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked); - options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?c_oAscFindLookIn.Formulas:c_oAscFindLookIn.Value); + options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value); if (!this.api.asc_findText(options)) { var me = this; @@ -307,7 +337,7 @@ define([ options.asc_setIsWholeCell(opts.matchword); options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked); options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked); - options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?c_oAscFindLookIn.Formulas:c_oAscFindLookIn.Value); + options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value); options.asc_setIsReplaceAll(false); this.api.asc_replaceText(options); @@ -325,7 +355,7 @@ define([ options.asc_setIsWholeCell(opts.matchword); options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked); options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked); - options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?c_oAscFindLookIn.Formulas:c_oAscFindLookIn.Value); + options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value); options.asc_setIsReplaceAll(true); this.api.asc_replaceText(options); @@ -444,7 +474,7 @@ define([ options.asc_setIsWholeCell(sett.matchword); options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked); options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked); - options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?c_oAscFindLookIn.Formulas:c_oAscFindLookIn.Value); + options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value); if (!me.api.asc_findText(options)) { @@ -608,7 +638,7 @@ define([ }, onCellsRange: function(status) { - var isRangeSelection = (status != c_oAscSelectionDialogType.None); + var isRangeSelection = (status != Asc.c_oAscSelectionDialogType.None); this.leftMenu.btnFile.setDisabled(isRangeSelection); this.leftMenu.btnAbout.setDisabled(isRangeSelection); @@ -617,7 +647,7 @@ define([ onApiEditCell: function(state) { - var isEditFormula = (state == c_oAscCellEditorState.editFormula); + var isEditFormula = (state == Asc.c_oAscCellEditorState.editFormula); this.leftMenu.btnFile.setDisabled(isEditFormula); this.leftMenu.btnAbout.setDisabled(isEditFormula); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 30f077194..fe14b2f9a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Main.js * @@ -58,10 +90,6 @@ define([ }, onLaunch: function() { - /** coauthoring begin **/ - window.asc_CCommentData = window.Asc.asc_CCommentData||window.asc_CCommentData; - /** coauthoring end **/ - // $(document.body).css('position', 'absolute'); this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, startModifyDocument: true, lostEditingRights: false, licenseWarning: false}; @@ -79,9 +107,11 @@ define([ if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3'; // Initialize api - this.api = new Asc.spreadsheet_api("editor_sdk", "ce-cell-content"); + this.api = new Asc.spreadsheet_api({ + 'id-view' : 'editor_sdk', + 'id-input' : 'ce-cell-content' + }); this.api.asc_setFontRenderingMode(parseInt(value)); - this.api.asc_SetFontsPath("../../../sdk/Fonts/"); this.api.asc_registerCallback('asc_onOpenDocumentProgress', _.bind(this.onOpenDocument, this)); this.api.asc_registerCallback('asc_onEndAction', _.bind(this.onLongActionEnd, this)); @@ -100,7 +130,7 @@ define([ weakCompare : this._compareActionWeak }); - this.stackLongActions.push({id: InitApplication, type: c_oAscAsyncActionType.BlockInteraction}); + this.stackLongActions.push({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction}); this.isShowOpenDialog = false; @@ -210,7 +240,8 @@ define([ this.appOptions.recent = this.editorConfig.recent; this.appOptions.createUrl = this.editorConfig.createUrl; this.appOptions.lang = this.editorConfig.lang; - this.appOptions.canAutosave = -1; + this.appOptions.location = (typeof (this.editorConfig.location) == 'string') ? this.editorConfig.location.toLowerCase() : ''; + this.appOptions.canAutosave = false; this.appOptions.canAnalytics = false; this.appOptions.sharingSettingsUrl = this.editorConfig.sharingSettingsUrl; this.appOptions.isEditDiagram = this.editorConfig.mode == 'editdiagram'; @@ -238,6 +269,9 @@ define([ } else value = SSE.Views.FormulaLang.get(value); if (value) this.api.asc_setLocalization(value); + + if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') + Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); }, loadDocument: function(data) { @@ -248,13 +282,13 @@ define([ if (data.doc) { this.permissions = _.extend(this.permissions, data.doc.permissions); - var _user = new CUserInfo(); + var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); _user.put_FirstName(this.appOptions.user.firstname); _user.put_LastName(this.appOptions.user.lastname); _user.put_FullName(this.appOptions.user.fullname); - docInfo = new CDocInfo(); + docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(data.doc.key); docInfo.put_Url(data.doc.url); docInfo.put_Title(data.doc.title); @@ -302,7 +336,7 @@ define([ }, onDownloadAs: function() { - this.api.asc_DownloadAs(c_oAscFileType.XLSX, true); + this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true); }, onProcessMouse: function(data) { @@ -348,19 +382,19 @@ define([ this.headerView.setDocumentCaption(this.api.asc_getDocumentName()); this.updateWindowTitle(this.api.asc_isDocumentModified(), true); - if (type === c_oAscAsyncActionType.BlockInteraction && id == c_oAscAsyncAction.Open) { + if (type === Asc.c_oAscAsyncActionType.BlockInteraction && id == Asc.c_oAscAsyncAction.Open) { Common.Gateway.internalMessage('documentReady', {}); this.onDocumentReady(); } - action = this.stackLongActions.get({type: c_oAscAsyncActionType.Information}); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); action && this.setLongActionView(action); - if (id == c_oAscAsyncAction.Save) { + if (id == Asc.c_oAscAsyncAction.Save) { this.toolbarView.synchronizeChanges(); } - action = this.stackLongActions.get({type: c_oAscAsyncActionType.BlockInteraction}); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); if (action) { this.setLongActionView(action); } else { @@ -370,7 +404,7 @@ define([ this.loadMask.hide(); } - if (type == c_oAscAsyncActionType.BlockInteraction && !( (id == c_oAscAsyncAction['LoadDocumentFonts'] || id == c_oAscAsyncAction['ApplyChanges']) && this.dontCloseDummyComment )) + if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !( (id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && this.dontCloseDummyComment )) this.onEditComplete(this.loadMask, {restorefocus:true}); } }, @@ -379,51 +413,51 @@ define([ var title = ''; switch (action.id) { - case c_oAscAsyncAction.Open: + case Asc.c_oAscAsyncAction.Open: title = this.openTitleText; break; - case c_oAscAsyncAction.Save: + case Asc.c_oAscAsyncAction.Save: title = this.saveTitleText; break; - case c_oAscAsyncAction.LoadDocumentFonts: + case Asc.c_oAscAsyncAction.LoadDocumentFonts: title = this.loadFontsTitleText; break; - case c_oAscAsyncAction.LoadDocumentImages: + case Asc.c_oAscAsyncAction.LoadDocumentImages: title = this.loadImagesTitleText; break; - case c_oAscAsyncAction.LoadFont: + case Asc.c_oAscAsyncAction.LoadFont: title = this.loadFontTitleText; break; - case c_oAscAsyncAction.LoadImage: + case Asc.c_oAscAsyncAction.LoadImage: title = this.loadImageTitleText; break; - case c_oAscAsyncAction.DownloadAs: + case Asc.c_oAscAsyncAction.DownloadAs: title = this.downloadTitleText; break; - case c_oAscAsyncAction.Print: + case Asc.c_oAscAsyncAction.Print: title = this.printTitleText; break; - case c_oAscAsyncAction.UploadImage: + case Asc.c_oAscAsyncAction.UploadImage: title = this.uploadImageTitleText; break; - case c_oAscAsyncAction.Recalc: + case Asc.c_oAscAsyncAction.Recalc: title = this.titleRecalcFormulas; break; - case c_oAscAsyncAction.SlowOperation: + case Asc.c_oAscAsyncAction.SlowOperation: title = this.textPleaseWait; break; - case c_oAscAsyncAction['PrepareToSave']: + case Asc.c_oAscAsyncAction['PrepareToSave']: title = this.savePreparingText; break; @@ -436,7 +470,7 @@ define([ break; } - if (action.type == c_oAscAsyncActionType.BlockInteraction) { + if (action.type == Asc.c_oAscAsyncActionType.BlockInteraction) { !this.loadMask && (this.loadMask = new Common.UI.LoadMask({owner: $('#viewport')})); this.loadMask.setTitle(title); @@ -450,7 +484,7 @@ define([ onApplyEditRights: function(data) { if (data) { if (data.allowed) { - this.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); + this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); this.appOptions.isEdit = true; var me = this; @@ -477,11 +511,14 @@ define([ application.getController('Statusbar').getView('Statusbar').update(); application.getController('CellEditor').setMode(me.appOptions); - me.api.asc_registerCallback('asc_onInitEditorShapes', _.bind(me.fillAutoShapes, me)); me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me)); me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me)); me.api.asc_registerCallback('asc_onDocumentCanSaveChanged', _.bind(me.onDocumentCanSaveChanged, me)); me.api.asc_registerCallback('asc_onDownloadUrl', _.bind(me.onDownloadUrl, me)); + var shapes = me.api.asc_getPropertyEditorShapes(); + if (shapes) + me.fillAutoShapes(shapes[0], shapes[1]); + me.fillTextArt(me.api.asc_getTextArtPreviews()); me.updateThemeColors(); @@ -504,13 +541,12 @@ define([ return; var me = this, - value, - tips = []; + value; me._isDocReady = true; me.hidePreloader(); - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); value = (this.appOptions.isEditMailMerge || this.appOptions.isEditDiagram) ? 100 : Common.localStorage.getItem("sse-settings-zoom"); this.api.asc_setZoom(!value?1:parseInt(value)/100); @@ -570,6 +606,14 @@ define([ this.formulaInput = celleditorController.getView('CellEditor').$el.find('textarea'); if (me.appOptions.isEdit) { + if (me.appOptions.canAutosave) { + value = Common.localStorage.getItem("sse-settings-autosave"); + value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : 1; + } else { + value = 0; + } + me.api.asc_setAutoSaveGap(value); + if (me.needToUpdateVersion) { Common.NotificationCenter.trigger('api:disconnect'); toolbarController.onApiCoAuthoringDisconnect(); @@ -588,7 +632,10 @@ define([ rightmenuController.createDelayedElements(); if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) { - me.api.asc_registerCallback('asc_onInitEditorShapes', _.bind(me.fillAutoShapes, me)); + var shapes = me.api.asc_getPropertyEditorShapes(); + if (shapes) + me.fillAutoShapes(shapes[0], shapes[1]); + me.fillTextArt(me.api.asc_getTextArtPreviews()); me.updateThemeColors(); } @@ -602,7 +649,7 @@ define([ var formulasDlgController = application.getController('FormulaDialog'); if (formulasDlgController) { - formulasDlgController.setApi(me.api); + formulasDlgController.setMode(me.appOptions).setApi(me.api); } if (me.needToUpdateVersion) toolbarController.onApiCoAuthoringDisconnect(); @@ -610,14 +657,6 @@ define([ }, 50); } - if (me.appOptions.canAutosave) { - value = Common.localStorage.getItem("sse-settings-autosave"); - value = (value!==null) ? parseInt(value) : 1; - } else { - value = 0; - } - me.api.asc_setAutoSaveGap(value); - if (me.appOptions.canAnalytics && false) Common.component.Analytics.initialize('UA-12442749-13', 'Spreadsheet Editor'); @@ -631,16 +670,20 @@ define([ $(document).on('contextmenu', _.bind(me.onContextMenu, me)); // me.getViewport().getEl().un('keypress', me.lockEscapeKey, me); - if (!window['AscDesktopEditor']) { - Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - !Common.Utils.isGecko && - !me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && - !me.appOptions.nativeApp && - (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}')); + function checkWarns() { + if (!window['AscDesktopEditor']) { + var tips = []; + Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - if (tips.length) me.showTips(tips); + if (tips.length) me.showTips(tips); + } + document.removeEventListener('visibilitychange', checkWarns); } + if (typeof document.hidden !== 'undefined' && document.hidden) { + document.addEventListener('visibilitychange', checkWarns); + } else checkWarns(); + if (this._state.licenseWarning) { value = Common.localStorage.getItem("de-license-warning"); value = (value!==null) ? parseInt(value) : 0; @@ -648,14 +691,19 @@ define([ if (now - value > 86400000) { Common.localStorage.setItem("de-license-warning", now); Common.UI.info({ + width: 400, title: this.textNoLicenseTitle, msg : this.warnNoLicense, - buttons: ['custom'], - primary: 'custom', - customButtonText: this.textBuyNow, + buttons: [ + {value: 'buynow', caption: this.textBuyNow}, + {value: 'contact', caption: this.textContactUs} + ], + primary: 'buynow', callback: function(btn) { - if (btn == 'custom') + if (btn == 'buynow') window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank"); + else if (btn == 'contact') + window.open('mailto:sales@onlyoffice.com', "_blank"); } }); } @@ -671,7 +719,7 @@ define([ onEditorPermissions: function(params) { if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) { - this.appOptions.canAutosave = this.editorConfig.canAutosave !== false && params.asc_getIsAutosaveEnable(); + this.appOptions.canAutosave = true; this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); /** coauthoring begin **/ @@ -704,7 +752,7 @@ define([ if (!this.appOptions.isEdit) { this.hidePreloader(); - this.onLongActionBegin(c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + this.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); } }, @@ -761,6 +809,10 @@ define([ if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) { this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); + + var printController = app.getController('Print'); + printController && this.api && printController.setApi(this.api); + } var celleditorController = this.getApplication().getController('CellEditor'); @@ -774,7 +826,6 @@ define([ toolbarController = application.getController('Toolbar'), statusbarController = application.getController('Statusbar'), rightmenuController = application.getController('RightMenu'), - printController = application.getController('Print'), /** coauthoring begin **/ commentsController = application.getController('Common.Controllers.Comments'), /** coauthoring end **/ @@ -794,7 +845,6 @@ define([ } rightmenuController && rightmenuController.setApi(me.api); - printController && printController.setApi(me.api); if (statusbarController) { statusbarController.getView('Statusbar').changeViewMode(true); @@ -833,7 +883,7 @@ define([ } var value = Common.localStorage.getItem('sse-settings-unit'); - Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); + Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric()); if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) { var options = {}; @@ -849,11 +899,11 @@ define([ me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); /** coauthoring end **/ - if (me.stackLongActions.exist({id: ApplyEditRights, type: c_oAscAsyncActionType['BlockInteraction']})) { - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); + if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); } else if (!this._isDocReady) { me.hidePreloader(); - me.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } // Message on window close @@ -873,148 +923,148 @@ define([ onError: function(id, level, errData) { this.hidePreloader(); - this.onLongActionEnd(c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); var config = {closable: false}; switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: config.msg = this.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: config.msg = this.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: config.msg = this.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: config.msg = this.downloadErrorText; break; - case c_oAscError.ID.UplImageSize: + case Asc.c_oAscError.ID.UplImageSize: config.msg = this.uploadImageSizeMessage; break; - case c_oAscError.ID.UplImageExt: + case Asc.c_oAscError.ID.UplImageExt: config.msg = this.uploadImageExtMessage; break; - case c_oAscError.ID.UplImageFileCount: + case Asc.c_oAscError.ID.UplImageFileCount: config.msg = this.uploadImageFileCountMessage; break; - case c_oAscError.ID.PastInMergeAreaError: + case Asc.c_oAscError.ID.PastInMergeAreaError: config.msg = this.pastInMergeAreaError; break; - case c_oAscError.ID.FrmlWrongCountParentheses: + case Asc.c_oAscError.ID.FrmlWrongCountParentheses: config.msg = this.errorWrongBracketsCount; break; - case c_oAscError.ID.FrmlWrongOperator: + case Asc.c_oAscError.ID.FrmlWrongOperator: config.msg = this.errorWrongOperator; break; - case c_oAscError.ID.FrmlWrongMaxArgument: + case Asc.c_oAscError.ID.FrmlWrongMaxArgument: config.msg = this.errorCountArgExceed; break; - case c_oAscError.ID.FrmlWrongCountArgument: + case Asc.c_oAscError.ID.FrmlWrongCountArgument: config.msg = this.errorCountArg; break; - case c_oAscError.ID.FrmlWrongFunctionName: + case Asc.c_oAscError.ID.FrmlWrongFunctionName: config.msg = this.errorFormulaName; break; - case c_oAscError.ID.FrmlAnotherParsingError: + case Asc.c_oAscError.ID.FrmlAnotherParsingError: config.msg = this.errorFormulaParsing; break; - case c_oAscError.ID.FrmlWrongArgumentRange: + case Asc.c_oAscError.ID.FrmlWrongArgumentRange: config.msg = this.errorArgsRange; break; - case c_oAscError.ID.UnexpectedGuid: + case Asc.c_oAscError.ID.UnexpectedGuid: config.msg = this.errorUnexpectedGuid; break; - case c_oAscError.ID.Database: + case Asc.c_oAscError.ID.Database: config.msg = this.errorDatabaseConnection; break; - case c_oAscError.ID.FileRequest: + case Asc.c_oAscError.ID.FileRequest: config.msg = this.errorFileRequest; break; - case c_oAscError.ID.FileVKey: + case Asc.c_oAscError.ID.FileVKey: config.msg = this.errorFileVKey; break; - case c_oAscError.ID.StockChartError: + case Asc.c_oAscError.ID.StockChartError: config.msg = this.errorStockChart; break; - case c_oAscError.ID.DataRangeError: + case Asc.c_oAscError.ID.DataRangeError: config.msg = this.errorDataRange; break; - case c_oAscError.ID.FrmlOperandExpected: + case Asc.c_oAscError.ID.FrmlOperandExpected: config.msg = this.errorOperandExpected; break; - case c_oAscError.ID.VKeyEncrypt: + case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorKeyEncrypt; break; - case c_oAscError.ID.KeyExpire: + case Asc.c_oAscError.ID.KeyExpire: config.msg = this.errorKeyExpire; break; - case c_oAscError.ID.UserCountExceed: + case Asc.c_oAscError.ID.UserCountExceed: config.msg = this.errorUsersExceed; break; - case c_oAscError.ID.CannotMoveRange: + case Asc.c_oAscError.ID.CannotMoveRange: config.msg = this.errorMoveRange; break; - case c_oAscError.ID.UplImageUrl: + case Asc.c_oAscError.ID.UplImageUrl: config.msg = this.errorBadImageUrl; break; - case c_oAscError.ID.CoAuthoringDisconnect: + case Asc.c_oAscError.ID.CoAuthoringDisconnect: config.msg = this.errorCoAuthoringDisconnect; break; - case c_oAscError.ID.ConvertationPassword: + case Asc.c_oAscError.ID.ConvertationPassword: config.msg = this.errorFilePassProtect; break; - case c_oAscError.ID.AutoFilterDataRangeError: + case Asc.c_oAscError.ID.AutoFilterDataRangeError: config.msg = this.errorAutoFilterDataRange; break; - case c_oAscError.ID.AutoFilterChangeFormatTableError: + case Asc.c_oAscError.ID.AutoFilterChangeFormatTableError: config.msg = this.errorAutoFilterChangeFormatTable; break; - case c_oAscError.ID.AutoFilterChangeError: + case Asc.c_oAscError.ID.AutoFilterChangeError: config.msg = this.errorAutoFilterChange; break; - case c_oAscError.ID.AutoFilterMoveToHiddenRangeError: + case Asc.c_oAscError.ID.AutoFilterMoveToHiddenRangeError: config.msg = this.errorAutoFilterHiddenRange; break; - case c_oAscError.ID.CannotFillRange: + case Asc.c_oAscError.ID.CannotFillRange: config.msg = this.errorFillRange; break; - case c_oAscError.ID.UserDrop: + case Asc.c_oAscError.ID.UserDrop: if (this._state.lostEditingRights) { this._state.lostEditingRights = false; return; @@ -1023,35 +1073,35 @@ define([ config.msg = this.errorUserDrop; break; - case c_oAscError.ID.InvalidReferenceOrName: + case Asc.c_oAscError.ID.InvalidReferenceOrName: config.msg = this.errorInvalidRef; break; - case c_oAscError.ID.LockCreateDefName: + case Asc.c_oAscError.ID.LockCreateDefName: config.msg = this.errorCreateDefName; break; - case c_oAscError.ID.PasteMaxRangeError: + case Asc.c_oAscError.ID.PasteMaxRangeError: config.msg = this.errorPasteMaxRange; break; - case c_oAscError.ID.LockedAllError: + case Asc.c_oAscError.ID.LockedAllError: config.msg = this.errorLockedAll; break; - case c_oAscError.ID.Warning: + case Asc.c_oAscError.ID.Warning: config.msg = this.errorConnectToServer; break; - case c_oAscError.ID.LockedWorksheetRename: + case Asc.c_oAscError.ID.LockedWorksheetRename: config.msg = this.errorLockedWorksheetRename; break; - case c_oAscError.ID.OpenWarning: + case Asc.c_oAscError.ID.OpenWarning: config.msg = this.errorOpenWarning; break; - case c_oAscError.ID.FrmlWrongReferences: + case Asc.c_oAscError.ID.FrmlWrongReferences: config.msg = this.errorFrmlWrongReferences; break; @@ -1061,7 +1111,7 @@ define([ } - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { Common.Gateway.reportError(id, config.msg); config.title = this.criticalErrorTitle; @@ -1080,7 +1130,7 @@ define([ config.iconCls = 'warn'; config.buttons = ['ok']; config.callback = _.bind(function(btn){ - if (id == c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { + if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { Common.UI.Menu.Manager.hideAll(); (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas'); } @@ -1100,20 +1150,6 @@ define([ this._state.isDisconnected = true; }, - getBrowseZoomLevel: function() { - if (Common.Utils.isIE) { - return screen.logicalXDPI/screen.deviceXDPI; - } else { - var zoom = window.outerWidth / document.documentElement.clientWidth; - - if (Common.Utils.isSafari) { - zoom = Math.floor(zoom * 10) / 10; - } - - return zoom; - } - }, - showTips: function(strings) { var me = this; if (!strings.length) return; @@ -1228,7 +1264,7 @@ define([ Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); } - this.stackLongActions.pop({id: InitApplication, type: c_oAscAsyncActionType.BlockInteraction}); + this.stackLongActions.pop({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction}); Common.NotificationCenter.trigger('layout:changed', 'main'); $('#loading-mask').hide().remove(); }, @@ -1244,14 +1280,14 @@ define([ onUpdateVersion: function(callback) { var me = this; me.needToUpdateVersion = true; - me.onLongActionEnd(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); Common.UI.error({ msg: this.errorUpdateVersion, callback: function() { _.defer(function() { Common.Gateway.updateVersion(); if (callback) callback.call(me); - me.onLongActionBegin(c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); }) } }); @@ -1259,7 +1295,7 @@ define([ onAdvancedOptions: function(advOptions) { var type = advOptions.asc_getOptionId(); - if (type == c_oAscAdvancedOptionsID.CSV) { + if (type == Asc.c_oAscAdvancedOptionsID.CSV) { var me = this; var dlg = new Common.Views.OpenDialog({ type: type, @@ -1276,7 +1312,7 @@ define([ this.isShowOpenDialog = true; this.loadMask && this.loadMask.hide(); - this.onLongActionEnd(c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); dlg.show(); } @@ -1299,8 +1335,8 @@ define([ }, onConfirmAction: function(id, apiCallback) { - if (id == c_oAscConfirm.ConfirmReplaceRange) { - var me = this; + var me = this; + if (id == Asc.c_oAscConfirm.ConfirmReplaceRange) { Common.UI.warning({ closable: false, title: this.notcriticalErrorTitle, @@ -1316,6 +1352,20 @@ define([ } }, this) }); + } else if (id == Asc.c_oAscConfirm.ConfirmPutMergeRange) { + Common.UI.warning({ + closable: false, + title: this.notcriticalErrorTitle, + msg: this.confirmPutMergeRange, + buttons: ['ok'], + primary: 'ok', + callback: _.bind(function(btn) { + if (apiCallback) { + apiCallback(); + } + me.onEditComplete(me.application.getController('DocumentHolder').getView('DocumentHolder')); + }, this) + }); } }, @@ -1515,7 +1565,7 @@ define([ unitsChanged: function(m) { var value = Common.localStorage.getItem("sse-settings-unit"); - Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); + Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric()); this.getApplication().getController('RightMenu').updateMetricUnit(); this.getApplication().getController('Print').getView('MainSettingsPrint').updateMetricUnit(); }, @@ -1604,10 +1654,7 @@ define([ onPrint: function() { if (!this.appOptions.canPrint) return; - - if (this.api) - this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - Common.component.Analytics.trackEvent('Print'); + Common.NotificationCenter.trigger('print', this); }, onPrintUrl: function(url) { @@ -1738,8 +1785,10 @@ define([ errorOpenWarning: 'The length of one of the formulas in the file exceeded
    the allowed number of characters and it was removed.', errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.
    Please check the data and try again.', textBuyNow: 'Buy now', - textNoLicenseTitle: 'License expired', - warnNoLicense: 'The license expired. You cannot create or edit files.
    Click the \'Buy now\' button to prolong the license.' + textNoLicenseTitle: 'License expired or not found', + warnNoLicense: 'The license could not be found or expired. You cannot edit files.
    Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.', + textContactUs: 'Contact us', + confirmPutMergeRange: 'The source data contains merged cells.
    They will be unmerged before they are pasted into the table.' } })(), SSE.Controllers.Main || {})) -}); \ No newline at end of file +}); diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 8d91f02c7..8ae0b2ef6 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ 'core', 'spreadsheeteditor/main/app/view/FileMenuPanels', @@ -11,10 +43,13 @@ define([ ], initialize: function() { + var value = Common.localStorage.getItem("sse-print-settings-range"); + value = (value!==null) ? parseInt(value) : Asc.c_oAscPrintType.ActiveSheets; + this.adjPrintParams = new Asc.asc_CAdjustPrint(); - this.adjPrintParams.asc_setPrintType(c_oAscPrintType.ActiveSheets); - this.adjPrintParams.asc_setLayoutPageType(c_oAscLayoutPageType.ActualSize); - this.diffParams = {}; + this.adjPrintParams.asc_setPrintType(value); + + this._changedProps = null; this.addListeners({ 'MainSettingsPrint': { @@ -32,11 +67,10 @@ define([ }, onAfterRender: function(view) { - this.printSettings.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this)); + this.printSettings.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this, this.printSettings)); this.printSettings.btnOk.on('click', _.bind(this.querySavePrintSettings, this)); - var toolbar = SSE.getController('Toolbar').getView('Toolbar'); - if (toolbar) - toolbar.mnuPrint.on('item:click', _.bind(this.openPrintSettings, this)); + Common.NotificationCenter.on('print', _.bind(this.openPrintSettings, this)); + this.registerControlEvents(this.printSettings); }, setApi: function(o) { @@ -46,16 +80,15 @@ define([ updateSheetsInfo: function() { if (this.printSettings.isVisible()) { - this.updateSettings(); + this.updateSettings(this.printSettings); } else { this.isFillSheets = false; - this.diffParams = {}; } }, - updateSettings: function() { + updateSettings: function(panel) { var wc = this.api.asc_getWorksheetsCount(), i = -1; - var items = [{displayValue: this.strAllSheets, value:-255}]; + var items = []; while (++i < wc) { if (!this.api.asc_isWorksheetHidden(i)) { @@ -66,87 +99,16 @@ define([ } } - this.printSettings.cmbSheet.store.reset(items); - var item = this.printSettings.cmbSheet.store.findWhere({value: this.printSettings.cmbSheet.getValue()}) || - this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); + panel.cmbSheet.store.reset(items); + var item = panel.cmbSheet.store.findWhere({value: panel.cmbSheet.getValue()}) || + panel.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); if (item) { - this.printSettings.cmbSheet.setValue(item.get('value')); + panel.cmbSheet.setValue(item.get('value')); } }, - comboSheetsChange: function(combo, record) { - var newvalue = record.value; - if (newvalue == -255) { - this.indeterminatePageOptions(this.printSettings); - } else { - this.fillPageOptions(this.printSettings, this.api.asc_getPageOptions(newvalue)); - } - }, - - isDiffRefill: function() { - for (var item in this.diffParams) { - if (this.diffParams[item] == undefined) return true; - } - - return item == undefined; - }, - - indeterminatePageOptions: function(panel) { - if (this.isDiffRefill()) { - var wc = this.api.asc_getWorksheetsCount(); - if (wc == 1) { - this.diffParams.orientation = false; - this.diffParams.size = false; - this.diffParams.headings = false; - this.diffParams.grid = false; - this.diffParams.margintop = false; - this.diffParams.marginright = false; - this.diffParams.marginbottom = false; - this.diffParams.marginleft = false; - } else { - var index = 0; - var opts = this.api.asc_getPageOptions(index), opts_next; - - while (++index < wc) { - opts_next = this.api.asc_getPageOptions(index); - - if (this.diffParams.orientation == undefined) - this.diffParams.orientation = opts.asc_getPageSetup().asc_getOrientation() != opts_next.asc_getPageSetup().asc_getOrientation(); - - if (this.diffParams.size == undefined) - this.diffParams.size = (opts.asc_getPageSetup().asc_getWidth() != opts_next.asc_getPageSetup().asc_getWidth() || opts.asc_getPageSetup().asc_getHeight() != opts_next.asc_getPageSetup().asc_getHeight()); - - if (this.diffParams.headings == undefined) - this.diffParams.headings = opts.asc_getHeadings() != opts_next.asc_getHeadings(); - - if (this.diffParams.grid == undefined) - this.diffParams.grid = opts.asc_getGridLines() != opts_next.asc_getGridLines(); - - if (this.diffParams.margintop == undefined) - this.diffParams.margintop = Math.abs(opts.asc_getPageMargins().asc_getTop()-opts_next.asc_getPageMargins().asc_getTop()) > 0.001; - - if (this.diffParams.marginright == undefined) - this.diffParams.marginright = Math.abs(opts.asc_getPageMargins().asc_getRight() - opts_next.asc_getPageMargins().asc_getRight()) > 0.001; - - if (this.diffParams.marginbottom == undefined) - this.diffParams.marginbottom = Math.abs(opts.asc_getPageMargins().asc_getBottom() - opts_next.asc_getPageMargins().asc_getBottom()) > 0.001; - - if (this.diffParams.marginleft == undefined) - this.diffParams.marginleft = Math.abs(opts.asc_getPageMargins().asc_getLeft() - opts_next.asc_getPageMargins().asc_getLeft()) > 0.001; - } - } - } - - if (this.diffParams.orientation) panel.cmbPaperOrientation.setValue('-'); - if (this.diffParams.size) panel.cmbPaperSize.setValue('-'); - - if (this.diffParams.margintop) panel.spnMarginTop.setValue('-'); - if (this.diffParams.marginright) panel.spnMarginRight.setValue('-'); - if (this.diffParams.marginbottom) panel.spnMarginBottom.setValue('-'); - if (this.diffParams.marginleft) panel.spnMarginLeft.setValue('-'); - - if (this.diffParams.grid) panel.chPrintGrid.setValue('indeterminate'); - if (this.diffParams.headings) panel.chPrintRows.setValue('indeterminate'); + comboSheetsChange: function(panel, combo, record) { + this.fillPageOptions(panel, this._changedProps[record.value] ? this._changedProps[record.value] : this.api.asc_getPageOptions(record.value)); }, fillPageOptions: function(panel, props) { @@ -164,19 +126,40 @@ define([ else panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h); - opt = props.asc_getPageMargins(); - panel.spnMarginLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getLeft())); - panel.spnMarginTop.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getTop())); - panel.spnMarginRight.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getRight())); - panel.spnMarginBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getBottom())); + var fitwidth = opt.asc_getFitToWidth(), + fitheight = opt.asc_getFitToHeight(); + if (!fitwidth && !fitheight) panel.cmbLayout.setValue(0); + else if (fitwidth && fitheight) panel.cmbLayout.setValue(1); + else if (fitwidth && !fitheight) panel.cmbLayout.setValue(2); + else panel.cmbLayout.setValue(3); - panel.chPrintGrid.setValue(props.asc_getGridLines()); - panel.chPrintRows.setValue(props.asc_getHeadings()); + item = panel.cmbPaperOrientation.store.findWhere({value: opt.asc_getOrientation()}); + if (item) panel.cmbPaperOrientation.setValue(item.get('value')); + + opt = props.asc_getPageMargins(); + panel.spnMarginLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getLeft()), true); + panel.spnMarginTop.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getTop()), true); + panel.spnMarginRight.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getRight()), true); + panel.spnMarginBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getBottom()), true); + + panel.chPrintGrid.setValue(props.asc_getGridLines(), true); + panel.chPrintRows.setValue(props.asc_getHeadings(), true); }, - fillPrintOptions: function(panel, props) { - panel.setRange(props.asc_getPrintType()); -// panel.setLayout(props.asc_getLayoutPageType()); + fillPrintOptions: function(props) { + this.printSettingsDlg.setRange(props.asc_getPrintType()); + this.onChangeRange(); + }, + + onChangeRange: function() { + var printtype = this.printSettingsDlg.getRange(), + store = this.printSettingsDlg.cmbSheet.store, + item = (printtype !== Asc.c_oAscPrintType.EntireWorkbook) ? store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}) : store.at(0); + if (item) { + this.printSettingsDlg.cmbSheet.setValue(item.get('value')); + this.comboSheetsChange(this.printSettingsDlg, this.printSettingsDlg.cmbSheet, item.toJSON()); + } + this.printSettingsDlg.cmbSheet.setDisabled(printtype !== Asc.c_oAscPrintType.EntireWorkbook); }, getPageOptions: function(panel) { @@ -190,10 +173,13 @@ define([ var pagew = /^\d{3}\.?\d*/.exec(panel.cmbPaperSize.getValue()); var pageh = /\d{3}\.?\d*$/.exec(panel.cmbPaperSize.getValue()); -// if (pagew && pageh) { opt.asc_setWidth(!pagew ? undefined : parseFloat(pagew[0])); opt.asc_setHeight(!pageh? undefined : parseFloat(pageh[0])); -// } + + + var value = panel.cmbLayout.getValue(); + opt.asc_setFitToWidth(value==1 || value==2); + opt.asc_setFitToHeight(value==1 || value==3); props.asc_setPageSetup(opt); @@ -208,55 +194,41 @@ define([ return props; }, - savePageOptions: function(panel, index) { - var opts = this.getPageOptions(panel); - - if (index == -255) { - var wc = this.api.asc_getWorksheetsCount(); + savePageOptions: function(panel) { + var wc = this.api.asc_getWorksheetsCount(), index = -1; - while (++index < wc) { - this.api.asc_setPageOptions(opts, index); - } - - if (this.diffParams.orientation) this.diffParams.orientation = opts.asc_getPageSetup().asc_getOrientation() == undefined; - if (this.diffParams.size) this.diffParams.size = (opts.asc_getPageSetup().asc_getWidth() == undefined || opts.asc_getPageSetup().asc_getHeight() == undefined); - if (this.diffParams.headings) this.diffParams.headings = opts.asc_getHeadings() == undefined; - if (this.diffParams.grid) this.diffParams.grid = opts.asc_getGridLines() == undefined; - if (this.diffParams.margintop) this.diffParams.margintop = opts.asc_getPageMargins().asc_getTop() == undefined; - if (this.diffParams.marginright) this.diffParams.marginright = opts.asc_getPageMargins().asc_getRight() == undefined; - if (this.diffParams.marginbottom) this.diffParams.marginbottom = opts.asc_getPageMargins().asc_getBottom() == undefined; - if (this.diffParams.marginleft) this.diffParams.marginleft = opts.asc_getPageMargins().asc_getLeft() == undefined; - } else { - this.api.asc_setPageOptions(opts, index); - this.diffParams = {}; + while (++index < wc) { + if (this._changedProps[index]) + this.api.asc_setPageOptions(this._changedProps[index], index); } }, onShowMainSettingsPrint: function() { + this._changedProps = []; + if (!this.isFillSheets) { this.isFillSheets = true; - this.updateSettings(); + this.updateSettings(this.printSettings); } - if (!this.isUpdatedSettings) { - this.isUpdatedSettings = true; - - var item = this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); - if (item) { - this.printSettings.cmbSheet.setValue(item.get('value')); - this.comboSheetsChange(this.printSettings.cmbSheet, item.toJSON()); - } + var item = this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); + if (item) { + this.printSettings.cmbSheet.setValue(item.get('value')); + this.comboSheetsChange(this.printSettings, this.printSettings.cmbSheet, item.toJSON()); } }, - openPrintSettings: function(menu, item) { - if (item.value === 'options' && this.api ) { + openPrintSettings: function(btn) { + if (this.api) { this.printSettingsDlg = (new SSE.Views.PrintSettings({ handler: _.bind(this.resultPrintSettings,this), afterrender: _.bind(function() { - this.fillPageOptions(this.printSettingsDlg, this.api.asc_getPageOptions()); - this.fillPrintOptions(this.printSettingsDlg, this.adjPrintParams); + this._changedProps = []; + this.updateSettings(this.printSettingsDlg); + this.printSettingsDlg.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this, this.printSettingsDlg)); + this.fillPrintOptions(this.adjPrintParams); + this.registerControlEvents(this.printSettingsDlg); },this) })); this.printSettingsDlg.show(); @@ -267,39 +239,32 @@ define([ var view = SSE.getController('Toolbar').getView('Toolbar'); if (result == 'ok') { if ( this.checkMargins(this.printSettingsDlg) ) { - this.savePageOptions(this.printSettingsDlg, this.printSettingsDlg.getRange() == c_oAscPrintType.EntireWorkbook ? -255:undefined); + this.savePageOptions(this.printSettingsDlg); + + var printtype = this.printSettingsDlg.getRange(); + this.adjPrintParams.asc_setPrintType(printtype); + Common.localStorage.setItem("sse-print-settings-range", printtype); - this.adjPrintParams.asc_setPrintType(this.printSettingsDlg.getRange()); -// this.adjPrintParams.asc_setLayoutPageType(this.printSettingsDlg.getLayout()); this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); - this.isUpdatedSettings = false; + Common.component.Analytics.trackEvent('Print'); + Common.component.Analytics.trackEvent('ToolBar', 'Print'); + Common.NotificationCenter.trigger('edit:complete', view); } else return true; - } - - Common.NotificationCenter.trigger('edit:complete', view); - }, - - onChangeRange: function() { - var newvalue = this.printSettingsDlg.getRange(); - if (newvalue == c_oAscPrintType.EntireWorkbook) { - this.indeterminatePageOptions(this.printSettingsDlg); - } else if (this.lastCheckedRange == c_oAscPrintType.EntireWorkbook) { - this.fillPageOptions(this.printSettingsDlg, this.api.asc_getPageOptions()); - } - this.lastCheckedRange = newvalue; + } else + Common.NotificationCenter.trigger('edit:complete', view); }, querySavePrintSettings: function() { if ( this.checkMargins(this.printSettings) ) { - this.savePageOptions(this.printSettings, this.printSettings.cmbSheet.getValue()); + this.savePageOptions(this.printSettings); this.printSettings.applySettings(); } }, checkMargins: function(panel) { - if (panel.cmbPaperOrientation.getValue() == c_oAscPageOrientation.PagePortrait) { + if (panel.cmbPaperOrientation.getValue() == Asc.c_oAscPageOrientation.PagePortrait) { var pagewidth = /^\d{3}\.?\d*/.exec(panel.cmbPaperSize.getValue()); var pageheight = /\d{3}\.?\d*$/.exec(panel.cmbPaperSize.getValue()); } else { @@ -340,6 +305,24 @@ define([ return true; }, + registerControlEvents: function(panel) { + panel.cmbPaperSize.on('selected', _.bind(this.propertyChange, this, panel)); + panel.cmbPaperOrientation.on('selected', _.bind(this.propertyChange, this, panel)); + panel.cmbLayout.on('selected', _.bind(this.propertyChange, this, panel)); + panel.spnMarginTop.on('change', _.bind(this.propertyChange, this, panel)); + panel.spnMarginBottom.on('change', _.bind(this.propertyChange, this, panel)); + panel.spnMarginLeft.on('change', _.bind(this.propertyChange, this, panel)); + panel.spnMarginRight.on('change', _.bind(this.propertyChange, this, panel)); + panel.chPrintGrid.on('change', _.bind(this.propertyChange, this, panel)); + panel.chPrintRows.on('change', _.bind(this.propertyChange, this, panel)); + }, + + propertyChange: function(panel) { + if (this._changedProps) { + this._changedProps[panel.cmbSheet.getValue()] = this.getPageOptions(panel); + } + }, + warnCheckMargings: 'Margins are incorrect', strAllSheets: 'All Sheets', textWarning: 'Warning' diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index 248b8a42f..dc61d8f92 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * RightMenu.js * @@ -45,13 +77,15 @@ define([ this._settings[Common.Utils.documentSettingsType.Image] = {panelId: "id-image-settings", panel: rightMenu.imageSettings, btn: rightMenu.btnImage, hidden: 1, locked: false}; this._settings[Common.Utils.documentSettingsType.Shape] = {panelId: "id-shape-settings", panel: rightMenu.shapeSettings, btn: rightMenu.btnShape, hidden: 1, locked: false}; this._settings[Common.Utils.documentSettingsType.TextArt] = {panelId: "id-textart-settings", panel: rightMenu.textartSettings, btn: rightMenu.btnTextArt, hidden: 1, locked: false}; - this._settings[Common.Utils.documentSettingsType.Chart] = {panelId: "id-chart-settings", panel: rightMenu.chartSettings, btn: rightMenu.btnChart, hidden: 1, locked: false}; + this._settings[Common.Utils.documentSettingsType.Chart] = {panelId: "id-chart-settings", panel: rightMenu.chartSettings, btn: rightMenu.btnChart, hidden: 1, locked: false}; + this._settings[Common.Utils.documentSettingsType.Table] = {panelId: "id-table-settings", panel: rightMenu.tableSettings, btn: rightMenu.btnTable, hidden: 1, locked: false}; }, setApi: function(api) { this.api = api; this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); + Common.NotificationCenter.on('cells:range', _.bind(this.onCellsRange, this)); }, setMode: function(mode) { @@ -70,22 +104,25 @@ define([ }, onSelectionChanged: function(info) { + if (this.rangeSelectionMode) return; + var SelectedObjects = [], - selectType = info.asc_getFlags().asc_getSelectionType(); + selectType = info.asc_getFlags().asc_getSelectionType(), + formatTableInfo = info.asc_getFormatTableInfo(); - if (selectType == c_oAscSelectionType.RangeImage || selectType == c_oAscSelectionType.RangeShape || - selectType == c_oAscSelectionType.RangeChart || selectType == c_oAscSelectionType.RangeChartText || selectType == c_oAscSelectionType.RangeShapeText) { + if (selectType == Asc.c_oAscSelectionType.RangeImage || selectType == Asc.c_oAscSelectionType.RangeShape || + selectType == Asc.c_oAscSelectionType.RangeChart || selectType == Asc.c_oAscSelectionType.RangeChartText || selectType == Asc.c_oAscSelectionType.RangeShapeText) { SelectedObjects = this.api.asc_getGraphicObjectProps(); } - - if (SelectedObjects.length<=0 && !this.rightmenu.minimizedMode) { + + if (SelectedObjects.length<=0 && !formatTableInfo && !this.rightmenu.minimizedMode) { this.rightmenu.clearSelection(); + this._openRightMenu = true; } - this.onFocusObject(SelectedObjects); + var need_disable = info.asc_getLocked(); - var need_disable = info.asc_getLocked(), - me = this; + this.onFocusObject(SelectedObjects, formatTableInfo, need_disable); if (this._state.prevDisabled != need_disable) { this._state.prevDisabled = need_disable; @@ -95,7 +132,7 @@ define([ } }, - onFocusObject: function(SelectedObjects) { + onFocusObject: function(SelectedObjects, formatTableInfo, isCellLocked) { if (!this.editMode) return; @@ -133,6 +170,13 @@ define([ this._settings[settingsType].locked = value.asc_getLocked(); } + if (formatTableInfo) { + settingsType = Common.Utils.documentSettingsType.Table; + this._settings[settingsType].props = formatTableInfo; + this._settings[settingsType].locked = isCellLocked; + this._settings[settingsType].hidden = 0; + } + var lastactive = -1, currentactive, priorityactive = -1; for (i=0; i-1) active = priorityactive; else if (lastactive>=0 && currentactive<0) active = lastactive; else if (currentactive>=0) active = currentactive; + if (active == undefined && this._openRightMenu && lastactive>=0) + active = lastactive; + if (active !== undefined) { - this.rightmenu.SetActivePane(active); + this.rightmenu.SetActivePane(active, this._openRightMenu); this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props); + this._openRightMenu = false; } } @@ -174,8 +222,7 @@ define([ }, onCoAuthoringDisconnect: function() { - if (this.rightmenu) - this.rightmenu.SetDisabled('', true, true); + this.SetDisabled(true); this.setMode({isEdit: false}); }, @@ -213,9 +260,13 @@ define([ createDelayedElements: function() { var me = this; if (this.api) { + var open = Common.localStorage.getItem("sse-hide-right-settings"); + this._openRightMenu = (open===null || parseInt(open) == 0); + this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this)); this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this)); + this.onSelectionChanged(this.api.asc_getCellInfo()); } }, @@ -244,11 +295,36 @@ define([ getDocumentSettingsType: function(type) { switch (type) { - case c_oAscTypeSelectElement.Paragraph: + case Asc.c_oAscTypeSelectElement.Paragraph: return Common.Utils.documentSettingsType.Paragraph; - case c_oAscTypeSelectElement.Image: + case Asc.c_oAscTypeSelectElement.Image: return Common.Utils.documentSettingsType.Image; } + }, + + SetDisabled: function(disabled) { + if (this.rightmenu) { + this.rightmenu.paragraphSettings.disableControls(disabled); + this.rightmenu.shapeSettings.disableControls(disabled); + this.rightmenu.imageSettings.disableControls(disabled); + this.rightmenu.chartSettings.disableControls(disabled); + this.rightmenu.tableSettings.disableControls(disabled); + + if (disabled) { + this.rightmenu.btnText.setDisabled(disabled); + this.rightmenu.btnTable.setDisabled(disabled); + this.rightmenu.btnImage.setDisabled(disabled); + this.rightmenu.btnShape.setDisabled(disabled); + this.rightmenu.btnTextArt.setDisabled(disabled); + this.rightmenu.btnChart.setDisabled(disabled); + } else { + this.onSelectionChanged(this.api.asc_getCellInfo()); + } + } + }, + + onCellsRange: function(status) { + this.rangeSelectionMode = (status != Asc.c_oAscSelectionDialogType.None); } }); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 08342299a..f778544c6 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Statusbar.js * @@ -127,8 +159,8 @@ define([ /** coauthoring begin **/ onWorkbookLocked: function(locked) { this.statusbar.tabbar[locked?'addClass':'removeClass']('coauth-locked'); - this.statusbar.btnAddWorksheet.setDisabled(locked || this.statusbar.rangeSelectionMode==c_oAscSelectionDialogType.Chart || - this.statusbar.rangeSelectionMode==c_oAscSelectionDialogType.FormatTable); + this.statusbar.btnAddWorksheet.setDisabled(locked || this.statusbar.rangeSelectionMode==Asc.c_oAscSelectionDialogType.Chart || + this.statusbar.rangeSelectionMode==Asc.c_oAscSelectionDialogType.FormatTable); var item, i = this.statusbar.tabbar.getCount(); while (i-- > 0) { item = this.statusbar.tabbar.getAt(i); @@ -147,7 +179,7 @@ define([ tab = this.statusbar.tabbar.getAt(i); if (index == tab.sheetindex) { tab[locked?'addClass':'removeClass']('coauth-locked'); - tab.isLockTheDrag = locked || (this.statusbar.rangeSelectionMode==c_oAscSelectionDialogType.FormatTable); + tab.isLockTheDrag = locked || (this.statusbar.rangeSelectionMode==Asc.c_oAscSelectionDialogType.FormatTable); break; } } @@ -168,8 +200,8 @@ define([ }, onApiEditCell: function(state) { - var disableAdd = (state == c_oAscCellEditorState.editFormula), - disable = (state != c_oAscCellEditorState.editEnd), + var disableAdd = (state == Asc.c_oAscCellEditorState.editFormula), + disable = (state != Asc.c_oAscCellEditorState.editEnd), mask = $('.statusbar-mask'), statusbar = this.statusbar; @@ -203,15 +235,15 @@ define([ onRangeDialogMode: function (mode) { var islocked = this.statusbar.tabbar.hasClass('coauth-locked'), currentIdx = this.api.asc_getActiveWorksheetIndex(); - this.statusbar.btnAddWorksheet.setDisabled(islocked || mode!=c_oAscSelectionDialogType.None); + this.statusbar.btnAddWorksheet.setDisabled(islocked || mode!=Asc.c_oAscSelectionDialogType.None); var item, i = this.statusbar.tabbar.getCount(); while (i-- > 0) { item = this.statusbar.tabbar.getAt(i); if (item.sheetindex !== currentIdx) { - item.disable(mode==c_oAscSelectionDialogType.FormatTable); + item.disable(mode==Asc.c_oAscSelectionDialogType.FormatTable); } - item.isLockTheDrag = (item.hasClass('coauth-locked') || (mode!=c_oAscSelectionDialogType.None)); + item.isLockTheDrag = (item.hasClass('coauth-locked') || (mode!=Asc.c_oAscSelectionDialogType.None)); } this.statusbar.rangeSelectionMode = mode; }, @@ -518,7 +550,7 @@ define([ color = this.api.asc_getWorksheetTabColor(sindex); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; } else { clr = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); @@ -598,7 +630,7 @@ define([ onError: function(id, level, errData) { - if (id == c_oAscError.ID.LockedWorksheetRename) + if (id == Asc.c_oAscError.ID.LockedWorksheetRename) this.statusbar.update(); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 8010be781..178f06023 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Toolbar.js * @@ -136,7 +168,6 @@ define([ toolbar.btnNewDocument.on('click', _.bind(this.onNewDocument, this)); toolbar.btnOpenDocument.on('click', _.bind(this.onOpenDocument, this)); toolbar.btnPrint.on('click', _.bind(this.onPrint, this)); - toolbar.btnPrint.menu.on('item:click', _.bind(this.onPrintMenu, this)); toolbar.btnSave.on('click', _.bind(this.onSave, this)); toolbar.btnUndo.on('click', _.bind(this.onUndo, this)); toolbar.btnRedo.on('click', _.bind(this.onRedo, this)); @@ -175,10 +206,10 @@ define([ toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); toolbar.btnInsertText.menu.on('item:click', _.bind(this.onInsertTextClick, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); - toolbar.btnSortDown.on('click', _.bind(this.onSortType, this, 'ascending')); - toolbar.btnSortUp.on('click', _.bind(this.onSortType, this, 'descending')); - toolbar.mnuitemSortAZ.on('click', _.bind(this.onSortType, this, 'ascending')); - toolbar.mnuitemSortZA.on('click', _.bind(this.onSortType, this, 'descending')); + toolbar.btnSortDown.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending)); + toolbar.btnSortUp.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Descending)); + toolbar.mnuitemSortAZ.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending)); + toolbar.mnuitemSortZA.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Descending)); toolbar.btnSetAutofilter.on('click', _.bind(this.onAutoFilter, this)); toolbar.mnuitemAutoFilter.on('click', _.bind(this.onAutoFilter, this)); toolbar.btnClearAutofilter.on('click', _.bind(this.onClearFilter, this)); @@ -258,25 +289,7 @@ define([ }, onPrint: function(e) { - if (this.api) { - this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari == true use asc_onPrintUrl event - - Common.NotificationCenter.trigger('edit:complete', this.toolbar); - - Common.component.Analytics.trackEvent('Print'); - Common.component.Analytics.trackEvent('ToolBar', 'Print'); - } - }, - - onPrintMenu: function(menu, item) { - if (item.value === 'print' && this.api) { - this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - - Common.NotificationCenter.trigger('edit:complete', this.toolbar); - - Common.component.Analytics.trackEvent('Print'); - Common.component.Analytics.trackEvent('ToolBar', 'Print'); - } + Common.NotificationCenter.trigger('print', this.toolbar); }, onSave: function(e) { @@ -477,20 +490,20 @@ define([ btnBorders.options.borderId = item.options.borderId; if (item.options.borderId == 'inner') { - new_borders[c_oAscBorderOptions.InnerV] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.InnerH] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.InnerV] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.InnerH] = new Asc.asc_CBorder(bordersWidth, bordersColor); } else if (item.options.borderId == 'all') { - new_borders[c_oAscBorderOptions.InnerV] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.InnerH] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Left] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Top] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Right] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Bottom] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.InnerV] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.InnerH] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Left] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Top] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Right] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Bottom] = new Asc.asc_CBorder(bordersWidth, bordersColor); } else if (item.options.borderId == 'outer') { - new_borders[c_oAscBorderOptions.Left] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Top] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Right] = new Asc.asc_CBorder(bordersWidth, bordersColor); - new_borders[c_oAscBorderOptions.Bottom] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Left] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Top] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Right] = new Asc.asc_CBorder(bordersWidth, bordersColor); + new_borders[Asc.c_oAscBorderOptions.Bottom] = new Asc.asc_CBorder(bordersWidth, bordersColor); } else if (item.options.borderId != 'none') { new_borders[item.options.borderId] = new Asc.asc_CBorder(bordersWidth, bordersColor); } @@ -720,9 +733,9 @@ define([ props : props, text : cell.asc_getText(), isLock : cell.asc_getFlags().asc_getLockText(), - allowInternal: (seltype!==c_oAscSelectionType.RangeImage && seltype!==c_oAscSelectionType.RangeShape && - seltype!==c_oAscSelectionType.RangeShapeText && seltype!==c_oAscSelectionType.RangeChart && - seltype!==c_oAscSelectionType.RangeChartText) + allowInternal: (seltype!==Asc.c_oAscSelectionType.RangeImage && seltype!==Asc.c_oAscSelectionType.RangeShape && + seltype!==Asc.c_oAscSelectionType.RangeShapeText && seltype!==Asc.c_oAscSelectionType.RangeChart && + seltype!==Asc.c_oAscSelectionType.RangeChartText) }); } @@ -732,12 +745,12 @@ define([ onInsertChart: function(btn) { if (!this.editMode) return; var me = this, info = me.api.asc_getCellInfo(); - if (info.asc_getFlags().asc_getSelectionType()!=c_oAscSelectionType.RangeImage) { + if (info.asc_getFlags().asc_getSelectionType()!=Asc.c_oAscSelectionType.RangeImage) { var win, props; if (me.api){ props = me.api.asc_getChartObject(); if (props) { - var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == c_oAscSelectionType.RangeChartText); + var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText); (new SSE.Views.ChartSettingsDlg( { @@ -804,7 +817,7 @@ define([ this._state.filter = undefined; if (this.api){ if (this._state.tablename || state) - this.api.asc_changeAutoFilter(this._state.tablename, c_oAscChangeFilterOptions.filter, !state); + this.api.asc_changeAutoFilter(this._state.tablename, Asc.c_oAscChangeFilterOptions.filter, !state); else this.api.asc_addAutoFilter(); } @@ -872,7 +885,7 @@ define([ item.value = item.value || 'SUM'; - this.api.asc_insertFormula(this.api.asc_getFormulaLocaleName(item.value), c_oAscPopUpSelectorType.Func, true); + this.api.asc_insertFormula(this.api.asc_getFormulaLocaleName(item.value), Asc.c_oAscPopUpSelectorType.Func, true); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Insert formula'); @@ -887,12 +900,12 @@ define([ (new SSE.Views.NamedRangePasteDlg({ handler: function(result, settings) { if (result == 'ok' && settings) { - me.api.asc_insertFormula(settings.asc_getName(), settings.asc_getIsTable() ? c_oAscPopUpSelectorType.Table : c_oAscPopUpSelectorType.Range, false); + me.api.asc_insertFormula(settings.asc_getName(), settings.asc_getIsTable() ? Asc.c_oAscPopUpSelectorType.Table : Asc.c_oAscPopUpSelectorType.Range, false); Common.component.Analytics.trackEvent('ToolBar', 'Paste Named Range'); } Common.NotificationCenter.trigger('edit:complete', me.toolbar); }, - ranges: me.api.asc_getDefinedNames(c_oAscGetDefinedNamesList.WorksheetWorkbook) // names only for current sheet and workbook + ranges: me.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.WorksheetWorkbook) // names only for current sheet and workbook })).show(); Common.component.Analytics.trackEvent('ToolBar', 'Paste Named Range'); } else { @@ -943,7 +956,7 @@ define([ locked: me._state.namedrange_locked, sheets: items, sheetNames: sheetNames, - ranges: me.api.asc_getDefinedNames(c_oAscGetDefinedNamesList.All), + ranges: me.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.All), props : me.api.asc_getDefaultDefinedName(), sort : cellEditor.rangeListSort })).on('close', function(win){ @@ -956,7 +969,7 @@ define([ onNamedRangeMenuOpen: function() { if (this.api) { - var names = this.api.asc_getDefinedNames(c_oAscGetDefinedNamesList.WorksheetWorkbook); + var names = this.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.WorksheetWorkbook); this.toolbar.btnNamedRange.menu.items[2].setDisabled(names.length<1); } }, @@ -1168,8 +1181,10 @@ define([ Common.util.Shortcuts.delegateShortcuts({ shortcuts: { 'command+l,ctrl+l': function(e) { - if (me.editMode && (!me.api.asc_getCellInfo().asc_getAutoFilterInfo() || me.api.asc_getCellInfo().asc_getAutoFilterInfo().asc_getTableStyleName()===null)) - me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name')); + if (me.editMode) { + if (!me.api.asc_getCellInfo().asc_getFormatTableInfo()) + me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name')); + } return false; }, @@ -1178,7 +1193,7 @@ define([ me._state.filter = undefined; if (me.editMode && me.api) { if (me._state.tablename || state) - me.api.asc_changeAutoFilter(me._state.tablename, c_oAscChangeFilterOptions.filter, !state); + me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.filter, !state); else me.api.asc_addAutoFilter(); } @@ -1396,11 +1411,11 @@ define([ onApiEditCell: function(state) { var toolbar = this.toolbar; if (toolbar.mode.isEditDiagram || toolbar.mode.isEditMailMerge) { - is_cell_edited = (state == c_oAscCellEditorState.editStart); - toolbar.lockToolbar(SSE.enumLock.editCell, state == c_oAscCellEditorState.editStart, {array: [toolbar.btnDecDecimal,toolbar.btnIncDecimal,toolbar.btnNumberFormat]}); + is_cell_edited = (state == Asc.c_oAscCellEditorState.editStart); + toolbar.lockToolbar(SSE.enumLock.editCell, state == Asc.c_oAscCellEditorState.editStart, {array: [toolbar.btnDecDecimal,toolbar.btnIncDecimal,toolbar.btnNumberFormat]}); } else - if (state == c_oAscCellEditorState.editStart || state == c_oAscCellEditorState.editEnd) { - toolbar.lockToolbar(SSE.enumLock.editCell, state == c_oAscCellEditorState.editStart, { + if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) { + toolbar.lockToolbar(SSE.enumLock.editCell, state == Asc.c_oAscCellEditorState.editStart, { array: [ toolbar.btnClearStyle.menu.items[1], toolbar.btnClearStyle.menu.items[2], @@ -1414,7 +1429,7 @@ define([ clear: [SSE.enumLock.editFormula, SSE.enumLock.editText] }); - var is_cell_edited = (state == c_oAscCellEditorState.editStart); + var is_cell_edited = (state == Asc.c_oAscCellEditorState.editStart); (is_cell_edited) ? Common.util.Shortcuts.suspendEvents('command+l, ctrl+l, command+shift+l, ctrl+shift+l, command+k, ctrl+k, alt+h') : Common.util.Shortcuts.resumeEvents('command+l, ctrl+l, command+shift+l, ctrl+shift+l, command+k, ctrl+k, alt+h'); @@ -1425,9 +1440,9 @@ define([ this._state.prstyle = undefined; } } else { - if (state == c_oAscCellEditorState.editText) var is_text = true, is_formula = false; else - if (state == c_oAscCellEditorState.editFormula) is_text = !(is_formula = true); else - if (state == c_oAscCellEditorState.editEmptyCell) is_text = is_formula = false; + if (state == Asc.c_oAscCellEditorState.editText) var is_text = true, is_formula = false; else + if (state == Asc.c_oAscCellEditorState.editFormula) is_text = !(is_formula = true); else + if (state == Asc.c_oAscCellEditorState.editEmptyCell) is_text = is_formula = false; toolbar.lockToolbar(SSE.enumLock.editFormula, is_formula, { array: [toolbar.cmbFontName, toolbar.cmbFontSize, toolbar.btnIncFontSize, toolbar.btnDecFontSize, @@ -1508,7 +1523,7 @@ define([ if (!toolbar.btnTextColor.ischanged && !fontColorPicker.isDummy) { color = fontobj.asc_getColor(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; } else { clr = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); @@ -1595,7 +1610,7 @@ define([ if (!toolbar.btnTextColor.ischanged && !fontColorPicker.isDummy) { color = fontobj.asc_getColor(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; } else { clr = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); @@ -1629,7 +1644,7 @@ define([ if (!toolbar.btnBackColor.ischanged && !paragraphColorPicker.isDummy) { color = info.asc_getFill().asc_getColor(); if (color) { - if (color.get_type() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; } else { clr = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); @@ -1662,7 +1677,7 @@ define([ this._state.clrshd_asccolor = color; } - if (selectionType == c_oAscSelectionType.RangeChart || selectionType == c_oAscSelectionType.RangeChartText) + if (selectionType == Asc.c_oAscSelectionType.RangeChart || selectionType == Asc.c_oAscSelectionType.RangeChartText) return; if (!toolbar.mode.isEditDiagram) @@ -1670,7 +1685,8 @@ define([ // (coauth_disable !== toolbar.btnClearStyle.isDisabled()) && toolbar.btnClearStyle.setDisabled(coauth_disable); // (coauth_disable !== toolbar.btnCopyStyle.isDisabled()) && toolbar.btnCopyStyle.setDisabled(coauth_disable); - var filterInfo = info.asc_getAutoFilterInfo(); + var filterInfo = info.asc_getAutoFilterInfo(), + formatTableInfo = info.asc_getFormatTableInfo(); if (!toolbar.mode.isEditMailMerge) { /* read cell horizontal align */ fontparam = info.asc_getHorAlign(); @@ -1747,7 +1763,7 @@ define([ } } - need_disable = this._state.controlsdisabled.filters || filterInfo && (filterInfo.asc_getTableStyleName()!==null || filterInfo.asc_getIsAutoFilter()===null); + need_disable = this._state.controlsdisabled.filters || formatTableInfo!==null || filterInfo && filterInfo.asc_getIsAutoFilter()===null; // (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable); toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge]}); @@ -1778,7 +1794,7 @@ define([ { array: [toolbar.btnSortDown, toolbar.btnSortUp, toolbar.mnuitemSortAZ, toolbar.mnuitemSortZA, toolbar.btnTableTemplate,toolbar.btnSetAutofilter,toolbar.mnuitemAutoFilter,toolbar.btnAutofilter] }); - val = (filterInfo) ? filterInfo.asc_getTableStyleName() : null; + val = (formatTableInfo) ? formatTableInfo.asc_getTableStyleName() : null; if (this._state.tablestylename !== val && this.toolbar.mnuTableTemplatePicker) { val = this.toolbar.mnuTableTemplatePicker.store.findWhere({name: val}); if (val) { @@ -1790,7 +1806,7 @@ define([ } } - this._state.tablename = (filterInfo) ? filterInfo.asc_getTableName() : undefined; + this._state.tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined; need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true); toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]}); @@ -1833,13 +1849,13 @@ define([ } } - val = (selectionType==c_oAscSelectionType.RangeRow); + val = (selectionType==Asc.c_oAscSelectionType.RangeRow); if ( this._state.controlsdisabled.rows!==val ) { this._state.controlsdisabled.rows=val; toolbar.btnAddCell.menu.items[3].setDisabled(val); toolbar.btnDeleteCell.menu.items[3].setDisabled(val); } - val = (selectionType==c_oAscSelectionType.RangeCol); + val = (selectionType==Asc.c_oAscSelectionType.RangeCol); if ( this._state.controlsdisabled.cols!==val ) { this._state.controlsdisabled.cols=val; toolbar.btnAddCell.menu.items[2].setDisabled(val); @@ -2030,11 +2046,6 @@ define([ me.toolbar.btnInsertText.menu.hide(); Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertText); Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art'); - - if (e.type !== 'click') - me.toolbar.btnInsertText.menu.hide(); - Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertText); - Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art'); } }); } @@ -2081,14 +2092,14 @@ define([ _disableEditOptions: function(seltype, coauth_disable) { if (this.api.isCellEdited) return true; if (this.api.isRangeSelection) return true; - if (this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===c_oAscSelectionType.RangeImage); + if (this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage); var toolbar = this.toolbar, - is_chart_text = seltype == c_oAscSelectionType.RangeChartText, - is_chart = seltype == c_oAscSelectionType.RangeChart, - is_shape_text = seltype == c_oAscSelectionType.RangeShapeText, - is_shape = seltype == c_oAscSelectionType.RangeShape, - is_image = seltype == c_oAscSelectionType.RangeImage, + is_chart_text = seltype == Asc.c_oAscSelectionType.RangeChartText, + is_chart = seltype == Asc.c_oAscSelectionType.RangeChart, + is_shape_text = seltype == Asc.c_oAscSelectionType.RangeShapeText, + is_shape = seltype == Asc.c_oAscSelectionType.RangeShape, + is_image = seltype == Asc.c_oAscSelectionType.RangeImage, is_mode_2 = is_shape_text || is_shape || is_chart_text || is_chart; if ( coauth_disable ) { @@ -2097,11 +2108,11 @@ define([ var _set = SSE.enumLock; var type = seltype; switch (seltype) { - case c_oAscSelectionType.RangeImage: type = _set.selImage; break; - case c_oAscSelectionType.RangeShape: type = _set.selShape; break; - case c_oAscSelectionType.RangeShapeText: type = _set.selShapeText; break; - case c_oAscSelectionType.RangeChart: type = _set.selChart; break; - case c_oAscSelectionType.RangeChartText: type = _set.selChartText; break; + case Asc.c_oAscSelectionType.RangeImage: type = _set.selImage; break; + case Asc.c_oAscSelectionType.RangeShape: type = _set.selShape; break; + case Asc.c_oAscSelectionType.RangeShapeText: type = _set.selShapeText; break; + case Asc.c_oAscSelectionType.RangeChart: type = _set.selChart; break; + case Asc.c_oAscSelectionType.RangeChartText: type = _set.selChartText; break; } toolbar.lockToolbar(type, type != seltype, { @@ -2156,10 +2167,10 @@ define([ var handlerDlg = function(dlg, result) { if (result == 'ok') { me._state.filter = undefined; - me.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.None); + me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); if (me._state.tablename) - me.api.asc_changeAutoFilter(me._state.tablename, c_oAscChangeFilterOptions.style, fmtname); + me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname); else me.api.asc_addAutoFilter(fmtname, dlg.getSettings()); } @@ -2178,7 +2189,7 @@ define([ } else { me._state.filter = undefined; if (me._state.tablename) - me.api.asc_changeAutoFilter(me._state.tablename, c_oAscChangeFilterOptions.style, fmtname); + me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname); else me.api.asc_addAutoFilter(fmtname); } @@ -2220,8 +2231,8 @@ define([ }, onCellsRange: function(status) { - this.api.isRangeSelection = (status != c_oAscSelectionDialogType.None); - this.onApiEditCell(this.api.isRangeSelection ? c_oAscCellEditorState.editStart : c_oAscCellEditorState.editEnd); + this.api.isRangeSelection = (status != Asc.c_oAscSelectionDialogType.None); + this.onApiEditCell(this.api.isRangeSelection ? Asc.c_oAscCellEditorState.editStart : Asc.c_oAscCellEditorState.editEnd); var toolbar = this.toolbar; toolbar.lockToolbar(SSE.enumLock.selRange, this.api.isRangeSelection); @@ -2233,7 +2244,7 @@ define([ }, onLockDefNameManager: function(state) { - this._state.namedrange_locked = (state == c_oAscDefinedNameReason.LockDefNameManager); + this._state.namedrange_locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager); }, DisableToolbar: function(disable) { diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index e856221bf..0c364d89a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Viewport.js * diff --git a/apps/spreadsheeteditor/main/app/model/Formula.js b/apps/spreadsheeteditor/main/app/model/Formula.js index c24a16ae0..a80958d26 100644 --- a/apps/spreadsheeteditor/main/app/model/Formula.js +++ b/apps/spreadsheeteditor/main/app/model/Formula.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Formula.js * diff --git a/apps/spreadsheeteditor/main/app/model/ShapeGroup.js b/apps/spreadsheeteditor/main/app/model/ShapeGroup.js index fd2d9deeb..7a333c432 100644 --- a/apps/spreadsheeteditor/main/app/model/ShapeGroup.js +++ b/apps/spreadsheeteditor/main/app/model/ShapeGroup.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeGroup.js * diff --git a/apps/spreadsheeteditor/main/app/model/TableTemplate.js b/apps/spreadsheeteditor/main/app/model/TableTemplate.js index 6b29bd4ad..d132811c0 100644 --- a/apps/spreadsheeteditor/main/app/model/TableTemplate.js +++ b/apps/spreadsheeteditor/main/app/model/TableTemplate.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableTemplate.js * diff --git a/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template b/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template index b6a5f2137..5c680a54c 100644 --- a/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template @@ -1,19 +1,22 @@ + + + ', '', '','', + '', + '', + '', + '','', '', '', '
    - +
    -
    		-
    + +
    diff --git a/apps/spreadsheeteditor/main/app/template/PrintSettings.template b/apps/spreadsheeteditor/main/app/template/PrintSettings.template index 921fe9a71..003224ded 100644 --- a/apps/spreadsheeteditor/main/app/template/PrintSettings.template +++ b/apps/spreadsheeteditor/main/app/template/PrintSettings.template @@ -1,19 +1,20 @@
    -
    -
    -
    +
    +
    +
    +
    -
    -
    +
    + +
    -
    @@ -21,7 +22,7 @@ - + @@ -34,12 +35,7 @@
    -
    - - - - - +
    diff --git a/apps/spreadsheeteditor/main/app/template/RightMenu.template b/apps/spreadsheeteditor/main/app/template/RightMenu.template index 826cbbc2e..5f2155562 100644 --- a/apps/spreadsheeteditor/main/app/template/RightMenu.template +++ b/apps/spreadsheeteditor/main/app/template/RightMenu.template @@ -1,5 +1,7 @@
    +
    +
    @@ -13,6 +15,7 @@
    + diff --git a/apps/spreadsheeteditor/main/app/template/TableSettings.template b/apps/spreadsheeteditor/main/app/template/TableSettings.template new file mode 100644 index 000000000..e48e86a7d --- /dev/null +++ b/apps/spreadsheeteditor/main/app/template/TableSettings.template @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    +
    +     		+
    +
    +
    +     		+
    +
    +
    +     		+
    +
    +
    +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 653201633..0553bdad6 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -283,7 +283,7 @@
    -
    +
    diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index c97a282f6..b59e1344d 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * AutoFilterDialog.js * @@ -9,7 +41,8 @@ */ define([ - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/component/ColorPaletteExt' ], function () { 'use strict'; @@ -34,29 +67,22 @@ define([ this.template = options.template || [ '
    ', '
    ', - - '', - - '
    ', - '
    ', - '
    ', - '
    ', - - '
    ', - '
    ', - '
    ', - '
    ', - - '
    ', - '
    ', - '
    ', - '
    ', - + '', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', '
    ', '
    ', - '
    ', - '
    ', '', '', @@ -65,6 +91,7 @@ define([ this.api = options.api; this.handler = options.handler; + this.type = options.type || 'number'; _options.tpl = _.template(this.template, _options); @@ -72,38 +99,40 @@ define([ }, render: function () { Common.UI.Window.prototype.render.call(this); - - var conditions = [ - {value: c_oAscCustomAutoFilter.equals, displayValue: this.capCondition1}, - {value: c_oAscCustomAutoFilter.doesNotEqual, displayValue: this.capCondition2}, - {value: c_oAscCustomAutoFilter.isGreaterThan, displayValue: this.capCondition3}, - {value: c_oAscCustomAutoFilter.isGreaterThanOrEqualTo, displayValue: this.capCondition4}, - {value: c_oAscCustomAutoFilter.isLessThan, displayValue: this.capCondition5}, - {value: c_oAscCustomAutoFilter.isLessThanOrEqualTo, displayValue: this.capCondition6}, - {value: c_oAscCustomAutoFilter.beginsWith, displayValue: this.capCondition7}, - {value: c_oAscCustomAutoFilter.doesNotBeginWith, displayValue: this.capCondition8}, - {value: c_oAscCustomAutoFilter.endsWith, displayValue: this.capCondition9}, - {value: c_oAscCustomAutoFilter.doesNotEndWith, displayValue: this.capCondition10}, - {value: c_oAscCustomAutoFilter.contains, displayValue: this.capCondition11}, - {value: c_oAscCustomAutoFilter.doesNotContain, displayValue: this.capCondition12} + + this.conditions = [ + {value: Asc.c_oAscCustomAutoFilter.equals, displayValue: this.capCondition1}, + {value: Asc.c_oAscCustomAutoFilter.doesNotEqual, displayValue: this.capCondition2}, + {value: Asc.c_oAscCustomAutoFilter.isGreaterThan, displayValue: this.capCondition3}, + {value: Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo, displayValue: this.capCondition4}, + {value: Asc.c_oAscCustomAutoFilter.isLessThan, displayValue: this.capCondition5}, + {value: Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo, displayValue: this.capCondition6} ]; + if (this.type=='text') this.conditions = this.conditions.concat([ + {value: Asc.c_oAscCustomAutoFilter.beginsWith, displayValue: this.capCondition7}, + {value: Asc.c_oAscCustomAutoFilter.doesNotBeginWith, displayValue: this.capCondition8}, + {value: Asc.c_oAscCustomAutoFilter.endsWith, displayValue: this.capCondition9}, + {value: Asc.c_oAscCustomAutoFilter.doesNotEndWith, displayValue: this.capCondition10}, + {value: Asc.c_oAscCustomAutoFilter.contains, displayValue: this.capCondition11}, + {value: Asc.c_oAscCustomAutoFilter.doesNotContain, displayValue: this.capCondition12} + ]); this.cmbCondition1 = new Common.UI.ComboBox({ el : $('#id-search-begin-digital-combo', this.$window), menuStyle : 'min-width: 225px;', cls : 'input-group-nr', - data : conditions, + data : this.conditions, editable : false }); - this.cmbCondition1.setValue(c_oAscCustomAutoFilter.equals); + this.cmbCondition1.setValue(Asc.c_oAscCustomAutoFilter.equals); - conditions.splice(0, 0, {value: 0, displayValue: this.textNoFilter}); + this.conditions.splice(0, 0, {value: 0, displayValue: this.textNoFilter}); this.cmbCondition2 = new Common.UI.ComboBox({ el : $('#id-search-end-digital-combo', this.$window), menuStyle : 'min-width: 225px;', cls : 'input-group-nr', - data : conditions, + data : this.conditions, editable : false }); this.cmbCondition2.setValue(0); @@ -195,13 +224,13 @@ define([ this.cmbCondition1 && this.cmbCondition2 && this.txtValue1 && this.txtValue2) { var filterObj = this.properties.asc_getFilterObj(); - if (filterObj.asc_getType() == c_oAscAutoFilterTypes.CustomFilters) { + if (filterObj.asc_getType() == Asc.c_oAscAutoFilterTypes.CustomFilters) { var customFilter = filterObj.asc_getFilter(), customFilters = customFilter.asc_getCustomFilters(); (customFilter.asc_getAnd()) ? this.rbAnd.setValue(true) : this.rbOr.setValue(true); - this.cmbCondition1.setValue(customFilters[0].asc_getOperator() || c_oAscCustomAutoFilter.equals); + this.cmbCondition1.setValue(customFilters[0].asc_getOperator() || Asc.c_oAscCustomAutoFilter.equals); this.cmbCondition2.setValue((customFilters.length>1) ? (customFilters[1].asc_getOperator() || 0) : 0); this.txtValue1.setValue(null === customFilters[0].asc_getVal() ? '' : customFilters[0].asc_getVal()); @@ -215,7 +244,7 @@ define([ var filterObj = this.properties.asc_getFilterObj(); filterObj.asc_setFilter(new Asc.CustomFilters()); - filterObj.asc_setType(c_oAscAutoFilterTypes.CustomFilters); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.CustomFilters); var customFilter = filterObj.asc_getFilter(); customFilter.asc_setCustomFilters((this.cmbCondition2.getValue() == 0) ? [new Asc.CustomFilter()] : [new Asc.CustomFilter(), new Asc.CustomFilter()]); @@ -230,7 +259,7 @@ define([ customFilters[1].asc_setVal(this.txtValue2.getValue()); } - this.api.asc_applyAutoFilter('digitalFilter', this.properties); + this.api.asc_applyAutoFilter(this.properties); } }, @@ -263,15 +292,15 @@ define([ }, SSE.Views.DigitalFilterDialog || {})); - SSE.Views.AutoFilterDialog = Common.UI.Window.extend(_.extend({ + SSE.Views.Top10FilterDialog = Common.UI.Window.extend(_.extend({ initialize: function (options) { var t = this, _options = {}; - _.extend(_options, { - width : 270, - height : 450, - contentWidth : 400, + _.extend(_options, { + width : 318, + height : 160, + contentWidth : 180, header : true, cls : 'filter-dlg', contentTemplate : '', @@ -281,31 +310,204 @@ define([ this.template = options.template || [ '
    ', - '
    ', - '
    ', - '
    ', - '
    ', - '
    ', - '', - '', - '
    ', - '
    ', - '
    ', + '
    ', + '
    ', + '', + '
    ', + '
    ', + '
    ', + '', + '
    ', + '
    ', + '
    ', + '', + '
    ', '
    ', '
    ', '
    ', - '
    ', + '
    ', '
    ', - '
    ', + '', '', '
    ' ].join(''); + this.api = options.api; + this.handler = options.handler; + + _options.tpl = _.template(this.template, _options); + + Common.UI.Window.prototype.initialize.call(this, _options); + }, + render: function () { + Common.UI.Window.prototype.render.call(this); + + this.cmbType = new Common.UI.ComboBox({ + el : $('#id-top10-type-combo', this.$window), + style : 'width: 85px;', + menuStyle : 'min-width: 85px;', + cls : 'input-group-nr', + data : [ + { value: true, displayValue: this.txtTop }, + { value: false, displayValue: this.txtBottom } + ], + editable : false + }); + this.cmbType.setValue(true); + + this.cmbItem = new Common.UI.ComboBox({ + el : $('#id-top10-item-combo', this.$window), + style : 'width: 85px;', + menuStyle : 'min-width: 85px;', + cls : 'input-group-nr', + data : [ + { value: false, displayValue: this.txtItems }, + { value: true, displayValue: this.txtPercent } + ], + editable : false + }); + this.cmbItem.setValue(false); + this.cmbItem.on('selected', _.bind(function(combo, record) { + this.spnCount.setDefaultUnit(record.value ? '%' : ''); + }, this)); + + this.spnCount = new Common.UI.MetricSpinner({ + el: $('#id-top10-count-spin'), + step: 1, + width: 85, + defaultUnit : "", + value: '10', + maxValue: 500, + minValue: 1 + }); + + this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + + this.loadDefaults(); + }, + show: function () { + Common.UI.Window.prototype.show.call(this); + + var me = this; + _.defer(function () { + if (me.txtValue1) { + me.txtValue1.focus(); + } + }, 500); + }, + + close: function () { + if (this.api) { + this.api.asc_enableKeyEvents(true); + } + Common.UI.Window.prototype.close.call(this); + }, + + onBtnClick: function (event) { + if (event.currentTarget.attributes && event.currentTarget.attributes.result) { + if ('ok' === event.currentTarget.attributes.result.value) { + this.save(); + } + + this.close(); + } + }, + + setSettings: function (properties) { + this.properties = properties; + }, + + loadDefaults: function () { + if (this.properties) { + var filterObj = this.properties.asc_getFilterObj(); + if (filterObj.asc_getType() == Asc.c_oAscAutoFilterTypes.Top10) { + var top10Filter = filterObj.asc_getFilter(), + type = top10Filter.asc_getTop(), + percent = top10Filter.asc_getPercent(); + + this.cmbType.setValue(type || type===null); + this.cmbItem.setValue(percent || percent===null); + this.spnCount.setDefaultUnit((percent || percent===null) ? '%' : ''); + this.spnCount.setValue(top10Filter.asc_getVal()); + } + } + }, + save: function () { + if (this.api && this.properties) { + + var filterObj = this.properties.asc_getFilterObj(); + filterObj.asc_setFilter(new Asc.Top10()); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.Top10); + + var top10Filter = filterObj.asc_getFilter(); + top10Filter.asc_setTop(this.cmbType.getValue()); + top10Filter.asc_setPercent(this.cmbItem.getValue()); + top10Filter.asc_setVal(this.spnCount.getNumberValue()); + + this.api.asc_applyAutoFilter(this.properties); + } + }, + + onPrimary: function() { + this.save(); + this.close(); + return false; + }, + + cancelButtonText : "Cancel", + okButtonText : 'OK', + txtTitle : "Top 10 AutoFilter", + textType : 'Show', + txtTop : 'Top', + txtBottom : 'Bottom', + txtItems : 'Item', + txtPercent : 'Percent' + + }, SSE.Views.Top10FilterDialog || {})); + + SSE.Views.AutoFilterDialog = Common.UI.Window.extend(_.extend({ + + initialize: function (options) { + var t = this, _options = {}; + + _.extend(_options, { + width : 423, + height : 265, + contentWidth : 400, + header : false, + cls : 'filter-dlg', + contentTemplate : '', + title : t.txtTitle, + modal : false, + animate : false, + items : [] + }, options); + + this.template = options.template || [ + '
    ', + '
    ', + '
    ', + '', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '', + '
    ', + '
    ', + '
    ', + '
    ', + '', + '
    ', + '
    ' + ].join(''); + this.api = options.api; this.handler = options.handler; - this.throughIndexes = []; + this.throughIndexes = []; + this.filteredIndexes = []; _options.tpl = _.template(this.template, _options); @@ -332,45 +534,190 @@ define([ this.btnOk.on('click', _.bind(this.onApplyFilter, this)); } - this.btnSortDown = new Common.UI.Button({ - cls: 'btn-toolbar border', - iconCls: 'btn-icon btn-sort-down', - pressed : true, - enableToggle: true, - allowDepress: false + this.miSortLow2High = new Common.UI.MenuItem({ + caption : this.txtSortLow2High, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false }); - if (this.btnSortDown) { - this.btnSortDown.render($('#id-btn-sort-down', this.$window)); - this.btnSortDown.on('click', _.bind(this.onSortType, this, 'ascending')); + this.miSortLow2High.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending)); + + this.miSortHigh2Low = new Common.UI.MenuItem({ + caption : this.txtSortHigh2Low, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false + }); + this.miSortHigh2Low.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Descending)); + + this.miSortCellColor = new Common.UI.MenuItem({ + caption : this.txtSortCellColor, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
    ') } + ] + }) + }); + + this.miSortFontColor = new Common.UI.MenuItem({ + caption : this.txtSortFontColor, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
    ') } + ] + }) + }); + + this.miNumFilter = new Common.UI.MenuItem({ + caption : this.txtNumFilter, + toggleGroup : 'menufilterfilter', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + menuAlign: 'tl-tr', + items: [ + {value: Asc.c_oAscCustomAutoFilter.equals, caption: this.txtEquals, checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: Asc.c_oAscCustomAutoFilter.doesNotEqual, caption: this.txtNotEquals, checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: Asc.c_oAscCustomAutoFilter.isGreaterThan, caption: this.txtGreater, checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo, caption: this.txtGreaterEquals,checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: Asc.c_oAscCustomAutoFilter.isLessThan, caption: this.txtLess, checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo, caption: this.txtLessEquals, checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: -2, caption: this.txtBetween, checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters}, + {value: Asc.c_oAscCustomAutoFilter.top10, caption: this.txtTop10, checkable: true, type: Asc.c_oAscAutoFilterTypes.Top10}, + {value: Asc.c_oAscDynamicAutoFilter.aboveAverage, caption: this.txtAboveAve, checkable: true, type: Asc.c_oAscAutoFilterTypes.DynamicFilter}, + {value: Asc.c_oAscDynamicAutoFilter.belowAverage, caption: this.txtBelowAve, checkable: true, type: Asc.c_oAscAutoFilterTypes.DynamicFilter}, + {value: -1, caption: this.btnCustomFilter + '...', checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters} + ] + }) + }); + var items = this.miNumFilter.menu.items; + for (var i=0; i
    ') } + ] + }) }); - if (this.btnSortUp) { - this.btnSortUp.render($('#id-btn-sort-up', this.$window)); - this.btnSortUp.on('click', _.bind(this.onSortType, this, 'descending')); - } - - this.chCustomFilter = new Common.UI.CheckBox({ - el: $('#id-checkbox-custom-filter', this.$window) + this.miFilterFontColor = new Common.UI.MenuItem({ + caption : this.txtFilterFontColor, + toggleGroup : 'menufilterfilter', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
    ') } + ] + }) }); - this.chCustomFilter.setDisabled(true); - this.btnCustomFilter = new Common.UI.Button({ - el : $('#id-btn-custom-filter', this.$window) - }).on('click', _.bind(this.onShowCustomFilterDialog, this)); + this.miClear = new Common.UI.MenuItem({ + caption : this.txtClear, + checkable : false + }); + this.miClear.on('click', _.bind(this.onClear, this)); + + this.miReapply = new Common.UI.MenuItem({ + caption : this.txtReapply, + checkable : false + }); + this.miReapply.on('click', _.bind(this.onReapply, this)); + + this.filtersMenu = new Common.UI.Menu({ + items: [ + this.miSortLow2High, + this.miSortHigh2Low, + this.miSortCellColor, + this.miSortFontColor, + {caption : '--'}, + this.miNumFilter, + this.miTextFilter, + this.miFilterCellColor, + this.miFilterFontColor, + this.miClear, + {caption : '--'}, + this.miReapply + ] + }); + + // Prepare menu container + var menuContainer = this.$window.find('#menu-container-filters'); + this.filtersMenu.render(menuContainer); + this.filtersMenu.cmpEl.attr({tabindex: "-1"}); + + this.mnuSortColorCellsPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-sort-cells-color'), + colors: [] + }); + this.mnuSortColorCellsPicker.on('select', _.bind(this.onSortColorSelect, this, Asc.c_oAscSortOptions.ByColorFill)); + + this.mnuSortColorFontPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-sort-font-color'), + colors: [] + }); + this.mnuSortColorFontPicker.on('select', _.bind(this.onSortColorSelect, this, Asc.c_oAscSortOptions.ByColorFont)); + + this.mnuFilterColorCellsPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-filter-cells-color'), + colors: [] + }); + this.mnuFilterColorCellsPicker.on('select', _.bind(this.onFilterColorSelect, this, true)); + + this.mnuFilterColorFontPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-filter-font-color'), + colors: [] + }); + this.mnuFilterColorFontPicker.on('select', _.bind(this.onFilterColorSelect, this, false)); this.input = new Common.UI.InputField({ el : $('#id-sd-cell-search', this.$window), allowBlank : true, placeHolder : this.txtEmpty, - style : 'margin-top: 10px;', validateOnChange : true, validation : function () { return true; } }).on ('changing', function (input, value) { @@ -407,6 +754,8 @@ define([ this.cellsList.store.comparator = function(item1, item2) { if ('0' == item1.get('groupid')) return -1; if ('0' == item2.get('groupid')) return 1; + if ('2' == item1.get('groupid')) return -1; + if ('2' == item2.get('groupid')) return 1; var n1 = item1.get('intval'), n2 = item2.get('intval'), @@ -421,11 +770,24 @@ define([ this.cellsList.onKeyDown = _.bind(this.onListKeyDown, this); } - this.setupListCells(); + this.setupDataCells(); + this._setDefaults(); + + var checkDocumentClick = function(e) { + if (me._skipCheckDocumentClick) return; + if ($(e.target).closest('.filter-dlg').length<=0) + me.close(); + }; + this.on('close',function() { + $(document.body).off('mousedown', checkDocumentClick); + }); + _.delay(function () { + $(document.body).on('mousedown', checkDocumentClick); + }, 100, this); }, - show: function () { - Common.UI.Window.prototype.show.call(this); + show: function (x, y) { + Common.UI.Window.prototype.show.call(this, x, y); var me = this; if (this.input) { @@ -448,6 +810,7 @@ define([ this.close(); } }, + onSortType: function (type) { if (this.api && this.configTo) { this.api.asc_sortColFilter(type, this.configTo.asc_getCellId(), this.configTo.asc_getDisplayName()); @@ -455,9 +818,46 @@ define([ this.close(); }, - onShowCustomFilterDialog: function () { + + onNumCustomFilterItemClick: function(item) { + var filterObj = this.configTo.asc_getFilterObj(), + value1 = '', value2 = '', + cond1 = Asc.c_oAscCustomAutoFilter.equals, + cond2 = 0, isAnd = true; + if (filterObj.asc_getType() == Asc.c_oAscAutoFilterTypes.CustomFilters) { + var customFilter = filterObj.asc_getFilter(), + customFilters = customFilter.asc_getCustomFilters(); + + isAnd = (customFilter.asc_getAnd()); + cond1 = customFilters[0].asc_getOperator(); + cond2 = ((customFilters.length>1) ? (customFilters[1].asc_getOperator() || 0) : 0); + + value1 = (null === customFilters[0].asc_getVal() ? '' : customFilters[0].asc_getVal()); + value2 = ((customFilters.length>1) ? (null === customFilters[1].asc_getVal() ? '' : customFilters[1].asc_getVal()) : ''); + } + + if (item.value!==-1) { + var newCustomFilter = new Asc.CustomFilters(); + newCustomFilter.asc_setCustomFilters((item.value == -2) ? [new Asc.CustomFilter(), new Asc.CustomFilter()]: [new Asc.CustomFilter()]); + + var newCustomFilters = newCustomFilter.asc_getCustomFilters(); + newCustomFilter.asc_setAnd(true); + newCustomFilters[0].asc_setOperator((item.value == -2) ? Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo : item.value); + + if (item.value == -2) { + newCustomFilters[0].asc_setVal((cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo) ? value1 : ''); + newCustomFilters[1].asc_setOperator(Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo); + newCustomFilters[1].asc_setVal((cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo) ? value2 : ''); + } else { + newCustomFilters[0].asc_setVal((item.value == cond1) ? value1 : ''); + } + + filterObj.asc_setFilter(newCustomFilter); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.CustomFilters); + } + var me = this, - dlgDigitalFilter = new SSE.Views.DigitalFilterDialog({api:this.api}).on({ + dlgDigitalFilter = new SSE.Views.DigitalFilterDialog({api:this.api, type: 'number'}).on({ 'close': function() { me.close(); } @@ -468,6 +868,101 @@ define([ dlgDigitalFilter.setSettings(this.configTo); dlgDigitalFilter.show(); }, + + onTextFilterMenuClick: function(menu, item) { + var filterObj = this.configTo.asc_getFilterObj(), + value1 = '', value2 = '', + cond1 = Asc.c_oAscCustomAutoFilter.equals, + cond2 = 0, isAnd = true; + if (filterObj.asc_getType() == Asc.c_oAscAutoFilterTypes.CustomFilters) { + var customFilter = filterObj.asc_getFilter(), + customFilters = customFilter.asc_getCustomFilters(); + + isAnd = (customFilter.asc_getAnd()); + cond1 = customFilters[0].asc_getOperator(); + cond2 = ((customFilters.length>1) ? (customFilters[1].asc_getOperator() || 0) : 0); + + value1 = (null === customFilters[0].asc_getVal() ? '' : customFilters[0].asc_getVal()); + value2 = ((customFilters.length>1) ? (null === customFilters[1].asc_getVal() ? '' : customFilters[1].asc_getVal()) : ''); + } + + if (item.value!==-1) { + var newCustomFilter = new Asc.CustomFilters(); + newCustomFilter.asc_setCustomFilters([new Asc.CustomFilter()]); + + var newCustomFilters = newCustomFilter.asc_getCustomFilters(); + newCustomFilter.asc_setAnd(true); + newCustomFilters[0].asc_setOperator(item.value); + newCustomFilters[0].asc_setVal((item.value == cond1) ? value1 : ''); + + filterObj.asc_setFilter(newCustomFilter); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.CustomFilters); + } + + var me = this, + dlgDigitalFilter = new SSE.Views.DigitalFilterDialog({api:this.api, type: 'text'}).on({ + 'close': function() { + me.close(); + } + }); + + this.close(); + + dlgDigitalFilter.setSettings(this.configTo); + dlgDigitalFilter.show(); + }, + + onNumDynamicFilterItemClick: function(item) { + var filterObj = this.configTo.asc_getFilterObj(); + + if (filterObj.asc_getType() !== Asc.c_oAscAutoFilterTypes.DynamicFilter) { + filterObj.asc_setFilter(new Asc.DynamicFilter()); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.DynamicFilter); + } + + filterObj.asc_getFilter().asc_setType(item.value); + this.api.asc_applyAutoFilter(this.configTo); + + this.close(); + }, + + onTop10FilterItemClick: function(menu, item) { + var me = this, + dlgTop10Filter = new SSE.Views.Top10FilterDialog({api:this.api}).on({ + 'close': function() { + me.close(); + } + }); + this.close(); + + dlgTop10Filter.setSettings(this.configTo); + dlgTop10Filter.show(); + }, + + onFilterColorSelect: function(isCellColor, picker, color) { + var filterObj = this.configTo.asc_getFilterObj(); + if (filterObj.asc_getType() !== Asc.c_oAscAutoFilterTypes.ColorFilter) { + filterObj.asc_setFilter(new Asc.ColorFilter()); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.ColorFilter); + } + + var colorFilter = filterObj.asc_getFilter(); + colorFilter.asc_setCellColor(isCellColor ? null : false); + colorFilter.asc_setCColor((isCellColor && color == 'transparent' || !isCellColor && color == '#000000') ? null : Common.Utils.ThemeColor.getRgbColor(color)); + + this.api.asc_applyAutoFilter(this.configTo); + + this.close(); + }, + + onSortColorSelect: function(type, picker, color) { + if (this.api && this.configTo) { + var isCellColor = (type == Asc.c_oAscSortOptions.ByColorFill); + this.api.asc_sortColFilter(type, this.configTo.asc_getCellId(), this.configTo.asc_getDisplayName(), (isCellColor && color == 'transparent' || !isCellColor && color == '#000000') ? null : Common.Utils.ThemeColor.getRgbColor(color)); + } + this.close(); + }, + onCellCheck: function (listView, itemView, record) { if (this.checkCellTrigerBlock) return; @@ -517,113 +1012,156 @@ define([ if (record && listView) { listView.isSuspendEvents = true; - var check = !record.get('check'); - if ('1' !== record.get('groupid')) { - var arr = this.configTo.asc_getValues(); + var check = !record.get('check'), + me = this, + idxs = (me.filter) ? me.filteredIndexes : me.throughIndexes; + if ('0' == record.get('groupid')) { this.cells.each(function(cell) { - cell.set('check', check); - if (cell.get('throughIndex')>0) - arr[parseInt(cell.get('throughIndex'))-1].asc_setVisible(check); + if ('2' !== cell.get('groupid')) { + cell.set('check', check); + if (cell.get('throughIndex')>1) + idxs[parseInt(cell.get('throughIndex'))] = check; + } }); } else { record.set('check', check); - this.configTo.asc_getValues()[parseInt(record.get('throughIndex'))-1].asc_setVisible(check); + idxs[parseInt(record.get('throughIndex'))] = check; } this.btnOk.setDisabled(false); - this.chCustomFilter.setValue(false); - this.configTo.asc_getFilterObj().asc_setType(c_oAscAutoFilterTypes.Filters); + this.configTo.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters); listView.isSuspendEvents = false; listView.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); } }, + onClear: function() { + if (this.api && this.configTo) + this.api.asc_clearFilterColumn(this.configTo.asc_getCellId(), this.configTo.asc_getDisplayName()); + this.close(); + }, + + onReapply: function() { + if (this.api && this.configTo) + this.api.asc_reapplyAutoFilter(this.config.asc_getDisplayName()); + this.close(); + }, + setSettings: function (config) { this.config = config; this.configTo = config; }, - setupListCells: function () { - // TODO: рефакторинг, использовать setupDataCells(); + _setDefaults: function() { + this.initialFilterType = this.configTo.asc_getFilterObj().asc_getType(); - function isNumeric(value) { - return !isNaN(parseFloat(value)) && isFinite(value); + var filterObj = this.configTo.asc_getFilterObj(), + isCustomFilter = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.CustomFilters), + isDynamicFilter = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.DynamicFilter), + isTop10 = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.Top10), + isTextFilter = this.configTo.asc_getIsTextFilter(), + colorsFill = this.configTo.asc_getColorsFill(), + colorsFont = this.configTo.asc_getColorsFont(), + sort = this.configTo.asc_getSortState(), + sortColor = this.configTo.asc_getSortColor(); + + if (sortColor) sortColor = Common.Utils.ThemeColor.getHexColor(sortColor.get_r(), sortColor.get_g(), sortColor.get_b()).toLocaleUpperCase(); + + this.miTextFilter.setVisible(isTextFilter); + this.miNumFilter.setVisible(!isTextFilter); + this.miTextFilter.setChecked(isCustomFilter && isTextFilter, true); + this.miNumFilter.setChecked((isCustomFilter || isDynamicFilter || isTop10) && !isTextFilter, true); + + this.miSortLow2High.setChecked(sort == Asc.c_oAscSortOptions.Ascending, true); + this.miSortHigh2Low.setChecked(sort == Asc.c_oAscSortOptions.Descending, true); + + var hasColors = (colorsFont && colorsFont.length>0); + this.miSortFontColor.setVisible(hasColors); + this.miFilterFontColor.setVisible(hasColors); + if (hasColors) { + var colors = []; + colorsFont.forEach(function(item, index) { + if (item) + colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); + else + colors.push('000000'); + }); + this.mnuSortColorFontPicker.updateColors(colors); + this.mnuFilterColorFontPicker.updateColors(colors); + + this.miFilterFontColor.setChecked(false, true); + this.miSortFontColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFont, true); + if (sort == Asc.c_oAscSortOptions.ByColorFont) + this.mnuSortColorFontPicker.select((sortColor) ? sortColor : '000000', true); } - var me = this, isnumber, value, index = 0, haveUnselectedCell = false, - throughIndex = 1, - isCustomFilter = (this.configTo.asc_getFilterObj().asc_getType() === c_oAscAutoFilterTypes.CustomFilters); + hasColors = (colorsFill && colorsFill.length>0); + this.miSortCellColor.setVisible(hasColors); + this.miFilterCellColor.setVisible(hasColors); + if (hasColors) { + var colors = []; + colorsFill.forEach(function(item, index) { + if (item) + colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); + else + colors.push('transparent'); + }); + this.mnuSortColorCellsPicker.updateColors(colors); + this.mnuFilterColorCellsPicker.updateColors(colors); - if (_.isUndefined(this.config)) { - return; + this.miFilterCellColor.setChecked(false, true); + this.miSortCellColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFill, true); + if (sort == Asc.c_oAscSortOptions.ByColorFill) + this.mnuSortColorCellsPicker.select((sortColor) ? sortColor : 'transparent', true); } - this.filterExcludeCells.reset(); - var arr = []; - arr.push(new Common.UI.DataViewModel({ - id : ++index, - selected : false, - allowSelected : true, - value : this.textSelectAll, - groupid : '0', - check : true, - throughIndex : 0 - })); - this.throughIndexes.push(true); + if (isCustomFilter) { + var customFilter = filterObj.asc_getFilter(), + customFilters = customFilter.asc_getCustomFilters(), + isAnd = (customFilter.asc_getAnd()), + cond1 = customFilters[0].asc_getOperator(), + cond2 = ((customFilters.length>1) ? (customFilters[1].asc_getOperator() || 0) : 0), + items = (isTextFilter) ? this.miTextFilter.menu.items : this.miNumFilter.menu.items, + isCustomConditions = true; - this.config.asc_getValues().forEach(function (item) { - value = item.asc_getText(); - isnumber = isNumeric(value); - - arr.push(new Common.UI.DataViewModel({ - id : ++index, - selected : false, - allowSelected : true, - cellvalue : value, - value : isnumber ? value : (value.length > 0 ? value: me.textEmptyItem), - intval : isnumber ? parseFloat(value) : undefined, - strval : !isnumber ? value : '', - groupid : '1', - check : item.asc_getVisible(), - throughIndex : throughIndex - })); - - if (!item.asc_getVisible()) { - haveUnselectedCell = true; - } - - me.throughIndexes.push(item.asc_getVisible()); - - ++throughIndex; - }); - - me.cells.reset(arr); - - this.checkCellTrigerBlock = true; - this.cells.at(0).set('check', !haveUnselectedCell); - this.checkCellTrigerBlock = undefined; - - this.btnSortDown.toggle(false, false); - this.btnSortUp.toggle(false, false); - - //TODO: установка всех значений для UI в отдельный метод - - var sort = this.config.asc_getSortState(); - if (sort) { - if ('ascending' === sort) { - this.btnSortDown.toggle(true, false); - } else { - this.btnSortUp.toggle(true, false); + if (customFilters.length==1) + items.forEach(function(item){ + var checked = (item.options.type == Asc.c_oAscAutoFilterTypes.CustomFilters) && (item.value == cond1); + item.setChecked(checked, true); + if (checked) isCustomConditions = false; + }); + else if (!isTextFilter && (cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo || + cond1 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo)){ + items[7].setChecked(true, true); // between filter + isCustomConditions = false; } + if (isCustomConditions) + items[items.length-1].setChecked(true, true); + } else if (this.initialFilterType === Asc.c_oAscAutoFilterTypes.ColorFilter) { + var colorFilter = filterObj.asc_getFilter(), + filterColor = colorFilter.asc_getCColor(); + if (filterColor) + filterColor = Common.Utils.ThemeColor.getHexColor(filterColor.get_r(), filterColor.get_g(), filterColor.get_b()).toLocaleUpperCase(); + if ( colorFilter.asc_getCellColor()===null ) { // cell color + this.miFilterCellColor.setChecked(true, true); + this.mnuFilterColorCellsPicker.select((filterColor) ? filterColor : 'transparent', true); + } else if (colorFilter.asc_getCellColor()===false) { // font color + this.miFilterFontColor.setChecked(true, true); + this.mnuFilterColorFontPicker.select((filterColor) ? filterColor : '000000', true); + } + } else if (isDynamicFilter || isTop10) { + var dynType = (isDynamicFilter) ? filterObj.asc_getFilter().asc_getType() : null, + items = this.miNumFilter.menu.items; + items.forEach(function(item){ + item.setChecked(isDynamicFilter && (item.options.type == Asc.c_oAscAutoFilterTypes.DynamicFilter) && (item.value == dynType) || + isTop10 && (item.options.type == Asc.c_oAscAutoFilterTypes.Top10), true); + }); } - this.chCustomFilter.setValue(isCustomFilter); - this.btnOk.setDisabled(isCustomFilter); - - this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); - - this.config = undefined; + this.miClear.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None); + this.miReapply.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None); + this.btnOk.setDisabled(this.initialFilterType !== Asc.c_oAscAutoFilterTypes.Filters && this.initialFilterType !== Asc.c_oAscAutoFilterTypes.None); }, setupDataCells: function() { @@ -632,31 +1170,12 @@ define([ } var me = this, - isnumber, - value, - index = 0, + isnumber, value, + index = 0, throughIndex = 2, applyfilter = true, - throughIndex = 1; - - this.cells.forEach(function (item) { - value = item.get('check'); - if (_.isUndefined(value)) value = false; - me.throughIndexes[parseInt(item.get('throughIndex'))] = item.get('check'); - }); - - var arr = [], arrEx = []; - - if (!me.filter) { - arr.push(new Common.UI.DataViewModel({ - id : ++index, - selected : false, - allowSelected : true, - value : this.textSelectAll, - groupid : '0', - check : me.throughIndexes[0], - throughIndex : 0 - })); - } + haveUnselectedCell = false, + arr = [], arrEx = [], + idxs = (me.filter) ? me.filteredIndexes : me.throughIndexes; this.configTo.asc_getValues().forEach(function (item) { value = item.asc_getText(); @@ -667,7 +1186,9 @@ define([ if (null === value.match(me.filter)) { applyfilter = false; } - } + idxs[throughIndex] = applyfilter; + } else if (idxs[throughIndex]==undefined) + idxs[throughIndex] = item.asc_getVisible(); if (applyfilter) { arr.push(new Common.UI.DataViewModel({ @@ -679,9 +1200,12 @@ define([ intval : isnumber ? parseFloat(value) : undefined, strval : !isnumber ? value : '', groupid : '1', - check : me.throughIndexes[throughIndex], + check : idxs[throughIndex], throughIndex : throughIndex })); + if (!idxs[throughIndex]) { + haveUnselectedCell = true; + } } else { arrEx.push(new Common.UI.DataViewModel({ cellvalue : value @@ -690,13 +1214,42 @@ define([ ++throughIndex; }); + + if (me.filter || idxs[0]==undefined) + idxs[0] = true; + if (!me.filter || arr.length>0) + arr.unshift(new Common.UI.DataViewModel({ + id : ++index, + selected : false, + allowSelected : true, + value : (me.filter) ? this.textSelectAllResults : this.textSelectAll, + groupid : '0', + check : idxs[0], + throughIndex : 0 + })); + if (me.filter && arr.length>1) { + if (idxs[1]==undefined) + idxs[1] = false; + arr.splice(1, 0, new Common.UI.DataViewModel({ + id : ++index, + selected : false, + allowSelected : true, + value : this.textAddSelection, + groupid : '2', + check : idxs[1], + throughIndex : 1 + })); + } + this.cells.reset(arr); this.filterExcludeCells.reset(arrEx); if (this.cells.length) { - this.chCustomFilter.setValue(this.configTo.asc_getFilterObj().asc_getType() === c_oAscAutoFilterTypes.CustomFilters); + this.checkCellTrigerBlock = true; + this.cells.at(0).set('check', !haveUnselectedCell); + this.checkCellTrigerBlock = undefined; } - + this.btnOk.setDisabled(this.cells.length<1); this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); }, @@ -704,19 +1257,23 @@ define([ var me = this, isValid= false; if (this.cells) { - this.cells.forEach(function(item){ - if ('1' === item.get('groupid')) { - if (item.get('check')) { + if (this.filter && this.filteredIndexes[1]) + isValid = true; + else + this.cells.forEach(function(item){ + if ('1' == item.get('groupid') && item.get('check')) { isValid = true; + return true; } - } - }); + }); } if (!isValid) { + me._skipCheckDocumentClick = true; Common.UI.warning({title: this.textWarning, msg: this.warnNoSelected, callback: function() { + me._skipCheckDocumentClick = false; _.delay(function () { me.input.$el.find('input').focus(); }, 100, this); @@ -727,8 +1284,38 @@ define([ return isValid; }, save: function () { - if (this.api && this.configTo && this.cells && this.filterExcludeCells) - this.api.asc_applyAutoFilter('mainFilter', this.configTo); + if (this.api && this.configTo && this.cells && this.filterExcludeCells) { + var arr = this.configTo.asc_getValues(), + isValid = false; + if (this.filter && this.filteredIndexes[1]) { + if (this.initialFilterType === Asc.c_oAscAutoFilterTypes.CustomFilters) { + arr.forEach(function(item, index) { + item.asc_setVisible(true); + }); + } + this.cells.each(function(cell) { + if ('1' == cell.get('groupid')) { + arr[parseInt(cell.get('throughIndex'))-2].asc_setVisible(cell.get('check')); + } + }); + arr.forEach(function(item, index) { + if (item.asc_getVisible()) { + isValid = true; + return true; + } + }); + } else { + var idxs = (this.filter) ? this.filteredIndexes : this.throughIndexes; + arr.forEach(function(item, index) { + item.asc_setVisible(idxs[index+2]); + }); + isValid = true; + } + if (isValid) { + this.configTo.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters); + this.api.asc_applyAutoFilter(this.configTo); + } + } }, onPrimary: function() { @@ -745,7 +1332,35 @@ define([ textWarning : 'Warning', cancelButtonText : 'Cancel', textEmptyItem : '{Blanks}', - txtEmpty : 'Enter cell\'s filter' + txtEmpty : 'Enter cell\'s filter', + txtSortLow2High : 'Sort Lowest to Highest', + txtSortHigh2Low : 'Sort Highest to Lowest', + txtSortCellColor : 'Sort by cells color', + txtSortFontColor : 'Sort by font color', + txtNumFilter : 'Number filter', + txtTextFilter : 'Text filter', + txtFilterCellColor : 'Filter by cells color', + txtFilterFontColor : 'Filter by font color', + txtClear : 'Clear', + txtReapply : 'Reapply', + txtEquals : "Equals...", + txtNotEquals : "Does not equal...", + txtGreater : "Greater than...", + txtGreaterEquals : "Greater than or equal to...", + txtLess : "Less than...", + txtLessEquals : "Less than or equal to...", + txtBetween : 'Between...', + txtTop10 : 'Top 10', + txtAboveAve : 'Above average', + txtBelowAve : 'Below average', + txtBegins : "Begins with...", + txtNotBegins : "Does not begin with...", + txtEnds : "Ends with...", + txtNotEnds : "Does not end with...", + txtContains : "Contains...", + txtNotContains : "Does not contain...", + textSelectAllResults: 'Select All Search Results', + textAddSelection : 'Add current selection to filter' }, SSE.Views.AutoFilterDialog || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/CellEditor.js b/apps/spreadsheeteditor/main/app/view/CellEditor.js index 84bcc2354..14761b5fc 100644 --- a/apps/spreadsheeteditor/main/app/view/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/view/CellEditor.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * CellEdit.js * diff --git a/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js b/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js index d9f78a1c7..232df0660 100644 --- a/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * CellRangeDialog.js * @@ -80,15 +112,15 @@ define([ if (settings.api) { me.api = settings.api; - me.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.Chart, settings.range ? settings.range : ''); + me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.Chart, settings.range ? settings.range : ''); me.api.asc_unregisterCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); me.api.asc_registerCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); - Common.NotificationCenter.trigger('cells:range', c_oAscSelectionDialogType.Chart); + Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.Chart); } me.inputRange.validation = function(value) { - var isvalid = me.api.asc_checkDataRange(c_oAscSelectionDialogType.Chart, value, false); - return (isvalid==c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true; + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, value, false); + return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true; }; }, @@ -108,8 +140,10 @@ define([ onClose: function(event) { if (this.api) - this.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.None); - Common.NotificationCenter.trigger('cells:range', c_oAscSelectionDialogType.None); + this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); + Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None); + + SSE.getController('RightMenu').SetDisabled(false); }, onKeyPress: function(event) { @@ -130,6 +164,11 @@ define([ this.close(); }, + show: function () { + Common.UI.Window.prototype.show.call(this); + SSE.getController('RightMenu').SetDisabled(true); + }, + txtTitle : 'Select Data Range', textCancel : 'Cancel', txtEmpty : 'This field is required', diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 1aa5e453d..923acfc3e 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ChartSettings.js * @@ -41,7 +73,8 @@ define([ ChartStyle: 1, ChartType: -1, SeveralCharts: false, - DisabledControls: false + DisabledControls: false, + keepRatio: false }; this._nRatio = 1; this.spinners = []; @@ -78,31 +111,31 @@ define([ { id: 'menu-chart-group-stock', caption: me.textStock } ]), store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} ]), itemTemplate: _.template('
    ') }); @@ -177,15 +210,15 @@ define([ this.btnRatio.render($('#chart-button-ratio')) ; this.lockedControls.push(this.btnRatio); - var value = Common.localStorage.getItem("sse-settings-chartratio"); - if (value!==null && parseInt(value) == 1) { - this.btnRatio.toggle(true); - } this.btnRatio.on('click', _.bind(function(btn, e) { if (btn.pressed && this.spnHeight.getNumberValue()>0) { this._nRatio = this.spnWidth.getNumberValue()/this.spnHeight.getNumberValue(); } - Common.localStorage.setItem("sse-settings-chartratio", (btn.pressed) ? 1 : 0); + if (this.api) { + var props = new Asc.asc_CImgProperty(); + props.asc_putLockAspect(btn.pressed); + this.api.asc_setGraphicObjectProps(props); + } }, this)); $(this.el).on('click', '#chart-advanced-link', _.bind(this.openAdvancedSettings, this)); @@ -282,6 +315,12 @@ define([ if (props.asc_getHeight()>0) this._nRatio = props.asc_getWidth()/props.asc_getHeight(); + + value = props.asc_getLockAspect(); + if (this._state.keepRatio!==value) { + this.btnRatio.toggle(value); + this._state.keepRatio=value; + } } }, @@ -289,8 +328,8 @@ define([ if (this.spinners) { for (var i=0; i
    ') }); @@ -199,9 +232,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscChartTitleShowSettings.none, displayValue: this.textNone }, - { value: c_oAscChartTitleShowSettings.overlay, displayValue: this.textOverlay }, - { value: c_oAscChartTitleShowSettings.noOverlay, displayValue: this.textNoOverlay } + { value: Asc.c_oAscChartTitleShowSettings.none, displayValue: this.textNone }, + { value: Asc.c_oAscChartTitleShowSettings.overlay, displayValue: this.textOverlay }, + { value: Asc.c_oAscChartTitleShowSettings.noOverlay, displayValue: this.textNoOverlay } ] }); @@ -211,13 +244,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscChartLegendShowSettings.none, displayValue: this.textNone }, - { value: c_oAscChartLegendShowSettings.bottom, displayValue: this.textLegendBottom }, - { value: c_oAscChartLegendShowSettings.top, displayValue: this.textLegendTop }, - { value: c_oAscChartLegendShowSettings.right, displayValue: this.textLegendRight }, - { value: c_oAscChartLegendShowSettings.left, displayValue: this.textLegendLeft }, - { value: c_oAscChartLegendShowSettings.leftOverlay, displayValue: this.textLeftOverlay }, - { value: c_oAscChartLegendShowSettings.rightOverlay, displayValue: this.textRightOverlay } + { value: Asc.c_oAscChartLegendShowSettings.none, displayValue: this.textNone }, + { value: Asc.c_oAscChartLegendShowSettings.bottom, displayValue: this.textLegendBottom }, + { value: Asc.c_oAscChartLegendShowSettings.top, displayValue: this.textLegendTop }, + { value: Asc.c_oAscChartLegendShowSettings.right, displayValue: this.textLegendRight }, + { value: Asc.c_oAscChartLegendShowSettings.left, displayValue: this.textLegendLeft }, + { value: Asc.c_oAscChartLegendShowSettings.leftOverlay, displayValue: this.textLeftOverlay }, + { value: Asc.c_oAscChartLegendShowSettings.rightOverlay, displayValue: this.textRightOverlay } ] }); @@ -227,8 +260,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscChartHorAxisLabelShowSettings.none, displayValue: this.textNone }, - { value: c_oAscChartHorAxisLabelShowSettings.noOverlay, displayValue: this.textNoOverlay } + { value: Asc.c_oAscChartHorAxisLabelShowSettings.none, displayValue: this.textNone }, + { value: Asc.c_oAscChartHorAxisLabelShowSettings.noOverlay, displayValue: this.textNoOverlay } ] }).on('selected', _.bind(function(combo, record) { if (this.chartSettings) @@ -241,9 +274,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscChartVertAxisLabelShowSettings.none, displayValue: this.textNone }, - { value: c_oAscChartVertAxisLabelShowSettings.rotated, displayValue: this.textRotated }, - { value: c_oAscChartVertAxisLabelShowSettings.horizontal, displayValue: this.textHorizontal } + { value: Asc.c_oAscChartVertAxisLabelShowSettings.none, displayValue: this.textNone }, + { value: Asc.c_oAscChartVertAxisLabelShowSettings.rotated, displayValue: this.textRotated }, + { value: Asc.c_oAscChartVertAxisLabelShowSettings.horizontal, displayValue: this.textHorizontal } ] }).on('selected', _.bind(function(combo, record) { if (this.chartSettings) @@ -284,10 +317,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscGridLinesSettings.none, displayValue: this.textNone }, - { value: c_oAscGridLinesSettings.major, displayValue: this.textMajor }, - { value: c_oAscGridLinesSettings.minor, displayValue: this.textMinor }, - { value: c_oAscGridLinesSettings.majorMinor, displayValue: this.textMajorMinor } + { value: Asc.c_oAscGridLinesSettings.none, displayValue: this.textNone }, + { value: Asc.c_oAscGridLinesSettings.major, displayValue: this.textMajor }, + { value: Asc.c_oAscGridLinesSettings.minor, displayValue: this.textMinor }, + { value: Asc.c_oAscGridLinesSettings.majorMinor, displayValue: this.textMajorMinor } ] }).on('selected', _.bind(function(combo, record) { if (this.chartSettings) @@ -300,10 +333,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscGridLinesSettings.none, displayValue: this.textNone }, - { value: c_oAscGridLinesSettings.major, displayValue: this.textMajor }, - { value: c_oAscGridLinesSettings.minor, displayValue: this.textMinor }, - { value: c_oAscGridLinesSettings.majorMinor, displayValue: this.textMajorMinor } + { value: Asc.c_oAscGridLinesSettings.none, displayValue: this.textNone }, + { value: Asc.c_oAscGridLinesSettings.major, displayValue: this.textMajor }, + { value: Asc.c_oAscGridLinesSettings.minor, displayValue: this.textMinor }, + { value: Asc.c_oAscGridLinesSettings.majorMinor, displayValue: this.textMajorMinor } ] }).on('selected', _.bind(function(combo, record) { if (this.chartSettings) @@ -316,11 +349,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscChartDataLabelsPos.none, displayValue: this.textNone }, - { value: c_oAscChartDataLabelsPos.ctr, displayValue: this.textCenter }, - { value: c_oAscChartDataLabelsPos.inBase, displayValue: this.textInnerBottom }, - { value: c_oAscChartDataLabelsPos.inEnd, displayValue: this.textInnerTop }, - { value: c_oAscChartDataLabelsPos.outEnd, displayValue: this.textOuterTop } + { value: Asc.c_oAscChartDataLabelsPos.none, displayValue: this.textNone }, + { value: Asc.c_oAscChartDataLabelsPos.ctr, displayValue: this.textCenter }, + { value: Asc.c_oAscChartDataLabelsPos.inBase, displayValue: this.textInnerBottom }, + { value: Asc.c_oAscChartDataLabelsPos.inEnd, displayValue: this.textInnerTop }, + { value: Asc.c_oAscChartDataLabelsPos.outEnd, displayValue: this.textOuterTop } ] }); @@ -385,13 +418,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 100px;', editable : false, data : [ - {displayValue: this.textAuto, value: c_oAscValAxisRule.auto}, - {displayValue: this.textFixed, value: c_oAscValAxisRule.fixed} + {displayValue: this.textAuto, value: Asc.c_oAscValAxisRule.auto}, + {displayValue: this.textFixed, value: Asc.c_oAscValAxisRule.fixed} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { this.currentAxisProps.putMinValRule(record.value); - if (record.value==c_oAscValAxisRule.auto) { + if (record.value==Asc.c_oAscValAxisRule.auto) { this.spnMinValue.setValue(this._originalAxisVValues.minAuto, true); } } @@ -407,10 +440,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value : '' }).on('change', _.bind(function(field, newValue, oldValue) { this.cmbMinType.suspendEvents(); - this.cmbMinType.setValue(c_oAscValAxisRule.fixed); + this.cmbMinType.setValue(Asc.c_oAscValAxisRule.fixed); this.cmbMinType.resumeEvents(); if (this.currentAxisProps) { - this.currentAxisProps.putMinValRule(c_oAscValAxisRule.fixed); + this.currentAxisProps.putMinValRule(Asc.c_oAscValAxisRule.fixed); this.currentAxisProps.putMinVal(field.getNumberValue()); } }, this)); @@ -421,13 +454,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 100px;', editable : false, data : [ - {displayValue: this.textAuto, value: c_oAscValAxisRule.auto}, - {displayValue: this.textFixed, value: c_oAscValAxisRule.fixed} + {displayValue: this.textAuto, value: Asc.c_oAscValAxisRule.auto}, + {displayValue: this.textFixed, value: Asc.c_oAscValAxisRule.fixed} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { this.currentAxisProps.putMaxValRule(record.value); - if (record.value==c_oAscValAxisRule.auto) { + if (record.value==Asc.c_oAscValAxisRule.auto) { this.spnMaxValue.setValue(this._originalAxisVValues.maxAuto, true); } } @@ -443,10 +476,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value : '' }).on('change', _.bind(function(field, newValue, oldValue) { this.cmbMaxType.suspendEvents(); - this.cmbMaxType.setValue(c_oAscValAxisRule.fixed); + this.cmbMaxType.setValue(Asc.c_oAscValAxisRule.fixed); this.cmbMaxType.resumeEvents(); if (this.currentAxisProps) { - this.currentAxisProps.putMaxValRule(c_oAscValAxisRule.fixed); + this.currentAxisProps.putMaxValRule(Asc.c_oAscValAxisRule.fixed); this.currentAxisProps.putMaxVal(field.getNumberValue()); } }, this)); @@ -457,23 +490,23 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 100px;', editable : false, data : [ - {displayValue: this.textAuto, value: c_oAscCrossesRule.auto}, - {displayValue: this.textValue, value: c_oAscCrossesRule.value}, - {displayValue: this.textMinValue, value: c_oAscCrossesRule.minValue}, - {displayValue: this.textMaxValue, value: c_oAscCrossesRule.maxValue} + {displayValue: this.textAuto, value: Asc.c_oAscCrossesRule.auto}, + {displayValue: this.textValue, value: Asc.c_oAscCrossesRule.value}, + {displayValue: this.textMinValue, value: Asc.c_oAscCrossesRule.minValue}, + {displayValue: this.textMaxValue, value: Asc.c_oAscCrossesRule.maxValue} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { this.currentAxisProps.putCrossesRule(record.value); var value; switch (record.value) { - case c_oAscCrossesRule.minValue: + case Asc.c_oAscCrossesRule.minValue: this.spnVAxisCrosses.setValue(this.spnMinValue.getNumberValue(), true); break; - case c_oAscCrossesRule.maxValue: + case Asc.c_oAscCrossesRule.maxValue: this.spnVAxisCrosses.setValue(this.spnMaxValue.getNumberValue(), true); break; - case c_oAscCrossesRule.auto: + case Asc.c_oAscCrossesRule.auto: this.spnVAxisCrosses.setValue(this._originalAxisVValues.crossesAuto, true); break; } @@ -490,10 +523,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value : '' }).on('change', _.bind(function(field, newValue, oldValue) { this.cmbVCrossType.suspendEvents(); - this.cmbVCrossType.setValue(c_oAscCrossesRule.value); + this.cmbVCrossType.setValue(Asc.c_oAscCrossesRule.value); this.cmbVCrossType.resumeEvents(); if (this.currentAxisProps) { - this.currentAxisProps.putCrossesRule(c_oAscCrossesRule.value); + this.currentAxisProps.putCrossesRule(Asc.c_oAscCrossesRule.value); this.currentAxisProps.putCrosses(field.getNumberValue()); } }, this)); @@ -504,16 +537,16 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscValAxUnits.none}, - {displayValue: this.textHundreds, value: c_oAscValAxUnits.HUNDREDS}, - {displayValue: this.textThousands, value: c_oAscValAxUnits.THOUSANDS}, - {displayValue: this.textTenThousands, value: c_oAscValAxUnits.TEN_THOUSANDS}, - {displayValue: this.textHundredThousands, value: c_oAscValAxUnits.HUNDRED_THOUSANDS}, - {displayValue: this.textMillions, value: c_oAscValAxUnits.MILLIONS}, - {displayValue: this.textTenMillions, value: c_oAscValAxUnits.TEN_MILLIONS}, - {displayValue: this.textHundredMil, value: c_oAscValAxUnits.HUNDRED_MILLIONS}, - {displayValue: this.textBillions, value: c_oAscValAxUnits.BILLIONS}, - {displayValue: this.textTrillions, value: c_oAscValAxUnits.TRILLIONS} + {displayValue: this.textNone, value: Asc.c_oAscValAxUnits.none}, + {displayValue: this.textHundreds, value: Asc.c_oAscValAxUnits.HUNDREDS}, + {displayValue: this.textThousands, value: Asc.c_oAscValAxUnits.THOUSANDS}, + {displayValue: this.textTenThousands, value: Asc.c_oAscValAxUnits.TEN_THOUSANDS}, + {displayValue: this.textHundredThousands, value: Asc.c_oAscValAxUnits.HUNDRED_THOUSANDS}, + {displayValue: this.textMillions, value: Asc.c_oAscValAxUnits.MILLIONS}, + {displayValue: this.textTenMillions, value: Asc.c_oAscValAxUnits.TEN_MILLIONS}, + {displayValue: this.textHundredMil, value: Asc.c_oAscValAxUnits.HUNDRED_MILLIONS}, + {displayValue: this.textBillions, value: Asc.c_oAscValAxUnits.BILLIONS}, + {displayValue: this.textTrillions, value: Asc.c_oAscValAxUnits.TRILLIONS} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -536,10 +569,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscTickMark.TICK_MARK_NONE}, - {displayValue: this.textCross, value: c_oAscTickMark.TICK_MARK_CROSS}, - {displayValue: this.textIn, value: c_oAscTickMark.TICK_MARK_IN}, - {displayValue: this.textOut, value: c_oAscTickMark.TICK_MARK_OUT} + {displayValue: this.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE}, + {displayValue: this.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS}, + {displayValue: this.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN}, + {displayValue: this.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -553,10 +586,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscTickMark.TICK_MARK_NONE}, - {displayValue: this.textCross, value: c_oAscTickMark.TICK_MARK_CROSS}, - {displayValue: this.textIn, value: c_oAscTickMark.TICK_MARK_IN}, - {displayValue: this.textOut, value: c_oAscTickMark.TICK_MARK_OUT} + {displayValue: this.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE}, + {displayValue: this.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS}, + {displayValue: this.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN}, + {displayValue: this.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -570,10 +603,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE}, - {displayValue: this.textLow, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW}, - {displayValue: this.textHigh, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH}, - {displayValue: this.textNextToAxis, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO} + {displayValue: this.textNone, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE}, + {displayValue: this.textLow, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW}, + {displayValue: this.textHigh, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH}, + {displayValue: this.textNextToAxis, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -589,19 +622,19 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 100px;', editable : false, data : [ - {displayValue: this.textAuto, value: c_oAscCrossesRule.auto}, - {displayValue: this.textValue, value: c_oAscCrossesRule.value}, - {displayValue: this.textMinValue, value: c_oAscCrossesRule.minValue}, - {displayValue: this.textMaxValue, value: c_oAscCrossesRule.maxValue} + {displayValue: this.textAuto, value: Asc.c_oAscCrossesRule.auto}, + {displayValue: this.textValue, value: Asc.c_oAscCrossesRule.value}, + {displayValue: this.textMinValue, value: Asc.c_oAscCrossesRule.minValue}, + {displayValue: this.textMaxValue, value: Asc.c_oAscCrossesRule.maxValue} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { this.currentAxisProps.putCrossesRule(record.value); - if (record.value==c_oAscCrossesRule.auto) { + if (record.value==Asc.c_oAscCrossesRule.auto) { this.spnHAxisCrosses.setValue(this._originalAxisHValues.crossesAuto, true); - } else if (record.value==c_oAscCrossesRule.minValue) { + } else if (record.value==Asc.c_oAscCrossesRule.minValue) { this.spnHAxisCrosses.setValue(this._originalAxisHValues.minAuto, true); - } else if (record.value==c_oAscCrossesRule.maxValue) { + } else if (record.value==Asc.c_oAscCrossesRule.maxValue) { this.spnHAxisCrosses.setValue(this._originalAxisHValues.maxAuto, true); } } @@ -617,10 +650,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value : '' }).on('change', _.bind(function(field, newValue, oldValue) { this.cmbHCrossType.suspendEvents(); - this.cmbHCrossType.setValue(c_oAscCrossesRule.value); + this.cmbHCrossType.setValue(Asc.c_oAscCrossesRule.value); this.cmbHCrossType.resumeEvents(); if (this.currentAxisProps) { - this.currentAxisProps.putCrossesRule(c_oAscCrossesRule.value); + this.currentAxisProps.putCrossesRule(Asc.c_oAscCrossesRule.value); this.currentAxisProps.putCrosses(field.getNumberValue()); } }, this)); @@ -631,8 +664,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textOnTickMarks, value: c_oAscLabelsPosition.byDivisions}, - {displayValue: this.textBetweenTickMarks, value: c_oAscLabelsPosition.betweenDivisions} + {displayValue: this.textOnTickMarks, value: Asc.c_oAscLabelsPosition.byDivisions}, + {displayValue: this.textBetweenTickMarks, value: Asc.c_oAscLabelsPosition.betweenDivisions} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -655,10 +688,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscTickMark.TICK_MARK_NONE}, - {displayValue: this.textCross, value: c_oAscTickMark.TICK_MARK_CROSS}, - {displayValue: this.textIn, value: c_oAscTickMark.TICK_MARK_IN}, - {displayValue: this.textOut, value: c_oAscTickMark.TICK_MARK_OUT} + {displayValue: this.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE}, + {displayValue: this.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS}, + {displayValue: this.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN}, + {displayValue: this.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -672,10 +705,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscTickMark.TICK_MARK_NONE}, - {displayValue: this.textCross, value: c_oAscTickMark.TICK_MARK_CROSS}, - {displayValue: this.textIn, value: c_oAscTickMark.TICK_MARK_IN}, - {displayValue: this.textOut, value: c_oAscTickMark.TICK_MARK_OUT} + {displayValue: this.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE}, + {displayValue: this.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS}, + {displayValue: this.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN}, + {displayValue: this.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -703,10 +736,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textNone, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE}, - {displayValue: this.textLow, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW}, - {displayValue: this.textHigh, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH}, - {displayValue: this.textNextToAxis, value: c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO} + {displayValue: this.textNone, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE}, + {displayValue: this.textLow, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW}, + {displayValue: this.textHigh, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH}, + {displayValue: this.textNextToAxis, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { @@ -738,10 +771,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value : '' }).on('change', _.bind(function(field, newValue, oldValue) { this.cmbLabelInterval.suspendEvents(); - this.cmbLabelInterval.setValue(c_oAscBetweenLabelsRule.manual); + this.cmbLabelInterval.setValue(Asc.c_oAscBetweenLabelsRule.manual); this.cmbLabelInterval.resumeEvents(); if (this.currentAxisProps) { - this.currentAxisProps.putIntervalBetweenLabelsRule(c_oAscBetweenLabelsRule.manual); + this.currentAxisProps.putIntervalBetweenLabelsRule(Asc.c_oAscBetweenLabelsRule.manual); this.currentAxisProps.putIntervalBetweenLabels(field.getNumberValue()); } }, this)); @@ -752,13 +785,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' menuStyle : 'min-width: 140px;', editable : false, data : [ - {displayValue: this.textAuto, value: c_oAscBetweenLabelsRule.auto}, - {displayValue: this.textManual, value: c_oAscBetweenLabelsRule.manual} + {displayValue: this.textAuto, value: Asc.c_oAscBetweenLabelsRule.auto}, + {displayValue: this.textManual, value: Asc.c_oAscBetweenLabelsRule.manual} ] }).on('selected', _.bind(function(combo, record) { if (this.currentAxisProps) { this.currentAxisProps.putIntervalBetweenLabelsRule(record.value); - if (record.value==c_oAscBetweenLabelsRule.auto) + if (record.value==Asc.c_oAscBetweenLabelsRule.auto) this.spnLabelInterval.setValue(1, true); } }, this)); @@ -774,6 +807,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.updateChartStyles(this.api.asc_getChartPreviews(this._state.ChartType)); this._setDefaults(this.chartSettings); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, onSelectType: function(btn, picker, itemView, record) { @@ -802,8 +839,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' }, updateAxisProps: function(type, isDefault) { - var value = (type == c_oAscChartTypeSettings.lineNormal || type == c_oAscChartTypeSettings.lineStacked || - type == c_oAscChartTypeSettings.lineStackedPer || type == c_oAscChartTypeSettings.scatter); + var value = (type == Asc.c_oAscChartTypeSettings.lineNormal || type == Asc.c_oAscChartTypeSettings.lineStacked || + type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.scatter); this.chMarkers.setVisible(value); this.cmbLines.setVisible(value); this.lblLines.toggleClass('hidden', !value); @@ -813,7 +850,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.cmbLines.setValue(this.chartSettings.getLine() ? (this.chartSettings.getSmooth() ? 2 : 1) : 0); } - value = (type == c_oAscChartTypeSettings.pie || type == c_oAscChartTypeSettings.doughnut || type == c_oAscChartTypeSettings.pie3d); + value = (type == Asc.c_oAscChartTypeSettings.pie || type == Asc.c_oAscChartTypeSettings.doughnut || type == Asc.c_oAscChartTypeSettings.pie3d); this.btnsCategory[2].setDisabled(value); this.btnsCategory[3].setDisabled(value); this.cmbHorShow.setDisabled(value); @@ -830,22 +867,22 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.cmbHorGrid.setValue(this.chartSettings.getHorGridLines()); this.cmbVertGrid.setValue(this.chartSettings.getVertGridLines()); - value = (type == c_oAscChartTypeSettings.hBarNormal || type == c_oAscChartTypeSettings.hBarStacked || type == c_oAscChartTypeSettings.hBarStackedPer || - type == c_oAscChartTypeSettings.hBarNormal3d || type == c_oAscChartTypeSettings.hBarStacked3d || type == c_oAscChartTypeSettings.hBarStackedPer3d); + value = (type == Asc.c_oAscChartTypeSettings.hBarNormal || type == Asc.c_oAscChartTypeSettings.hBarStacked || type == Asc.c_oAscChartTypeSettings.hBarStackedPer || + type == Asc.c_oAscChartTypeSettings.hBarNormal3d || type == Asc.c_oAscChartTypeSettings.hBarStacked3d || type == Asc.c_oAscChartTypeSettings.hBarStackedPer3d); this.btnsCategory[2].options.contentTarget = (value) ? 'id-chart-settings-dlg-hor' : 'id-chart-settings-dlg-vert'; - this.btnsCategory[3].options.contentTarget = (value || type == c_oAscChartTypeSettings.scatter) ? 'id-chart-settings-dlg-vert' : 'id-chart-settings-dlg-hor'; + this.btnsCategory[3].options.contentTarget = (value || type == Asc.c_oAscChartTypeSettings.scatter) ? 'id-chart-settings-dlg-vert' : 'id-chart-settings-dlg-hor'; }, onVCategoryClick: function() { - (this.vertAxisProps.getAxisType()==c_oAscAxisType.val) ? this.fillVProps(this.vertAxisProps) : this.fillHProps(this.vertAxisProps); + (this.vertAxisProps.getAxisType()==Asc.c_oAscAxisType.val) ? this.fillVProps(this.vertAxisProps) : this.fillHProps(this.vertAxisProps); }, onHCategoryClick: function() { - (this.horAxisProps.getAxisType()==c_oAscAxisType.val) ? this.fillVProps(this.horAxisProps) : this.fillHProps(this.horAxisProps); + (this.horAxisProps.getAxisType()==Asc.c_oAscAxisType.val) ? this.fillVProps(this.horAxisProps) : this.fillHProps(this.horAxisProps); }, fillVProps: function(props) { - if (props.getAxisType() !== c_oAscAxisType.val) return; + if (props.getAxisType() !== Asc.c_oAscAxisType.val) return; if (this._originalAxisVValues==undefined) { this._originalAxisVValues = { minAuto: (props.getMinVal()==null) ? 0 : props.getMinVal(), @@ -855,23 +892,23 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' } this.cmbMinType.setValue(props.getMinValRule()); - var value = (props.getMinValRule()==c_oAscValAxisRule.auto) ? this._originalAxisVValues.minAuto : props.getMinVal(); + var value = (props.getMinValRule()==Asc.c_oAscValAxisRule.auto) ? this._originalAxisVValues.minAuto : props.getMinVal(); this.spnMinValue.setValue((value==null) ? '' : value, true); this.cmbMaxType.setValue(props.getMaxValRule()); - value = (props.getMaxValRule()==c_oAscValAxisRule.auto) ? this._originalAxisVValues.maxAuto : props.getMaxVal(); + value = (props.getMaxValRule()==Asc.c_oAscValAxisRule.auto) ? this._originalAxisVValues.maxAuto : props.getMaxVal(); this.spnMaxValue.setValue((value==null) ? '' : value, true); value = props.getCrossesRule(); this.cmbVCrossType.setValue(value); switch (value) { - case c_oAscCrossesRule.minValue: + case Asc.c_oAscCrossesRule.minValue: value = this.spnMinValue.getNumberValue(); break; - case c_oAscCrossesRule.maxValue: + case Asc.c_oAscCrossesRule.maxValue: value = this.spnMaxValue.getNumberValue(); break; - case c_oAscCrossesRule.auto: + case Asc.c_oAscCrossesRule.auto: value = this._originalAxisVValues.crossesAuto; break; default: @@ -890,7 +927,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' }, fillHProps: function(props) { - if (props.getAxisType() !== c_oAscAxisType.cat) return; + if (props.getAxisType() !== Asc.c_oAscAxisType.cat) return; if (this._originalAxisHValues==undefined) { this._originalAxisHValues = { minAuto: (props.getCrossMinVal()==null) ? 0 : props.getCrossMinVal(), @@ -902,13 +939,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' var value = props.getCrossesRule(); this.cmbHCrossType.setValue(value); switch (value) { - case c_oAscCrossesRule.minValue: + case Asc.c_oAscCrossesRule.minValue: value = this._originalAxisHValues.minAuto; break; - case c_oAscCrossesRule.maxValue: + case Asc.c_oAscCrossesRule.maxValue: value = this._originalAxisHValues.maxAuto; break; - case c_oAscCrossesRule.auto: + case Asc.c_oAscCrossesRule.auto: value = this._originalAxisHValues.crossesAuto; break; default: @@ -927,7 +964,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value = props.getIntervalBetweenLabelsRule(); this.cmbLabelInterval.setValue(value); - this.spnLabelInterval.setValue((value===c_oAscBetweenLabelsRule.manual) ? props.getIntervalBetweenLabels(): 1, true); + this.spnLabelInterval.setValue((value===Asc.c_oAscBetweenLabelsRule.manual) ? props.getIntervalBetweenLabels(): 1, true); this.currentAxisProps = props; }, @@ -1028,8 +1065,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' if (me.cmbDataDirect.isDisabled()) me.cmbDataDirect.setDisabled(false); - var isvalid = me.api.asc_checkDataRange(c_oAscSelectionDialogType.Chart, value, false); - return (isvalid==c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, value, false); + return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; }; this.cmbDataDirect.setDisabled(value===null); @@ -1092,8 +1129,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.chartSettings.putShowMarker(this.chMarkers.getValue()=='checked'); - value = (type == c_oAscChartTypeSettings.lineNormal || type == c_oAscChartTypeSettings.lineStacked || - type == c_oAscChartTypeSettings.lineStackedPer || type == c_oAscChartTypeSettings.scatter); + value = (type == Asc.c_oAscChartTypeSettings.lineNormal || type == Asc.c_oAscChartTypeSettings.lineStacked || + type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.scatter); if (value) { value = this.cmbLines.getValue(); this.chartSettings.putLine(value!==0); @@ -1110,17 +1147,16 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' isRangeValid: function() { var isvalid; if (!_.isEmpty(this.txtDataRange.getValue())) { - isvalid = this.api.asc_checkDataRange(c_oAscSelectionDialogType.Chart, this.txtDataRange.getValue(), true, this.cmbDataDirect.getValue()==0, this.mnuChartTypePicker.getSelectedRec()[0].get('type')); - if (isvalid == c_oAscError.ID.No) + isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, this.txtDataRange.getValue(), true, this.cmbDataDirect.getValue()==0, this.mnuChartTypePicker.getSelectedRec()[0].get('type')); + if (isvalid == Asc.c_oAscError.ID.No) return true; } else this.txtDataRange.showError([this.txtEmpty]); - this.btnsCategory[0].toggle(true); - this.onCategoryClick(this.btnsCategory[0]); - if (isvalid == c_oAscError.ID.StockChartError) { + this.setActiveCategory(0); + if (isvalid == Asc.c_oAscError.ID.StockChartError) { Common.UI.warning({msg: this.errorStockChart}); - } else if (isvalid == c_oAscError.ID.MaxDataSeriesError) { + } else if (isvalid == Asc.c_oAscError.ID.MaxDataSeriesError) { Common.UI.warning({msg: this.errorMaxRows}); } else this.txtDataRange.cmpEl.find('input').focus(); @@ -1156,7 +1192,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' }, onSelectDataLabels: function(obj, rec, e) { - var disable = rec.value == c_oAscChartDataLabelsPos.none; + var disable = rec.value == Asc.c_oAscChartDataLabelsPos.none; this.chSeriesName.setDisabled(disable); this.chCategoryName.setDisabled(disable); this.chValue.setDisabled(disable); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index fa238794e..9381d254c 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * DocumentHolder.js * @@ -72,6 +104,19 @@ define([ value : 'paste' }); + me.pmiSelectTable = new Common.UI.MenuItem({ + caption : me.txtSelect, + menu : new Common.UI.Menu({ + menuAlign : 'tl-tr', + items: [ + { caption: this.selectRowText, value: Asc.c_oAscChangeSelectionFormatTable.row}, + { caption: this.selectColumnText, value: Asc.c_oAscChangeSelectionFormatTable.column}, + { caption: this.selectDataText, value: Asc.c_oAscChangeSelectionFormatTable.data}, + { caption: this.selectTableText, value: Asc.c_oAscChangeSelectionFormatTable.all} + ] + }) + }); + me.pmiInsertEntire = new Common.UI.MenuItem({ caption : me.txtInsert }); @@ -83,20 +128,33 @@ define([ items: [ { caption : me.txtShiftRight, - value : c_oAscInsertOptions.InsertCellsAndShiftRight + value : Asc.c_oAscInsertOptions.InsertCellsAndShiftRight },{ caption : me.txtShiftDown, - value : c_oAscInsertOptions.InsertCellsAndShiftDown + value : Asc.c_oAscInsertOptions.InsertCellsAndShiftDown },{ caption : me.txtRow, - value : c_oAscInsertOptions.InsertRows + value : Asc.c_oAscInsertOptions.InsertRows },{ caption : me.txtColumn, - value : c_oAscInsertOptions.InsertColumns + value : Asc.c_oAscInsertOptions.InsertColumns } ] }) }); + + me.pmiInsertTable = new Common.UI.MenuItem({ + caption : me.txtInsert, + menu : new Common.UI.Menu({ + menuAlign : 'tl-tr', + items: [ + { caption: me.insertRowAboveText, value: Asc.c_oAscInsertOptions.InsertTableRowAbove}, + { caption: me.insertRowBelowText, value: Asc.c_oAscInsertOptions.InsertTableRowBelow}, + { caption: me.insertColumnLeftText, value: Asc.c_oAscInsertOptions.InsertTableColLeft}, + { caption: me.insertColumnRightText, value: Asc.c_oAscInsertOptions.InsertTableColRight} + ] + }) + }); me.pmiDeleteEntire = new Common.UI.MenuItem({ caption : me.txtDelete @@ -109,21 +167,33 @@ define([ items: [ { caption : me.txtShiftLeft, - value : c_oAscDeleteOptions.DeleteCellsAndShiftLeft + value : Asc.c_oAscDeleteOptions.DeleteCellsAndShiftLeft },{ caption : me.txtShiftUp, - value : c_oAscDeleteOptions.DeleteCellsAndShiftTop + value : Asc.c_oAscDeleteOptions.DeleteCellsAndShiftTop },{ caption : me.txtRow, - value : c_oAscDeleteOptions.DeleteRows + value : Asc.c_oAscDeleteOptions.DeleteRows },{ caption : me.txtColumn, - value : c_oAscDeleteOptions.DeleteColumns + value : Asc.c_oAscDeleteOptions.DeleteColumns } ] }) }); + me.pmiDeleteTable = new Common.UI.MenuItem({ + caption : me.txtDelete, + menu : new Common.UI.Menu({ + menuAlign : 'tl-tr', + items: [ + { caption: this.deleteRowText, value: Asc.c_oAscDeleteOptions.DeleteRows}, + { caption: this.deleteColumnText, value: Asc.c_oAscDeleteOptions.DeleteColumns}, + { caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable} + ] + }) + }); + me.pmiClear = new Common.UI.MenuItem({ caption : me.txtClear, menu : new Common.UI.Menu({ @@ -131,23 +201,23 @@ define([ items: [ { caption : me.txtClearAll, - value : c_oAscCleanOptions.All + value : Asc.c_oAscCleanOptions.All }, { caption : me.txtClearText, - value : c_oAscCleanOptions.Text + value : Asc.c_oAscCleanOptions.Text }, { caption : me.txtClearFormat, - value : c_oAscCleanOptions.Format + value : Asc.c_oAscCleanOptions.Format }, { caption : me.txtClearComments, - value : c_oAscCleanOptions.Comments + value : Asc.c_oAscCleanOptions.Comments }, { caption : me.txtClearHyper, - value : c_oAscCleanOptions.Hyperlinks + value : Asc.c_oAscCleanOptions.Hyperlinks } ] }) @@ -160,15 +230,44 @@ define([ items: [ { caption : me.txtAscending, - value : 'ascending' + value : Asc.c_oAscSortOptions.Ascending },{ caption : me.txtDescending, - value : 'descending' + value : Asc.c_oAscSortOptions.Descending + },{ + caption : me.txtSortCellColor, + value : Asc.c_oAscSortOptions.ByColorFill + },{ + caption : me.txtSortFontColor, + value : Asc.c_oAscSortOptions.ByColorFont } ] }) }); + me.pmiFilterCells = new Common.UI.MenuItem({ + caption : me.txtFilter, + menu : new Common.UI.Menu({ + menuAlign : 'tl-tr', + items: [ + { + caption : me.txtFilterValue, + value : 0 + },{ + caption : me.txtFilterCellColor, + value : 1 + },{ + caption : me.txtFilterFontColor, + value : 2 + } + ] + }) + }); + + me.pmiReapply = new Common.UI.MenuItem({ + caption : me.txtReapply + }); + me.pmiInsFunction = new Common.UI.MenuItem({ caption : me.txtFormula }); @@ -241,12 +340,18 @@ define([ me.pmiCopy, me.pmiPaste, {caption: '--'}, + me.pmiSelectTable, me.pmiInsertEntire, me.pmiInsertCells, + me.pmiInsertTable, me.pmiDeleteEntire, me.pmiDeleteCells, + me.pmiDeleteTable, me.pmiClear, + {caption: '--'}, me.pmiSortCells, + me.pmiFilterCells, + me.pmiReapply, {caption: '--'}, me.pmiAddComment, me.pmiCellMenuSeparator, @@ -313,22 +418,22 @@ define([ caption : this.textArrangeFront, iconCls : 'mnu-arrange-front', type : 'arrange', - value : c_oAscDrawingLayerType.BringToFront + value : Asc.c_oAscDrawingLayerType.BringToFront },{ caption : this.textArrangeBack, iconCls : 'mnu-arrange-back', type : 'arrange', - value : c_oAscDrawingLayerType.SendToBack + value : Asc.c_oAscDrawingLayerType.SendToBack },{ caption : this.textArrangeForward, iconCls : 'mnu-arrange-forward', type : 'arrange', - value : c_oAscDrawingLayerType.BringForward + value : Asc.c_oAscDrawingLayerType.BringForward },{ caption: this.textArrangeBackward, iconCls : 'mnu-arrange-backward', type : 'arrange', - value : c_oAscDrawingLayerType.SendBackward + value : Asc.c_oAscDrawingLayerType.SendBackward }, {caption: '--'}, me.mnuGroupImg, @@ -348,19 +453,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP }), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR }), this.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM }) ] }) @@ -377,7 +482,7 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphdirect', - direction : c_oAscVertDrawingText.normal + direction : Asc.c_oAscVertDrawingText.normal }), me.menuParagraphDirect90 = new Common.UI.MenuItem({ caption : me.direct90Text, @@ -385,7 +490,7 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphdirect', - direction : c_oAscVertDrawingText.vert + direction : Asc.c_oAscVertDrawingText.vert }), me.menuParagraphDirect270 = new Common.UI.MenuItem({ caption : me.direct270Text, @@ -393,7 +498,7 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphdirect', - direction : c_oAscVertDrawingText.vert270 + direction : Asc.c_oAscVertDrawingText.vert270 }) ] }) @@ -482,8 +587,6 @@ define([ minScrollbarLength : 40, alwaysVisibleY: true }); - }).on('show:after', function () { - this.scroller.update({alwaysVisibleY: true}); }); me.fireEvent('createdelayedelements', [me]); @@ -546,7 +649,25 @@ define([ direct270Text: 'Rotate at 270°', txtAddNamedRange: 'Define Name', textFreezePanes: 'Freeze Panes', - textUnFreezePanes: 'Unfreeze Panes' - + textUnFreezePanes: 'Unfreeze Panes', + txtSelect: 'Select', + selectRowText : 'Select Row', + selectColumnText : 'Select Entire Column', + selectDataText : 'Select Column Data', + selectTableText : 'Select Table', + insertRowAboveText : 'Insert Row Above', + insertRowBelowText : 'Insert Row Below', + insertColumnLeftText : 'Insert Column Left', + insertColumnRightText : 'Insert Column Right', + deleteRowText : 'Delete Row', + deleteColumnText : 'Delete Column', + deleteTableText : 'Delete Table', + txtFilter: 'Filter', + txtFilterValue: 'Filter by Selected cell\'s value', + txtFilterCellColor: 'Filter by cell\'s color', + txtFilterFontColor: 'Filter by font color', + txtReapply: 'Reapply', + txtSortCellColor: 'Selected Cell Color on top', + txtSortFontColor: 'Selected Font Color on top' }, SSE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 26829895a..a586f5e90 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ 'text!spreadsheeteditor/main/app/template/FileMenu.template', 'underscore', diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 1d7363f56..c04f92c56 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ 'common/main/lib/view/DocumentAccessDialog' ], function () { @@ -10,13 +42,13 @@ define([ menu: undefined, formats: [[ - {name: 'XLSX', imgCls: 'xlsx', type: c_oAscFileType.XLSX}, - {name: 'PDF', imgCls: 'pdf', type: c_oAscFileType.PDF}, - {name: 'ODS', imgCls: 'ods', type: c_oAscFileType.ODS}, - {name: 'CSV', imgCls: 'csv', type: c_oAscFileType.CSV} + {name: 'XLSX', imgCls: 'xlsx', type: Asc.c_oAscFileType.XLSX}, + {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'ODS', imgCls: 'ods', type: Asc.c_oAscFileType.ODS}, + {name: 'CSV', imgCls: 'csv', type: Asc.c_oAscFileType.CSV} ] // ,[ -// {name: 'HTML', imgCls: 'html', type: c_oAscFileType.HTML} +// {name: 'HTML', imgCls: 'html', type: Asc.c_oAscFileType.HTML} // ] ], @@ -102,7 +134,7 @@ define([ el: $('#id-settings-menu'), store: new Common.UI.DataViewStore([ {name: this.txtGeneral, panel: this.generalSettings, iconCls:'mnu-settings-general', selected: true}, - {name: this.txtPrint, panel: this.printSettings, iconCls:'mnu-print'} + {name: this.txtPageSettings, panel: this.printSettings, iconCls:'mnu-print'} ]), itemTemplate: _.template([ '
    ', @@ -141,7 +173,7 @@ define([ }, txtGeneral: 'General', - txtPrint: 'Print' + txtPageSettings: 'Page Settings' }, SSE.Views.FileMenuPanels.Settings || {})); SSE.Views.MainSettingsPrint = Common.UI.BaseView.extend(_.extend({ @@ -161,6 +193,10 @@ define([ '
    ', @@ -213,47 +249,59 @@ define([ this.cmbSheet = new Common.UI.ComboBox({ el : $('#advsettings-print-combo-sheets'), - style : 'width: 260px;', - menuStyle : 'min-width: 260px;max-height: 280px;', + style : 'width: 242px;', + menuStyle : 'min-width: 242px;max-height: 280px;', editable : false, cls : 'input-group-nr', - data : [ - { value: -255, displayValue: this.strAllSheets } - ] + data : [] }); this.cmbPaperSize = new Common.UI.ComboBox({ el : $('#advsettings-print-combo-pages'), - style : 'width: 260px;', - menuStyle : 'max-height: 280px; min-width: 260px;', + style : 'width: 242px;', + menuStyle : 'max-height: 280px; min-width: 242px;', editable : false, cls : 'input-group-nr', data : [ - {value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)'}, - {value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)'}, - {value:'210|297', displayValue:'A4 (21cm x 29,7cm)'}, - {value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)'}, - {value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)'}, - {value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)'}, - {value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)'}, - {value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)'}, - {value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)'}, - {value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)'}, - {value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)'}, - {value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)'}, - {value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)'} + {value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter'}, + {value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal'}, + {value:'210|297', displayValue:'A4 (21cm x 29,7cm)', caption: 'A4'}, + {value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)', caption: 'A5'}, + {value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)', caption: 'B5'}, + {value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10'}, + {value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)', caption: 'Envelope DL'}, + {value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)', caption: 'Tabloid'}, + {value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)', caption: 'A3'}, + {value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize'}, + {value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'}, + {value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'}, + {value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3'} ] }); this.cmbPaperOrientation = new Common.UI.ComboBox({ el : $('#advsettings-print-combo-orient'), - style : 'width: 200px;', - menuStyle : 'min-width: 200px;', + style : 'width: 132px;', + menuStyle : 'min-width: 132px;', editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscPageOrientation.PagePortrait, displayValue: this.strPortrait }, - { value: c_oAscPageOrientation.PageLandscape, displayValue: this.strLandscape } + { value: Asc.c_oAscPageOrientation.PagePortrait, displayValue: this.strPortrait }, + { value: Asc.c_oAscPageOrientation.PageLandscape, displayValue: this.strLandscape } + ] + }); + + this.cmbLayout = new Common.UI.ComboBox({ + el : $('#advsettings-print-combo-layout'), + style : 'width: 242px;', + menuStyle : 'min-width: 242px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textActualSize }, + { value: 1, displayValue: this.textFitPage }, + { value: 2, displayValue: this.textFitCols }, + { value: 3, displayValue: this.textFitRows } ] }); @@ -270,7 +318,7 @@ define([ this.spnMarginTop = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-top'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -281,7 +329,7 @@ define([ this.spnMarginBottom = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-bottom'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -292,7 +340,7 @@ define([ this.spnMarginLeft = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-left'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -303,7 +351,7 @@ define([ this.spnMarginRight = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-right'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -331,10 +379,21 @@ define([ if (this.spinners) { for (var i=0; i 1 ? c_oAscFontRenderingModeType.noHinting : c_oAscFontRenderingModeType.hintingAndSubpixeling)); + this.cmbFontRender.setValue(item ? item.get('value') : (window.devicePixelRatio > 1 ? Asc.c_oAscFontRenderingModeType.noHinting : Asc.c_oAscFontRenderingModeType.hintingAndSubpixeling)); value = Common.localStorage.getItem("sse-settings-unit"); item = this.cmbUnit.store.findWhere({value: parseInt(value)}); - this.cmbUnit.setValue(item ? parseInt(item.get('value')) : 0); + this.cmbUnit.setValue(item ? parseInt(item.get('value')) : Common.Utils.Metric.getDefaultMetric()); this._oldUnits = this.cmbUnit.getValue(); value = Common.localStorage.getItem("sse-settings-autosave"); - this.chAutosave.setValue(value===null || parseInt(value) == 1); + this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1)); value = Common.localStorage.getItem("sse-settings-func-locale"); if (value===null) @@ -693,7 +787,8 @@ define([ strFast: 'Fast', strStrict: 'Strict', textAutoRecover: 'Autorecover', - strAutoRecover: 'Turn on autorecover' + strAutoRecover: 'Turn on autorecover', + txtInch: 'Inch' }, SSE.Views.FileMenuPanels.MainSettingsGeneral || {})); SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js index 587253cb2..14153458d 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * FormulaDialog.js * @@ -24,7 +56,7 @@ define([ _options = {}; _.extend(_options, { - width : 300, + width : 310, height : 490, contentWidth : 390, header : true, @@ -43,7 +75,8 @@ define([ '', '
    ', - '', + '', + '', '
    ', '
    ', @@ -69,6 +102,7 @@ define([ this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); this.syntaxLabel = $('#formula-dlg-args'); + this.descLabel = $('#formula-dlg-desc'); this.translationTable = {}; @@ -169,6 +203,7 @@ define([ if (func) { this.applyFunction = func.get('name'); this.syntaxLabel.text(this.applyFunction + func.get('args')); + this.descLabel.text(func.get('desc')); } } } @@ -267,6 +302,7 @@ define([ this.applyFunction = functions[0].get('name'); this.syntaxLabel.text(this.applyFunction + functions[0].get('args')); + this.descLabel.text(functions[0].get('desc')); this.cmbListFunctions.scroller.update({ minScrollbarLength : 40, alwaysVisibleY : true diff --git a/apps/spreadsheeteditor/main/app/view/FormulaLang.js b/apps/spreadsheeteditor/main/app/view/FormulaLang.js index 9a218cb51..4fcf164c1 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaLang.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaLang.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ ], function () { 'use strict'; @@ -5,7 +37,8 @@ define([ SSE.Views = SSE.Views || {}; SSE.Views.FormulaLang = new(function() { - var langJson = {}; + var langJson = {}, + langDescJson = {}; var _createXMLHTTPObject = function() { var xmlhttp; @@ -50,8 +83,40 @@ define([ return null; }; + + + var _getDescription = function(lang) { + if (!lang) return ''; + lang = lang.toLowerCase() ; + + if (langDescJson[lang]) + return langDescJson[lang]; + else { + try { + var xhrObj = _createXMLHTTPObject(); + if (xhrObj && lang) { + xhrObj.open('GET', 'resources/formula-lang/' + lang + '_desc.json', false); + xhrObj.send(''); + if (xhrObj.status == 200) + langDescJson[lang] = eval("(" + xhrObj.responseText + ")"); + else { + xhrObj.open('GET', 'resources/formula-lang/en_desc.json', false); + xhrObj.send(''); + langDescJson[lang] = eval("(" + xhrObj.responseText + ")"); + } + return langDescJson[lang]; + } + } + catch (e) { + } + } + + return null; + }; + return { - get: _get + get: _get, + getDescription: _getDescription }; })(); }); diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 6e192f78c..84ffb3b37 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * HyperlinkSettingsDialog.js * @@ -85,14 +117,14 @@ define([ editable: false, menuStyle: 'min-width: 100%;', data : [ - {displayValue: this.textInternalLink, value: c_oAscHyperlinkType.RangeLink}, - {displayValue: this.textExternalLink, value: c_oAscHyperlinkType.WebLink} + {displayValue: this.textInternalLink, value: Asc.c_oAscHyperlinkType.RangeLink}, + {displayValue: this.textExternalLink, value: Asc.c_oAscHyperlinkType.WebLink} ] }).on('selected', function(combo, record) { - $('#id-dlg-hyperlink-external')[record.value == c_oAscHyperlinkType.WebLink ? 'show' : 'hide'](); - $('#id-dlg-hyperlink-internal')[record.value != c_oAscHyperlinkType.WebLink ? 'show' : 'hide'](); + $('#id-dlg-hyperlink-external')[record.value == Asc.c_oAscHyperlinkType.WebLink ? 'show' : 'hide'](); + $('#id-dlg-hyperlink-internal')[record.value != Asc.c_oAscHyperlinkType.WebLink ? 'show' : 'hide'](); }); - me.cmbLinkType.setValue(c_oAscHyperlinkType.WebLink); + me.cmbLinkType.setValue(Asc.c_oAscHyperlinkType.WebLink); me.cmbSheets = new Common.UI.ComboBox({ el : $('#id-dlg-hyperlink-sheet'), @@ -145,7 +177,7 @@ define([ me.inputTip = new Common.UI.InputField({ el : $('#id-dlg-hyperlink-tip'), style : 'width: 100%;', - maxLength : c_oAscMaxTooltipLength + maxLength : Asc.c_oAscMaxTooltipLength }); $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); @@ -167,7 +199,7 @@ define([ this.cmbSheets.setData(settings.sheets); if (!settings.props) { - this.cmbLinkType.setValue(c_oAscHyperlinkType.WebLink); + this.cmbLinkType.setValue(Asc.c_oAscHyperlinkType.WebLink); this.cmbLinkType.setDisabled(!settings.allowInternal); this.inputDisplay.setValue(settings.isLock ? this.textDefault : settings.text); this.focusedInput = this.inputUrl.cmpEl.find('input'); @@ -176,7 +208,7 @@ define([ this.cmbLinkType.setValue(settings.props.asc_getType()); this.cmbLinkType.setDisabled(!settings.allowInternal); - if (settings.props.asc_getType() == c_oAscHyperlinkType.RangeLink) { + if (settings.props.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) { $('#id-dlg-hyperlink-external').hide(); $('#id-dlg-hyperlink-internal').show(); @@ -201,7 +233,7 @@ define([ def_display = ""; props.asc_setType(this.cmbLinkType.getValue()); - if (this.cmbLinkType.getValue() == c_oAscHyperlinkType.RangeLink) { + if (this.cmbLinkType.getValue() == Asc.c_oAscHyperlinkType.RangeLink) { props.asc_setSheet(this.cmbSheets.getValue()); props.asc_setRange(this.inputRange.getValue()); def_display = this.cmbSheets.getValue() + '!' + this.inputRange.getValue(); @@ -241,8 +273,8 @@ define([ _handleInput: function(state) { if (this.options.handler) { if (state == 'ok') { - var checkurl = (this.cmbLinkType.getValue() === c_oAscHyperlinkType.WebLink) ? this.inputUrl.checkValidate() : true, - checkrange = (this.cmbLinkType.getValue() === c_oAscHyperlinkType.RangeLink) ? this.inputRange.checkValidate() : true, + var checkurl = (this.cmbLinkType.getValue() === Asc.c_oAscHyperlinkType.WebLink) ? this.inputUrl.checkValidate() : true, + checkrange = (this.cmbLinkType.getValue() === Asc.c_oAscHyperlinkType.RangeLink) ? this.inputRange.checkValidate() : true, checkdisp = this.inputDisplay.checkValidate(); if (checkurl !== true) { this.inputUrl.cmpEl.find('input').focus(); diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index b5de6600e..18734424a 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ImageSettings.js * @@ -39,7 +71,8 @@ define([ this._state = { Width: 0, Height: 0, - DisabledControls: false + DisabledControls: false, + keepRatio: false }; this.spinners = []; this.lockedControls = []; @@ -83,15 +116,15 @@ define([ this.btnRatio.render($('#image-button-ratio')) ; this.lockedControls.push(this.btnRatio); - var value = Common.localStorage.getItem("sse-settings-imageratio"); - if (value===null || parseInt(value) == 1) { - this.btnRatio.toggle(true); - } this.btnRatio.on('click', _.bind(function(btn, e) { if (btn.pressed && this.spnHeight.getNumberValue()>0) { this._nRatio = this.spnWidth.getNumberValue()/this.spnHeight.getNumberValue(); } - Common.localStorage.setItem("sse-settings-imageratio", (btn.pressed) ? 1 : 0); + if (this.api) { + var props = new Asc.asc_CImgProperty(); + props.asc_putLockAspect(btn.pressed); + this.api.asc_setGraphicObjectProps(props); + } }, this)); this.btnOriginalSize = new Common.UI.Button({ @@ -136,8 +169,8 @@ define([ if (this.spinners) { for (var i=0; i0) this._nRatio = props.asc_getWidth()/props.asc_getHeight(); + value = props.asc_getLockAspect(); + if (this._state.keepRatio!==value) { + this.btnRatio.toggle(value); + this._state.keepRatio=value; + } + this.btnOriginalSize.setDisabled(props.asc_getImageUrl()===null || props.asc_getImageUrl()===undefined || this._locked); } }, diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js index c68bfe27e..096c00228 100644 --- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ define([ 'text!spreadsheeteditor/main/app/template/LeftMenu.template', 'jquery', diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index f4d082dbc..cecc98380 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * * NameManagerDlg.js @@ -106,7 +138,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', }; this.rangeList.on('item:select', _.bind(this.onSelectRangeItem, this)) .on('item:keydown', _.bind(this.onKeyDown, this)) - .on('item:dblclick', _.bind(this.onDblClickItem, this)); + .on('item:dblclick', _.bind(this.onDblClickItem, this)) + .on('entervalue', _.bind(this.onDblClickItem, this)); this.btnNewRange = new Common.UI.Button({ el: $('#name-manager-btn-new') @@ -146,7 +179,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', }, onRefreshDefNameList: function() { - this.refreshRangeList(this.api.asc_getDefinedNames(c_oAscGetDefinedNamesList.All), this.currentNamedRange); + this.refreshRangeList(this.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.All), this.currentNamedRange); }, refreshRangeList: function(ranges, selectedItem) { @@ -214,6 +247,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', } _.delay(function () { me.rangeList.cmpEl.find('.listview').focus(); + me.rangeList.scroller.update({alwaysVisibleY: true}); }, 100, this); }, @@ -272,6 +306,9 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', } }).on('close', function() { me.show(); + _.delay(function () { + me.rangeList.cmpEl.find('.listview').focus(); + }, 100, me); }); me.hide(); @@ -312,6 +349,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', this.rangeList.store.sort(); this.rangeList.onResetItems(); + this.rangeList.scroller.update({alwaysVisibleY: true}); }, getUserName: function(id){ @@ -365,7 +403,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', }, onLockDefNameManager: function(state) { - this.locked = (state == c_oAscDefinedNameReason.LockDefNameManager); + this.locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager); }, txtTitle: 'Name Manager', diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js index 750698473..2a94dae67 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * * NamedRangeEditDlg.js @@ -101,12 +133,12 @@ define([ if (isvalid.asc_getStatus() === true) return true; else { switch (isvalid.asc_getReason()) { - case c_oAscDefinedNameReason.IsLocked: + case Asc.c_oAscDefinedNameReason.IsLocked: return me.textIsLocked; break; - case c_oAscDefinedNameReason.Existed: + case Asc.c_oAscDefinedNameReason.Existed: return (me.isEdit && me.props.asc_getName().toLowerCase() == value.toLowerCase()) ? true : me.textExistName; - case c_oAscDefinedNameReason.NameReserved: + case Asc.c_oAscDefinedNameReason.NameReserved: return (me.isEdit) ? me.textReservedName : true; default: return me.textInvalidName; @@ -140,8 +172,8 @@ define([ if (_.isEmpty(value)) { return true; } - var isvalid = me.api.asc_checkDataRange(c_oAscSelectionDialogType.Chart, value, false); - return (isvalid!==c_oAscError.ID.DataRangeError || (me.isEdit && me.props.asc_getRef().toLowerCase() == value.toLowerCase())) ? true : me.textInvalidRange; + var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, value, false); + return (isvalid!==Asc.c_oAscError.ID.DataRangeError || (me.isEdit && me.props.asc_getRef().toLowerCase() == value.toLowerCase())) ? true : me.textInvalidRange; } }).on('keypress:after', function(input, e) { if (e.keyCode === Common.UI.Keys.RETURN) { @@ -266,7 +298,7 @@ define([ }, onLockDefNameManager: function(state) { - this.locked = (state == c_oAscDefinedNameReason.LockDefNameManager); + this.locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager); }, onRefreshDefNameList: function(name) { diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index 72979a869..145913a20 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * * NamedRangePasteDlg.js @@ -80,6 +112,7 @@ define([ return (n10) this.rangeList.selectByIndex(0); + this.rangeList.scroller.update({alwaysVisibleY: true}); + + _.delay(function () { + me.rangeList.cmpEl.find('.listview').focus(); + }, 100, this); } }, @@ -116,7 +154,9 @@ define([ }, onPrimary: function() { - return true; + this.handler && this.handler.call(this, 'ok', this.getSettings()); + this.close(); + return false; }, onDlgBtnClick: function(event) { diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js index 235bfa99d..4ab150835 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ParagraphSettings.js * @@ -266,14 +298,14 @@ define([ if (this.spinners) { for (var i=0; i= 0; i--) { elType = selectedElements[i].asc_getObjectType(); elValue = selectedElements[i].asc_getObjectValue(); - if (c_oAscTypeSelectElement.Paragraph == elType) { + if (Asc.c_oAscTypeSelectElement.Paragraph == elType) { (new SSE.Views.ParagraphSettingsAdvanced( { paragraphProps: elValue, @@ -342,7 +374,7 @@ define([ } }, - strParagraphSpacing: 'Spacing', + strParagraphSpacing: 'Paragraph Spacing', strLineHeight: 'Line Spacing', strSpacingBefore: 'Before', strSpacingAfter: 'After', diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js index 1598cb7c1..284fe4082 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ParagraphSettingsAdvanced.js * @@ -19,7 +51,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. options: { contentWidth: 320, height: 394, - toggleGroup: 'paragraph-adv-settings-group' + toggleGroup: 'paragraph-adv-settings-group', + storageName: 'sse-para-settings-adv-category' }, initialize : function(options) { @@ -304,7 +337,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. var rec = new Common.UI.DataViewModel(); rec.set({ tabPos: pos, - value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()], + value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), tabAlign: tab.asc_getValue() }); arr.push(rec); @@ -324,11 +357,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. if (this.spinners) { for (var i=0; i', '
    ', - '
    ' + this.textPrintRange + '
    ', - '
    ' + this.textPageSize + '
    ', - '
    ' + this.textPageOrientation + '
    ', - '
    ' + this.strMargins + '
    ', -// '
    ' + this.textLayout + '
    ', - '
    ' + this.strPrint + '
    ', + '
    ' + this.textPrintRange + '
    ', + '
    ' + this.textSettings + '
    ', + '
    ' + this.textPageSize + '
    ', + '
    ' + this.textPageOrientation + '
    ', + '
    ' + this.textScaling + '
    ', + '
    ' + this.strMargins + '
    ', + '
    ' + this.strPrint + '
    ', '
    ', - '
    ', '
    ' + _.template(contentTemplate)({scope: this}) + '
    ', '
    ', '
    ', @@ -53,60 +85,61 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', render: function() { Common.Views.AdvancedSettingsWindow.prototype.render.call(this); - this.radioCurrent = new Common.UI.RadioBox({ - el: $('#printadv-dlg-radio-current'), - labelText: this.textCurrentSheet, - name: 'asc-radio-printrange', - checked: true + this.cmbRange = new Common.UI.ComboBox({ + el : $('#printadv-dlg-combo-range'), + style : 'width: 132px;', + menuStyle : 'min-width: 132px;max-height: 280px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: Asc.c_oAscPrintType.ActiveSheets, displayValue: this.textCurrentSheet }, + { value: Asc.c_oAscPrintType.EntireWorkbook, displayValue: this.textAllSheets }, + { value: Asc.c_oAscPrintType.Selection, displayValue: this.textSelection } + ] }); - this.radioCurrent.on('change', _.bind(this.onRadioRangeChange,this)); + this.cmbRange.on('selected', _.bind(this.comboRangeChange, this)); - this.radioAll = new Common.UI.RadioBox({ - el: $('#printadv-dlg-radio-all'), - labelText: this.textAllSheets, - name: 'asc-radio-printrange' + this.cmbSheet = new Common.UI.ComboBox({ + el : $('#printadv-dlg-combo-sheets'), + style : 'width: 242px;', + menuStyle : 'min-width: 242px;max-height: 280px;', + editable : false, + cls : 'input-group-nr', + data : [] }); - this.radioAll.on('change', _.bind(this.onRadioRangeChange,this)); - - this.radioSelection = new Common.UI.RadioBox({ - el: $('#printadv-dlg-radio-selection'), - labelText: this.textSelection, - name: 'asc-radio-printrange' - }); - this.radioSelection.on('change', _.bind(this.onRadioRangeChange,this)); this.cmbPaperSize = new Common.UI.ComboBox({ el : $('#printadv-dlg-combo-pages'), - style : 'width: 260px;', - menuStyle : 'max-height: 280px; min-width: 260px;', + style : 'width: 242px;', + menuStyle : 'max-height: 280px; min-width: 242px;', editable : false, cls : 'input-group-nr', data : [ - {value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)'}, - {value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)'}, - {value:'210|297', displayValue:'A4 (21cm x 29,7cm)'}, - {value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)'}, - {value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)'}, - {value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)'}, - {value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)'}, - {value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)'}, - {value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)'}, - {value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)'}, - {value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)'}, - {value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)'}, - {value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)'} + {value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter'}, + {value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal'}, + {value:'210|297', displayValue:'A4 (21cm x 29,7cm)', caption: 'A4'}, + {value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)', caption: 'A5'}, + {value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)', caption: 'B5'}, + {value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10'}, + {value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)', caption: 'Envelope DL'}, + {value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)', caption: 'Tabloid'}, + {value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)', caption: 'A3'}, + {value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize'}, + {value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'}, + {value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'}, + {value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3'} ] }); this.cmbPaperOrientation = new Common.UI.ComboBox({ el : $('#printadv-dlg-combo-orient'), - style : 'width: 115px;', - menuStyle : 'min-width: 115px;', + style : 'width: 132px;', + menuStyle : 'min-width: 132px;', editable : false, cls : 'input-group-nr', data : [ - { value: c_oAscPageOrientation.PagePortrait, displayValue: this.strPortrait }, - { value: c_oAscPageOrientation.PageLandscape, displayValue: this.strLandscape } + { value: Asc.c_oAscPageOrientation.PagePortrait, displayValue: this.strPortrait }, + { value: Asc.c_oAscPageOrientation.PageLandscape, displayValue: this.strLandscape } ] }); @@ -123,7 +156,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginTop = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-top'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -134,7 +167,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginBottom = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-bottom'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -145,7 +178,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginLeft = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-left'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -156,7 +189,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginRight = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-right'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -164,18 +197,19 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', }); this.spinners.push(this.spnMarginRight); -// this.radioActual = new Common.UI.RadioBox({ -// el: $('#printadv-dlg-radio-actual'), -// labelText: this.textActualSize, -// name: 'asc-radio-printlayout' -// }); -// -// this.radioFit = new Common.UI.RadioBox({ -// el: $('#printadv-dlg-radio-fit'), -// labelText: this.textFit, -// name: 'asc-radio-printlayout', -// checked: true -// }); + this.cmbLayout = new Common.UI.ComboBox({ + el : $('#printadv-dlg-combo-layout'), + style : 'width: 242px;', + menuStyle : 'min-width: 242px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textActualSize }, + { value: 1, displayValue: this.textFitPage }, + { value: 2, displayValue: this.textFitCols }, + { value: 3, displayValue: this.textFitRows } + ] + }); this.btnHide = new Common.UI.Button({ el: $('#printadv-dlg-btn-hide') @@ -185,50 +219,58 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.panelDetails = $('#printadv-dlg-content-to-hide'); this.updateMetricUnit(); this.options.afterrender && this.options.afterrender.call(this); + + var value = Common.localStorage.getItem("sse-hide-print-settings"); + this.extended = (value!==null && parseInt(value)==0); + this.handlerShowDetails(this.btnHide); }, setRange: function(value) { - (value==c_oAscPrintType.ActiveSheets) ? this.radioCurrent.setValue(true) : ((value==c_oAscPrintType.EntireWorkbook) ? this.radioAll.setValue(true) : this.radioSelection.setValue(true)); - }, - - setLayout: function(value) { -// (value==c_oAscLayoutPageType.ActualSize) ? this.radioActual.setValue(true) : this.radioFit.setValue(true); + this.cmbRange.setValue(value); }, getRange: function() { - return (this.radioCurrent.getValue() ? c_oAscPrintType.ActiveSheets : (this.radioAll.getValue() ? c_oAscPrintType.EntireWorkbook : c_oAscPrintType.Selection)); + return this.cmbRange.getValue(); }, - getLayout: function() { -// return (this.radioActual.getValue() ? c_oAscLayoutPageType.ActualSize : c_oAscLayoutPageType.FitToWidth); - }, - - onRadioRangeChange: function(radio, newvalue) { - if (newvalue) - this.fireEvent('changerange', this); + comboRangeChange: function(combo, record) { + this.fireEvent('changerange', this); }, updateMetricUnit: function() { if (this.spinners) { for (var i=0; i .active').removeClass('active'); target_pane.addClass("active"); @@ -162,7 +208,7 @@ define([ target_pane_parent.css("display", "none" ); $(this.el).width(SCALE_MIN); this.minimizedMode = true; - Common.localStorage.setItem("sse-hidden-right-settings", 1); + Common.localStorage.setItem("sse-hide-right-settings", 1); } this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); @@ -191,21 +237,6 @@ define([ return (this.minimizedMode) ? null : $(".settings-panel.active")[0].id; }, - SetDisabled: function(id, disabled, all) { - if (all) { - this.paragraphSettings.disableControls(disabled); - this.shapeSettings.disableControls(disabled); - this.imageSettings.disableControls(disabled); - this.chartSettings.disableControls(disabled); - } else { - var cmp = $("#" + id); - if (disabled !== cmp.hasClass('disabled')) { - cmp.toggleClass('disabled', disabled); - (disabled) ? cmp.attr({disabled: disabled}) : cmp.removeAttr('disabled'); - } - } - }, - clearSelection: function() { var target_pane = $(".right-panel"); target_pane.find('> .active').removeClass('active'); @@ -216,7 +247,6 @@ define([ target_pane.css("display", "none" ); $(this.el).width(SCALE_MIN); this.minimizedMode = true; - Common.localStorage.setItem("sse-hidden-right-settings", 1); Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); }, @@ -224,6 +254,7 @@ define([ txtImageSettings: 'Image Settings', txtShapeSettings: 'Shape Settings', txtTextArtSettings: 'Text Art Settings', - txtChartSettings: 'Chart Settings' + txtChartSettings: 'Chart Settings', + txtTableSettings: 'Table Settings' }, SSE.Views.RightMenu || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js index 11de0f20e..bcf923ac5 100644 --- a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * SetValueDialog.js * diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 462228e96..f52372cef 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeSettings.js * @@ -47,18 +79,20 @@ define([ this._sendUndoPoint = true; this._sliderChanged = false; + this.txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt); + this._state = { Transparency: null, - FillType: c_oAscFill.FILL_TYPE_SOLID, + FillType: Asc.c_oAscFill.FILL_TYPE_SOLID, ShapeColor: 'transparent', - BlipFillType: c_oAscFillBlipType.STRETCH, - StrokeType: c_oAscStrokeType.STROKE_COLOR, + BlipFillType: Asc.c_oAscFillBlipType.STRETCH, + StrokeType: Asc.c_oAscStrokeType.STROKE_COLOR, StrokeWidth: this._pt2mm(1), StrokeColor: '000000', FGColor: '000000', BGColor: 'ffffff', GradColor: '000000', - GradFillType: c_oAscFillGradType.GRAD_LINEAR, + GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, DisabledFillPanels: false, DisabledControls: false, HideShapeOnlySettings: false, @@ -67,10 +101,10 @@ define([ this.lockedControls = []; this._locked = false; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.ShapeColor = {Value: 1, Color: 'transparent'}; // value=1 - цвет определен - прозрачный или другой, value=0 - цвет не определен, рисуем прозрачным - this.BlipFillType = c_oAscFillBlipType.STRETCH; - this.GradFillType = c_oAscFillGradType.GRAD_LINEAR; + this.BlipFillType = Asc.c_oAscFillBlipType.STRETCH; + this.GradFillType = Asc.c_oAscFillGradType.GRAD_LINEAR; this.GradColor = { values: [0, 100], colors: ['000000', 'ffffff'], currentIdx: 0}; this.GradRadialDirectionIdx = 0; this.GradLinearDirectionType = 0; @@ -89,11 +123,11 @@ define([ this.render(); this._arrFillSrc = [ - {displayValue: this.textColor, value: c_oAscFill.FILL_TYPE_SOLID}, - {displayValue: this.textGradientFill, value: c_oAscFill.FILL_TYPE_GRAD}, - {displayValue: this.textImageTexture, value: c_oAscFill.FILL_TYPE_BLIP}, - {displayValue: this.textPatternFill, value: c_oAscFill.FILL_TYPE_PATT}, - {displayValue: this.textNoFill, value: c_oAscFill.FILL_TYPE_NOFILL} + {displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID}, + {displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD}, + {displayValue: this.textImageTexture, value: Asc.c_oAscFill.FILL_TYPE_BLIP}, + {displayValue: this.textPatternFill, value: Asc.c_oAscFill.FILL_TYPE_PATT}, + {displayValue: this.textNoFill, value: Asc.c_oAscFill.FILL_TYPE_NOFILL} ]; this.cmbFillSrc = new Common.UI.ComboBox({ @@ -273,8 +307,8 @@ define([ this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); this._arrFillType = [ - {displayValue: this.textStretch, value: c_oAscFillBlipType.STRETCH}, - {displayValue: this.textTile, value: c_oAscFillBlipType.TILE} + {displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH}, + {displayValue: this.textTile, value: Asc.c_oAscFillBlipType.TILE} ]; this.cmbFillType = new Common.UI.ComboBox({ @@ -333,8 +367,8 @@ define([ this.lblTransparencyEnd = $(this.el).find('#shape-lbl-transparency-end'); this._arrGradType = [ - {displayValue: this.textLinear, value: c_oAscFillGradType.GRAD_LINEAR}, - {displayValue: this.textRadial, value: c_oAscFillGradType.GRAD_PATH} + {displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR}, + {displayValue: this.textRadial, value: Asc.c_oAscFillGradType.GRAD_PATH} ]; this.cmbGradType = new Common.UI.ComboBox({ @@ -545,12 +579,12 @@ define([ onFillSrcSelect: function(combo, record) { this.ShowHideElem(record.value); switch (record.value){ - case c_oAscFill.FILL_TYPE_SOLID: - this._state.FillType = c_oAscFill.FILL_TYPE_SOLID; + case Asc.c_oAscFill.FILL_TYPE_SOLID: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_SOLID; if (!this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_SOLID); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_SOLID); fill.asc_putFill( new Asc.asc_CFillSolid()); fill.asc_getFill().asc_putColor(Common.Utils.ThemeColor.getRgbColor((this.ShapeColor.Color=='transparent') ? {color: '4f81bd', effectId: 24} : this.ShapeColor.Color)); props.asc_putFill(fill); @@ -558,19 +592,19 @@ define([ this.api.asc_setGraphicObjectProps(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_GRAD: - this._state.FillType = c_oAscFill.FILL_TYPE_GRAD; + case Asc.c_oAscFill.FILL_TYPE_GRAD: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_GRAD; if (!this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(), HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex(); @@ -588,15 +622,15 @@ define([ this.api.asc_setGraphicObjectProps(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_BLIP: - this._state.FillType = c_oAscFill.FILL_TYPE_BLIP; + case Asc.c_oAscFill.FILL_TYPE_BLIP: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_BLIP; break; - case c_oAscFill.FILL_TYPE_PATT: - this._state.FillType = c_oAscFill.FILL_TYPE_PATT; + case Asc.c_oAscFill.FILL_TYPE_PATT: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_PATT; if (!this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); fill.asc_getFill().asc_putPatternType(this.PatternFillType); @@ -617,12 +651,12 @@ define([ this.api.asc_setGraphicObjectProps(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_NOFILL: - this._state.FillType = c_oAscFill.FILL_TYPE_NOFILL; + case Asc.c_oAscFill.FILL_TYPE_NOFILL: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; if (!this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_NOFILL); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.asc_putFill(null); props.asc_putFill(fill); this.imgprops.asc_putShapeProperties(props); @@ -642,10 +676,10 @@ define([ var fill = new Asc.asc_CShapeFill(); if (this.ShapeColor.Color=='transparent') { - fill.asc_putType(c_oAscFill.FILL_TYPE_NOFILL); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.asc_putFill(null); } else { - fill.asc_putType(c_oAscFill.FILL_TYPE_SOLID); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_SOLID); fill.asc_putFill( new Asc.asc_CFillSolid()); fill.asc_getFill().asc_putColor(Common.Utils.ThemeColor.getRgbColor(this.ShapeColor.Color)); } @@ -666,10 +700,10 @@ define([ this.PatternFillType = record.get('type'); var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); fill.asc_getFill().asc_putPatternType(this.PatternFillType); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.asc_getFill().asc_putColorFg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); fill.asc_getFill().asc_putColorBg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -686,10 +720,10 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); fill.asc_getFill().asc_putColorFg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.asc_getFill().asc_putPatternType(this.PatternFillType); fill.asc_getFill().asc_putColorBg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -706,9 +740,9 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.asc_getFill().asc_putPatternType(this.PatternFillType); fill.asc_getFill().asc_putColorFg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); } @@ -723,10 +757,10 @@ define([ onFillTypeSelect: function(combo, record) { this.BlipFillType = record.value; - if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == c_oAscFill.FILL_TYPE_BLIP) { + if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == Asc.c_oAscFill.FILL_TYPE_BLIP) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_BLIP); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP); fill.asc_putFill( new Asc.asc_CFillBlip()); fill.asc_getFill().asc_putType(this.BlipFillType); @@ -786,7 +820,7 @@ define([ onGradTypeSelect: function(combo, record){ this.GradFillType = record.value; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { this.mnuDirectionPicker.store.reset(this._viewDataLinear); this.mnuDirectionPicker.cmpEl.width(175); this.mnuDirectionPicker.restoreHeight = 174; @@ -796,7 +830,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - } else if (this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); this.mnuDirectionPicker.cmpEl.width(60); this.mnuDirectionPicker.restoreHeight = 58; @@ -810,10 +844,10 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } @@ -843,12 +877,12 @@ define([ } this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls); - (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; + (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; if (this.api) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); fill.asc_getFill().asc_putLinearAngle(rawData.type * 60000); @@ -871,13 +905,13 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); fill.asc_getFill().asc_putColors([Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]), Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1])]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } @@ -914,13 +948,13 @@ define([ if (this._sliderChanged) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); fill.asc_getFill().asc_putPositions([this.GradColor.values[0]*1000, this.GradColor.values[1]*1000]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } @@ -942,13 +976,13 @@ define([ var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.asc_putType( c_oAscStrokeType.STROKE_NONE); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { - stroke.asc_putType( c_oAscStrokeType.STROKE_COLOR); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); if (this.BorderColor.Color == 'transparent' || this.BorderColor.Color.color == 'transparent') stroke.asc_putColor(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29})); - else if (this._state.StrokeType == c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) + else if (this._state.StrokeType == Asc.c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) stroke.asc_putColor(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(this.BorderColor.Color))); stroke.asc_putWidth(this._pt2mm(this.BorderSize)); } @@ -966,8 +1000,9 @@ define([ onBorderSizeChanged: function(before, combo, record, e) { var me = this; if (before) { - var value = parseFloat(record.value); - if (!(/^\s*(\d*(\.|,)?\d+)\s*(pt)?\s*$/.exec(record.value)) || value<0 || value>1584) { + var value = parseFloat(record.value), + expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); + if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; Common.UI.error({ msg: this.textBorderSizeErr, @@ -993,9 +1028,9 @@ define([ var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.asc_putType( c_oAscStrokeType.STROKE_NONE); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); } else { - stroke.asc_putType( c_oAscStrokeType.STROKE_COLOR); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.asc_putColor(Common.Utils.ThemeColor.getRgbColor(this.BorderColor.Color)); stroke.asc_putWidth(this._pt2mm(this.BorderSize)); } @@ -1017,7 +1052,7 @@ define([ if (me.BlipFillType !== null) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_BLIP); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP); fill.asc_putFill( new Asc.asc_CFillBlip()); fill.asc_getFill().asc_putType(me.BlipFillType); fill.asc_getFill().asc_putUrl(checkUrl); @@ -1045,7 +1080,7 @@ define([ var elType, elValue; for (var i = selectedElements.length - 1; i >= 0; i--) { elType = selectedElements[i].asc_getObjectType(); - if (c_oAscTypeSelectElement.Image == elType) { + if (Asc.c_oAscTypeSelectElement.Image == elType) { elValue = selectedElements[i].asc_getObjectValue(); (new SSE.Views.ShapeSettingsAdvanced( { @@ -1107,13 +1142,13 @@ define([ if (fill===null || fill_type===null) { // заливка не совпадает у неск. фигур this.OriginalFillType = null; - } else if (fill_type==c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет - this.OriginalFillType = c_oAscFill.FILL_TYPE_NOFILL; - } else if (fill_type==c_oAscFill.FILL_TYPE_SOLID) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) { fill = fill.asc_getFill(); color = fill.asc_getColor(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.ShapeColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else { this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; @@ -1121,23 +1156,23 @@ define([ } else this.ShapeColor = {Value: 0, Color: 'transparent'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.FGColor = (this.ShapeColor.Color!=='transparent') ? {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color)} : {Value: 1, Color: '000000'}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.GradColor.colors[0] = (this.ShapeColor.Color!=='transparent') ? Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color) : '000000'; this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_BLIP) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_BLIP) { fill = fill.asc_getFill(); this.BlipFillType = fill.asc_getType(); // null - не совпадают у нескольких фигур if (this._state.BlipFillType !== this.BlipFillType) { - if (this.BlipFillType == c_oAscFillBlipType.STRETCH || this.BlipFillType == c_oAscFillBlipType.TILE) { + if (this.BlipFillType == Asc.c_oAscFillBlipType.STRETCH || this.BlipFillType == Asc.c_oAscFillBlipType.TILE) { this.cmbFillType.setValue(this.BlipFillType); } else this.cmbFillType.setValue(''); this._state.BlipFillType = this.BlipFillType; } - this.OriginalFillType = c_oAscFill.FILL_TYPE_BLIP; - } else if (fill_type==c_oAscFill.FILL_TYPE_PATT) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_BLIP; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_PATT) { fill = fill.asc_getFill(); this.PatternFillType = fill.asc_getPatternType(); // null - не совпадают у нескольких фигур if (this._state.PatternFillType !== this.PatternFillType) { @@ -1152,7 +1187,7 @@ define([ color = fill.asc_getColorFg(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else { this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; @@ -1162,7 +1197,7 @@ define([ color = fill.asc_getColorBg(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else { this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; @@ -1170,17 +1205,17 @@ define([ } else this.BGColor = {Value: 1, Color: 'ffffff'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_PATT; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color); this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_GRAD) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_GRAD) { fill = fill.asc_getFill(); var gradfilltype = fill.asc_getGradType(); // null - не совпадают у нескольких фигур if (this._state.GradFillType !== gradfilltype || this.GradFillType !== gradfilltype) { this.GradFillType = gradfilltype; rec = undefined; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.cmbGradType.setValue(this.GradFillType); rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); this.onGradTypeSelect(this.cmbGradType, rec.attributes); @@ -1191,7 +1226,7 @@ define([ this._state.GradFillType = this.GradFillType; } - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR ) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR ) { var value = Math.floor(fill.asc_getLinearAngle()/60000); if (Math.abs(this.GradLinearDirectionType-value)>0.001) { this.GradLinearDirectionType=value; @@ -1208,7 +1243,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -1219,7 +1254,7 @@ define([ color = colors[1]; if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -1247,7 +1282,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; @@ -1290,10 +1325,10 @@ define([ var strokeType = stroke.asc_getType(); if (stroke) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { color = stroke.asc_getColor(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BorderColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else @@ -1333,10 +1368,10 @@ define([ this._state.StrokeColor = this.BorderColor.Color; } - if (this._state.StrokeType !== strokeType || strokeType == c_oAscStrokeType.STROKE_COLOR) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.asc_getWidth(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !(/pt\s*$/.test(this.cmbBorderSize.getRawValue())); + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; @@ -1350,11 +1385,11 @@ define([ if (_selectedItem) this.cmbBorderSize.selectRecord(_selectedItem); else { - this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' pt' : ''); + this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' ' + this.txtPt : ''); } this.BorderSize = w; } - } else if (strokeType == c_oAscStrokeType.STROKE_NONE) { + } else if (strokeType == Asc.c_oAscStrokeType.STROKE_NONE) { this._state.StrokeWidth = 0; this.BorderSize = this.cmbBorderSize.store.at(0).get('value'); this.cmbBorderSize.setValue(this.BorderSize); @@ -1514,9 +1549,9 @@ define([ if (this.api) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_BLIP); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP); fill.asc_putFill( new Asc.asc_CFillBlip()); - fill.asc_getFill().asc_putType(c_oAscFillBlipType.TILE); + fill.asc_getFill().asc_putType(Asc.c_oAscFillBlipType.TILE); fill.asc_getFill().asc_putTextureId(record.get('type')); props.asc_putFill(fill); this.imgprops.asc_putShapeProperties(props); @@ -1591,11 +1626,11 @@ define([ }, ShowHideElem: function(value) { - this.FillColorContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_SOLID); - this.FillImageContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_BLIP); - this.FillPatternContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_PATT); - this.FillGradientContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_GRAD); - this.TransparencyContainer.toggleClass('settings-hidden', (value === c_oAscFill.FILL_TYPE_NOFILL || value === null)); + this.FillColorContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_SOLID); + this.FillImageContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_BLIP); + this.FillPatternContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_PATT); + this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD); + this.TransparencyContainer.toggleClass('settings-hidden', (value === Asc.c_oAscFill.FILL_TYPE_NOFILL || value === null)); }, setLocked: function (locked) { diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 80ac7fd9f..1b4a697d5 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * ShapeSettingsAdvanced.js * @@ -20,7 +52,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp toggleGroup: 'shape-adv-settings-group', sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, - properties: null + properties: null, + storageName: 'sse-shape-settings-adv-category' }, initialize : function(options) { @@ -117,6 +150,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp if (btn.pressed && this.spnHeight.getNumberValue()>0) { this._nRatio = this.spnWidth.getNumberValue()/this.spnHeight.getNumberValue(); } + if (this._changedProps) { + this._changedProps.asc_putLockAspect(btn.pressed); + } }, this)); // Margins @@ -210,9 +246,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp // Shape this._arrCapType = [ - {displayValue: this.textFlat, value: c_oAscLineCapType.Flat}, - {displayValue: this.textRound, value: c_oAscLineCapType.Round}, - {displayValue: this.textSquare, value: c_oAscLineCapType.Square} + {displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat}, + {displayValue: this.textRound, value: Asc.c_oAscLineCapType.Round}, + {displayValue: this.textSquare, value: Asc.c_oAscLineCapType.Square} ]; this.cmbCapType = new Common.UI.ComboBox({ @@ -222,7 +258,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp editable: false, data: this._arrCapType }); - this.cmbCapType.setValue(c_oAscLineCapType.Flat); + this.cmbCapType.setValue(Asc.c_oAscLineCapType.Flat); this.cmbCapType.on('selected', _.bind(function(combo, record){ if (this._changedProps) { if (this._changedProps.asc_getShapeProperties()===null || this._changedProps.asc_getShapeProperties()===undefined) @@ -235,9 +271,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp }, this)); this._arrJoinType = [ - {displayValue: this.textRound, value: c_oAscLineJoinType.Round}, - {displayValue: this.textBevel, value: c_oAscLineJoinType.Bevel}, - {displayValue: this.textMiter, value: c_oAscLineJoinType.Miter} + {displayValue: this.textRound, value: Asc.c_oAscLineJoinType.Round}, + {displayValue: this.textBevel, value: Asc.c_oAscLineJoinType.Bevel}, + {displayValue: this.textMiter, value: Asc.c_oAscLineJoinType.Miter} ]; this.cmbJoinType = new Common.UI.ComboBox({ el: $('#shape-advanced-join-type'), @@ -246,7 +282,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp editable: false, data: this._arrJoinType }); - this.cmbJoinType.setValue(c_oAscLineJoinType.Round); + this.cmbJoinType.setValue(Asc.c_oAscLineJoinType.Round); this.cmbJoinType.on('selected', _.bind(function(combo, record){ if (this._changedProps) { if (this._changedProps.asc_getShapeProperties()===null || this._changedProps.asc_getShapeProperties()===undefined) @@ -263,25 +299,25 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp for ( var i=0; i<6; i++ ) _arrStyles.push({value: i, offsetx: 80*i+10, offsety: 0}); - _arrStyles[0].type = c_oAscLineBeginType.None; - _arrStyles[1].type = c_oAscLineBeginType.Triangle; - _arrStyles[2].type = c_oAscLineBeginType.Arrow; - _arrStyles[3].type = c_oAscLineBeginType.Stealth; - _arrStyles[4].type = c_oAscLineBeginType.Diamond; - _arrStyles[5].type = c_oAscLineBeginType.Oval; + _arrStyles[0].type = Asc.c_oAscLineBeginType.None; + _arrStyles[1].type = Asc.c_oAscLineBeginType.Triangle; + _arrStyles[2].type = Asc.c_oAscLineBeginType.Arrow; + _arrStyles[3].type = Asc.c_oAscLineBeginType.Stealth; + _arrStyles[4].type = Asc.c_oAscLineBeginType.Diamond; + _arrStyles[5].type = Asc.c_oAscLineBeginType.Oval; for ( i=0; i<9; i++ ) _arrSize.push({value: i, offsetx: 80+10, offsety: 20*(i+1)}); - _arrSize[0].type = c_oAscLineBeginSize.small_small; - _arrSize[1].type = c_oAscLineBeginSize.small_mid; - _arrSize[2].type = c_oAscLineBeginSize.small_large; - _arrSize[3].type = c_oAscLineBeginSize.mid_small; - _arrSize[4].type = c_oAscLineBeginSize.mid_mid; - _arrSize[5].type = c_oAscLineBeginSize.mid_large; - _arrSize[6].type = c_oAscLineBeginSize.large_small; - _arrSize[7].type = c_oAscLineBeginSize.large_mid; - _arrSize[8].type = c_oAscLineBeginSize.large_large; + _arrSize[0].type = Asc.c_oAscLineBeginSize.small_small; + _arrSize[1].type = Asc.c_oAscLineBeginSize.small_mid; + _arrSize[2].type = Asc.c_oAscLineBeginSize.small_large; + _arrSize[3].type = Asc.c_oAscLineBeginSize.mid_small; + _arrSize[4].type = Asc.c_oAscLineBeginSize.mid_mid; + _arrSize[5].type = Asc.c_oAscLineBeginSize.mid_large; + _arrSize[6].type = Asc.c_oAscLineBeginSize.large_small; + _arrSize[7].type = Asc.c_oAscLineBeginSize.large_mid; + _arrSize[8].type = Asc.c_oAscLineBeginSize.large_large; this.btnBeginStyle = new Common.UI.ComboBox({ @@ -404,6 +440,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp afterRender: function() { this.updateMetricUnit(); this._setDefaults(this._originalProps); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, _setDefaults: function(props) { @@ -416,10 +456,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp if (props.asc_getHeight()>0) this._nRatio = props.asc_getWidth()/props.asc_getHeight(); - var value = Common.localStorage.getItem("sse-settings-shaperatio"); - if (value!==null && parseInt(value) == 1) { - this.btnRatio.toggle(true); - } + var value = props.asc_getLockAspect(); + this.btnRatio.toggle(value); this._setShapeDefaults(shapeprops); @@ -441,7 +479,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp }, getSettings: function() { - Common.localStorage.setItem("sse-settings-shaperatio", (this.btnRatio.pressed) ? 1 : 0); return { shapeProps: this._changedProps} ; }, @@ -522,8 +559,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp if (this.spinners) { for (var i=0; i= 0) { var rect = tab.$el.get(0).getBoundingClientRect(), childPos = tab.$el.offset(), diff --git a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js index f0f814216..621f77f49 100644 --- a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TableOptionsDialog.js * @@ -31,8 +63,8 @@ define([ this.template = [ '
    ', - '
    ', - '
    ', + '
    ', + '
    ', '
    ', '
    ', '', @@ -41,6 +73,7 @@ define([ ].join(''); this.options.tpl = _.template(this.template, this.options); + this.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTable; Common.UI.Window.prototype.initialize.call(this, this.options); }, @@ -82,30 +115,39 @@ define([ if (settings.api) { me.api = settings.api; - var options = me.api.asc_getAddFormatTableOptions(); + if (settings.range) { + me.cbTitle.setVisible(false); + me.setHeight(130); + me.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTableChangeRange; + me.inputRange.setValue(settings.range); + me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.FormatTable, settings.range); + } else { + var options = me.api.asc_getAddFormatTableOptions(); + me.inputRange.setValue(options.asc_getRange()); + me.cbTitle.setValue(options.asc_getIsTitle()); + me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.FormatTable, options.asc_getRange()); + } + if (settings.title) + me.setTitle(settings.title); - this.inputRange.setValue(options.asc_getRange()); - this.cbTitle.setValue(options.asc_getIsTitle()); - - me.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.FormatTable, options.asc_getRange()); me.api.asc_unregisterCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); me.api.asc_registerCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); - Common.NotificationCenter.trigger('cells:range', c_oAscSelectionDialogType.FormatTable); + Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.FormatTable); } me.inputRange.validation = function(value) { - var isvalid = me.api.asc_checkDataRange(c_oAscSelectionDialogType.FormatTable, value, false); - return (isvalid==c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true; + var isvalid = me.api.asc_checkDataRange(me.checkRangeType, value, false); + return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true; }; }, getSettings: function () { - var options = this.api.asc_getAddFormatTableOptions(this.inputRange.getValue()); - -// options.asc_setRange(this.inputRange.getValue()); - options.asc_setIsTitle(this.cbTitle.checked); - - return options; + if (this.checkRangeType == Asc.c_oAscSelectionDialogType.FormatTable) { + var options = this.api.asc_getAddFormatTableOptions(this.inputRange.getValue()); + options.asc_setIsTitle(this.cbTitle.checked); + return options; + } else + return this.inputRange.getValue(); }, onApiRangeChanged: function(info) { @@ -115,12 +157,16 @@ define([ }, isRangeValid: function() { - var isvalid = this.api.asc_checkDataRange(c_oAscSelectionDialogType.FormatTable, this.inputRange.getValue(), true); - if (isvalid == c_oAscError.ID.No) + var isvalid = this.api.asc_checkDataRange(this.checkRangeType, this.inputRange.getValue(), true); + if (isvalid == Asc.c_oAscError.ID.No) return true; else { - if (isvalid == c_oAscError.ID.AutoFilterDataRangeError) { + if (isvalid == Asc.c_oAscError.ID.AutoFilterDataRangeError) { Common.UI.warning({msg: this.errorAutoFilterDataRange}); + } else if (isvalid == Asc.c_oAscError.ID.FTChangeTableRangeError) { + Common.UI.warning({msg: this.errorFTChangeTableRangeError}); + } else if (isvalid == Asc.c_oAscError.ID.FTRangeIncludedOtherTables) { + Common.UI.warning({msg: this.errorFTRangeIncludedOtherTables}); } } return false; @@ -132,10 +178,11 @@ define([ onClose: function(event) { if (this.api) - this.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.None); - - Common.NotificationCenter.trigger('cells:range', c_oAscSelectionDialogType.None); + this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); + Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None); Common.NotificationCenter.trigger('edit:complete', this); + + SSE.getController('RightMenu').SetDisabled(false); }, onKeyPress: function(event) { @@ -156,20 +203,18 @@ define([ this.close(); }, -// show: function () { -// Common.UI.Window.prototype.show.call(this); -// -// var me = this; -// _.delay(function () { -// me.inputRange.cmpEl.find('input').focus(); -// }, 500, me); -// }, + show: function () { + Common.UI.Window.prototype.show.call(this); + SSE.getController('RightMenu').SetDisabled(true); + }, txtTitle : 'Title', - txtFormat : 'Format as table', + txtFormat : 'Create table', textCancel : 'Cancel', txtEmpty : 'This field is required', txtInvalidRange: 'ERROR! Invalid cells range', - errorAutoFilterDataRange: 'The operation could not be done for the selected range of cells.
    Select a uniform data range inside or outside the table and try again.' + errorAutoFilterDataRange: 'The operation could not be done for the selected range of cells.
    Select a uniform data range inside or outside the table and try again.', + errorFTChangeTableRangeError: 'Operation could not be completed for the selected cell range.
    Select a range so that the first table row was on the same row
    and the resulting table overlapped the current one.', + errorFTRangeIncludedOtherTables: 'Operation could not be completed for the selected cell range.
    Select a range which does not include other tables.' }, SSE.Views.TableOptionsDialog || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js new file mode 100644 index 000000000..ea051baa9 --- /dev/null +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -0,0 +1,458 @@ +/** + * TableSettings.js + * + * Created by Julia Radzhabova on 3/28/16 + * Copyright (c) 2016 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'text!spreadsheeteditor/main/app/template/TableSettings.template', + 'jquery', + 'underscore', + 'backbone', + 'common/main/lib/component/Button', + 'common/main/lib/component/CheckBox', + 'common/main/lib/component/ComboDataView', + 'spreadsheeteditor/main/app/view/TableOptionsDialog' +], function (menuTemplate, $, _, Backbone) { + 'use strict'; + + SSE.Views.TableSettings = Backbone.View.extend(_.extend({ + el: '#id-table-settings', + + // Compile our stats template + template: _.template(menuTemplate), + + // Delegated events for creating new items, and clearing completed ones. + events: { + }, + + options: { + alias: 'TableSettings' + }, + + initialize: function () { + var me = this; + + this._state = { + TableName: '', + TemplateName: '', + Range: '', + CheckHeader: false, + CheckTotal: false, + CheckBanded: false, + CheckFirst: false, + CheckLast: false, + CheckColBanded: false, + CheckFilter: false, + DisabledControls: false, + TableNameError: false + }; + this.lockedControls = []; + this._locked = false; + + this._originalProps = null; + this._noApply = false; + + this.render(); + + this.chHeader = new Common.UI.CheckBox({ + el: $('#table-checkbox-header'), + labelText: this.textHeader + }); + this.lockedControls.push(this.chHeader); + + this.chTotal = new Common.UI.CheckBox({ + el: $('#table-checkbox-total'), + labelText: this.textTotal + }); + this.lockedControls.push(this.chTotal); + + this.chBanded = new Common.UI.CheckBox({ + el: $('#table-checkbox-banded'), + labelText: this.textBanded + }); + this.lockedControls.push(this.chBanded); + + this.chFirst = new Common.UI.CheckBox({ + el: $('#table-checkbox-first'), + labelText: this.textFirst + }); + this.lockedControls.push(this.chFirst); + + this.chLast = new Common.UI.CheckBox({ + el: $('#table-checkbox-last'), + labelText: this.textLast + }); + this.lockedControls.push(this.chLast); + + this.chColBanded = new Common.UI.CheckBox({ + el: $('#table-checkbox-col-banded'), + labelText: this.textBanded + }); + this.lockedControls.push(this.chColBanded); + + this.chFilter = new Common.UI.CheckBox({ + el: $('#table-checkbox-filter'), + labelText: this.textFilter + }); + this.lockedControls.push(this.chFilter); + + this.chHeader.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.rowHeader)); + this.chTotal.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.rowTotal)); + this.chBanded.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.rowBanded)); + this.chFirst.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.columnFirst)); + this.chLast.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.columnLast)); + this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.columnBanded)); + this.chFilter.on('change', _.bind(this.onCheckTemplateChange, this, Asc.c_oAscChangeTableStyleInfo.filterButton)); + + this.cmbTableTemplate = new Common.UI.ComboDataView({ + itemWidth: 61, + itemHeight: 46, + menuMaxHeight: 300, + enableKeyEvents: true + }); + this.cmbTableTemplate.render($('#table-combo-template')); + this.cmbTableTemplate.openButton.menu.cmpEl.css({ + 'min-width': 175, + 'max-width': 175 + }); + this.cmbTableTemplate.on('click', _.bind(this.onTableTemplateSelect, this)); + this.cmbTableTemplate.openButton.menu.on('show:after', function () { + me.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true}); + }); + this.lockedControls.push(this.cmbTableTemplate); + + this.txtTableName = new Common.UI.InputField({ + el : $('#table-txt-name'), + name : 'tablename', + style : 'width: 100%;', + validateOnBlur: false + }); + this.txtTableName.on('changed:after', _.bind(this.onTableNameChanged, this)); + this.lockedControls.push(this.txtTableName); + + this.btnSelectData = new Common.UI.Button({ + el: $('#table-btn-select-data') + }); + this.btnSelectData.on('click', _.bind(this.onSelectData, this)); + this.lockedControls.push(this.btnSelectData); + + this.btnEdit = new Common.UI.Button({ + cls: 'btn-icon-default', + iconCls: 'btn-edit-table', + menu : new Common.UI.Menu({ + menuAlign: 'tr-br', + items: [ + { caption: this.selectRowText, value: Asc.c_oAscChangeSelectionFormatTable.row, idx: 0 }, + { caption: this.selectColumnText, value: Asc.c_oAscChangeSelectionFormatTable.column, idx: 1 }, + { caption: this.selectDataText, value: Asc.c_oAscChangeSelectionFormatTable.data, idx: 2 }, + { caption: this.selectTableText, value: Asc.c_oAscChangeSelectionFormatTable.all, idx: 3 }, + { caption: '--' }, + { caption: this.insertRowAboveText, value: Asc.c_oAscInsertOptions.InsertTableRowAbove, idx: 4 }, + { caption: this.insertRowBelowText, value: Asc.c_oAscInsertOptions.InsertTableRowBelow, idx: 5 }, + { caption: this.insertColumnLeftText, value: Asc.c_oAscInsertOptions.InsertTableColLeft, idx: 6 }, + { caption: this.insertColumnRightText, value: Asc.c_oAscInsertOptions.InsertTableColRight, idx: 7 }, + { caption: '--' }, + { caption: this.deleteRowText, value: Asc.c_oAscDeleteOptions.DeleteRows, idx: 8 }, + { caption: this.deleteColumnText, value: Asc.c_oAscDeleteOptions.DeleteColumns, idx: 9 }, + { caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable, idx: 10 } + ] + }) + }); + this.btnEdit.render( $('#table-btn-edit')) ; + this.btnEdit.menu.on('show:after', _.bind( function(menu){ + if (this.api) { + menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove()); + menu.items[6].setDisabled(!this._originalProps.asc_getIsInsertRowBelow()); + menu.items[7].setDisabled(!this._originalProps.asc_getIsInsertColumnLeft()); + menu.items[8].setDisabled(!this._originalProps.asc_getIsInsertColumnRight()); + + menu.items[10].setDisabled(!this._originalProps.asc_getIsDeleteRow()); + menu.items[11].setDisabled(!this._originalProps.asc_getIsDeleteColumn()); + menu.items[12].setDisabled(!this._originalProps.asc_getIsDeleteTable()); + } + }, this)); + this.btnEdit.menu.on('item:click', _.bind(this.onEditClick, this)); + this.lockedControls.push(this.btnEdit); + }, + + onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) { + if (this.api) + this.api.asc_changeFormatTableInfo(this._state.TableName, type, newValue=='checked'); + Common.NotificationCenter.trigger('edit:complete', this); + }, + + onTableTemplateSelect: function(combo, record){ + if (this.api && !this._noApply) { + if (this._state.TemplateName) + this.api.asc_changeAutoFilter(this._state.TableName, Asc.c_oAscChangeFilterOptions.style, record.get('name')); + } + Common.NotificationCenter.trigger('edit:complete', this); + }, + + onEditClick: function(menu, item, e) { + if (this.api) { + if (item.options.idx>=0 && item.options.idx<4) + this.api.asc_changeSelectionFormatTable(this._state.TableName, item.value); + else if (item.options.idx>=4 && item.options.idx<8) { + this.api.asc_insertCellsInTable(this._state.TableName, item.value); + } else { + this.api.asc_deleteCellsInTable(this._state.TableName, item.value); + } + } + Common.NotificationCenter.trigger('edit:complete', this); + }, + + onTableNameChanged: function(input, newValue, oldValue) { + var oldName = this._state.TableName; + this._state.TableName = ''; + + if (oldName.toLowerCase() == newValue.toLowerCase()) { + Common.NotificationCenter.trigger('edit:complete', this); + return; + } + + var me = this, + isvalid = this.api.asc_checkDefinedName(newValue, null); + if (isvalid.asc_getStatus() === true) isvalid = true; + else { + switch (isvalid.asc_getReason()) { + case Asc.c_oAscDefinedNameReason.IsLocked: + isvalid = this.textIsLocked; + break; + case Asc.c_oAscDefinedNameReason.Existed: + isvalid = this.textExistName; + break; + case Asc.c_oAscDefinedNameReason.NameReserved: + isvalid = this.textReservedName; + break; + default: + isvalid = this.textInvalidName; + } + } + if (isvalid === true) { + this.api.asc_changeDisplayNameTable(oldName, newValue); + Common.NotificationCenter.trigger('edit:complete', this); + } else if (!this._state.TableNameError) { + this._state.TableNameError = true; + Common.UI.alert({ + msg: isvalid, + title: this.notcriticalErrorTitle, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + Common.NotificationCenter.trigger('edit:complete', this); + me._state.TableNameError = false; + } + }); + } + }, + + render: function () { + var el = $(this.el); + el.html(this.template({ + scope: this + })); + }, + + setApi: function(o) { + this.api = o; + if (o) { + this.api.asc_registerCallback('asc_onInitTablePictures', _.bind(this.onApiInitTableTemplates, this)); + } + return this; + }, + + ChangeSettings: function(props) { + this.disableControls(this._locked); + + if (props )//formatTableInfo + { + this._originalProps = props; + + var value = props.asc_getTableName(); + if (this._state.TableName!==value) { + this.txtTableName.setValue(value); + this._state.TableName=value; + } + + this._state.Range = props.asc_getTableRange(); + + var needTablePictures = false; + value = props.asc_getFirstRow(); + if (this._state.CheckHeader!==value) { + this.chHeader.setValue(value, true); + this._state.CheckHeader=value; + needTablePictures = true; + } + + value = props.asc_getLastRow(); + if (this._state.CheckTotal!==value) { + this.chTotal.setValue(value, true); + this._state.CheckTotal=value; + needTablePictures = true; + } + + value = props.asc_getBandHor(); + if (this._state.CheckBanded!==value) { + this.chBanded.setValue(value, true); + this._state.CheckBanded=value; + needTablePictures = true; + } + + value = props.asc_getFirstCol(); + if (this._state.CheckFirst!==value) { + this.chFirst.setValue(value, true); + this._state.CheckFirst=value; + needTablePictures = true; + } + + value = props.asc_getLastCol(); + if (this._state.CheckLast!==value) { + this.chLast.setValue(value, true); + this._state.CheckLast=value; + needTablePictures = true; + } + + value = props.asc_getBandVer(); + if (this._state.CheckColBanded!==value) { + this.chColBanded.setValue(value, true); + this._state.CheckColBanded=value; + needTablePictures = true; + } + + value = props.asc_getFilterButton(); + if (this._state.CheckFilter!==value) { + this.chFilter.setValue(value, true); + this._state.CheckFilter=value; + } + if (this.chFilter.isDisabled() !== (!this._state.CheckHeader || this._locked || value===null)) + this.chFilter.setDisabled(!this._state.CheckHeader || this._locked || value===null); + + if (needTablePictures) + this.onApiInitTableTemplates(this.api.asc_getTablePictures(props)); + + //for table-template + value = props.asc_getTableStyleName(); + if (this._state.TemplateName!==value || this._isTemplatesChanged) { + this.cmbTableTemplate.suspendEvents(); + var rec = this.cmbTableTemplate.menuPicker.store.findWhere({ + name: value + }); + this.cmbTableTemplate.menuPicker.selectRecord(rec); + this.cmbTableTemplate.resumeEvents(); + + if (this._isTemplatesChanged) { + if (rec) + this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); + else + this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); + } + this._state.TemplateName=value; + } + this._isTemplatesChanged = false; + } + }, + + onApiInitTableTemplates: function(Templates){ + var self = this; + this._isTemplatesChanged = true; + + var count = self.cmbTableTemplate.menuPicker.store.length; + if (count>0 && count==Templates.length) { + var data = self.cmbTableTemplate.menuPicker.store.models; + _.each(Templates, function(template, index){ + data[index].set('imageUrl', template.asc_getImage()); + }); + } else { + self.cmbTableTemplate.menuPicker.store.reset([]); + var arr = []; + _.each(Templates, function(template){ + arr.push({ + id : Common.UI.getId(), + name : template.asc_getName(), + caption : template.asc_getDisplayName(), + type : template.asc_getType(), + imageUrl : template.asc_getImage(), + allowSelected : true, + selected : false + }); + }); + self.cmbTableTemplate.menuPicker.store.add(arr); + } + }, + + onSelectData: function() { + var me = this; + if (me.api) { + var handlerDlg = function(dlg, result) { + if (result == 'ok') { + me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); + me.api.asc_changeTableRange(me._state.TableName, dlg.getSettings()); + } + + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + }; + var win = new SSE.Views.TableOptionsDialog({ + handler: handlerDlg + }); + + win.show(); + win.setSettings({ + api : me.api, + range : me._state.Range, + title: me.textResize + }); + } + }, + + setLocked: function (locked) { + this._locked = locked; + }, + + disableControls: function(disable) { + if (this._state.DisabledControls!==disable) { + this._state.DisabledControls = disable; + _.each(this.lockedControls, function(item) { + item.setDisabled(disable); + }); + } + }, + + textEdit: 'Rows & Columns', + selectRowText : 'Select Row', + selectColumnText : 'Select Entire Column', + selectDataText : 'Select Column Data', + selectTableText : 'Select Table', + insertRowAboveText : 'Insert Row Above', + insertRowBelowText : 'Insert Row Below', + insertColumnLeftText : 'Insert Column Left', + insertColumnRightText : 'Insert Column Right', + deleteRowText : 'Delete Row', + deleteColumnText : 'Delete Column', + deleteTableText : 'Delete Table', + textOK : 'OK', + textCancel : 'Cancel', + textTemplate : 'Select From Template', + textRows : 'Rows', + textColumns : 'Columns', + textHeader : 'Header', + textTotal : 'Total', + textBanded : 'Banded', + textFirst : 'First', + textLast : 'Last', + textEmptyTemplate : 'No templates', + textFilter : 'Filter button', + textTableName : 'Table Name', + textResize : 'Resize table', + textSelectData : 'Select Data', + textInvalidName : 'ERROR! Invalid table name', + textExistName : 'ERROR! Range with such a name already exists', + textIsLocked : 'This element is being edited by another user.', + notcriticalErrorTitle : 'Warning', + textReservedName : 'The name you are trying to use is already referenced in cell formulas. Please use some other name.' + + }, SSE.Views.TableSettings || {})); +}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 4a8093b2f..d8f00f82d 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * TextArtSettings.js * @@ -46,28 +78,30 @@ define([ this._sendUndoPoint = true; this._sliderChanged = false; + this.txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt); + this._state = { Transparency: null, - FillType: c_oAscFill.FILL_TYPE_SOLID, + FillType: Asc.c_oAscFill.FILL_TYPE_SOLID, ShapeColor: 'transparent', - BlipFillType: c_oAscFillBlipType.STRETCH, - StrokeType: c_oAscStrokeType.STROKE_COLOR, + BlipFillType: Asc.c_oAscFillBlipType.STRETCH, + StrokeType: Asc.c_oAscStrokeType.STROKE_COLOR, StrokeWidth: this._pt2mm(1), StrokeColor: '000000', FGColor: '000000', BGColor: 'ffffff', GradColor: '000000', - GradFillType: c_oAscFillGradType.GRAD_LINEAR, + GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, DisabledControls: false }; this.lockedControls = []; this._locked = false; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.ShapeColor = {Value: 1, Color: 'transparent'}; // value=1 - цвет определен - прозрачный или другой, value=0 - цвет не определен, рисуем прозрачным - this.BlipFillType = c_oAscFillBlipType.STRETCH; - this.GradFillType = c_oAscFillGradType.GRAD_LINEAR; + this.BlipFillType = Asc.c_oAscFillBlipType.STRETCH; + this.GradFillType = Asc.c_oAscFillGradType.GRAD_LINEAR; this.GradColor = { values: [0, 100], colors: ['000000', 'ffffff'], currentIdx: 0}; this.GradRadialDirectionIdx = 0; this.GradLinearDirectionType = 0; @@ -103,11 +137,11 @@ define([ this.lockedControls.push(this.cmbTextArt); this._arrFillSrc = [ - {displayValue: this.textColor, value: c_oAscFill.FILL_TYPE_SOLID}, - {displayValue: this.textGradientFill, value: c_oAscFill.FILL_TYPE_GRAD}, - {displayValue: this.textImageTexture, value: c_oAscFill.FILL_TYPE_BLIP}, - {displayValue: this.textPatternFill, value: c_oAscFill.FILL_TYPE_PATT}, - {displayValue: this.textNoFill, value: c_oAscFill.FILL_TYPE_NOFILL} + {displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID}, + {displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD}, + {displayValue: this.textImageTexture, value: Asc.c_oAscFill.FILL_TYPE_BLIP}, + {displayValue: this.textPatternFill, value: Asc.c_oAscFill.FILL_TYPE_PATT}, + {displayValue: this.textNoFill, value: Asc.c_oAscFill.FILL_TYPE_NOFILL} ]; this.cmbFillSrc = new Common.UI.ComboBox({ @@ -288,8 +322,8 @@ define([ this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); this._arrFillType = [ - {displayValue: this.textStretch, value: c_oAscFillBlipType.STRETCH}, - {displayValue: this.textTile, value: c_oAscFillBlipType.TILE} + {displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH}, + {displayValue: this.textTile, value: Asc.c_oAscFillBlipType.TILE} ]; this.cmbFillType = new Common.UI.ComboBox({ @@ -348,8 +382,8 @@ define([ this.lblTransparencyEnd = $(this.el).find('#textart-lbl-transparency-end'); this._arrGradType = [ - {displayValue: this.textLinear, value: c_oAscFillGradType.GRAD_LINEAR}, - {displayValue: this.textRadial, value: c_oAscFillGradType.GRAD_PATH} + {displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR}, + {displayValue: this.textRadial, value: Asc.c_oAscFillGradType.GRAD_PATH} ]; this.cmbGradType = new Common.UI.ComboBox({ @@ -553,7 +587,6 @@ define([ if (this.api) { this.api.asc_setInterfaceDrawImagePlaceTextArt('textart-texture-img'); this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this)); - this.api.asc_registerCallback('asc_onInitEditorTextArts', _.bind(this.fillTransform, this)); } return this; }, @@ -561,12 +594,12 @@ define([ onFillSrcSelect: function(combo, record) { this.ShowHideElem(record.value); switch (record.value){ - case c_oAscFill.FILL_TYPE_SOLID: - this._state.FillType = c_oAscFill.FILL_TYPE_SOLID; + case Asc.c_oAscFill.FILL_TYPE_SOLID: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_SOLID; if (!this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_SOLID); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_SOLID); fill.asc_putFill( new Asc.asc_CFillSolid()); fill.asc_getFill().asc_putColor(Common.Utils.ThemeColor.getRgbColor((this.ShapeColor.Color=='transparent') ? {color: '4f81bd', effectId: 24} : this.ShapeColor.Color)); props.asc_putFill(fill); @@ -574,19 +607,19 @@ define([ this.api.asc_setGraphicObjectProps(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_GRAD: - this._state.FillType = c_oAscFill.FILL_TYPE_GRAD; + case Asc.c_oAscFill.FILL_TYPE_GRAD: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_GRAD; if (!this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(), HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex(); @@ -604,15 +637,15 @@ define([ this.api.asc_setGraphicObjectProps(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_BLIP: - this._state.FillType = c_oAscFill.FILL_TYPE_BLIP; + case Asc.c_oAscFill.FILL_TYPE_BLIP: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_BLIP; break; - case c_oAscFill.FILL_TYPE_PATT: - this._state.FillType = c_oAscFill.FILL_TYPE_PATT; + case Asc.c_oAscFill.FILL_TYPE_PATT: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_PATT; if (!this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); fill.asc_getFill().asc_putPatternType(this.PatternFillType); @@ -632,12 +665,12 @@ define([ this.api.asc_setGraphicObjectProps(this.imgprops); } break; - case c_oAscFill.FILL_TYPE_NOFILL: - this._state.FillType = c_oAscFill.FILL_TYPE_NOFILL; + case Asc.c_oAscFill.FILL_TYPE_NOFILL: + this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; if (!this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_NOFILL); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.asc_putFill(null); props.asc_putFill(fill); this.shapeprops.put_TextArtProperties(props); @@ -657,10 +690,10 @@ define([ var fill = new Asc.asc_CShapeFill(); if (this.ShapeColor.Color=='transparent') { - fill.asc_putType(c_oAscFill.FILL_TYPE_NOFILL); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_NOFILL); fill.asc_putFill(null); } else { - fill.asc_putType(c_oAscFill.FILL_TYPE_SOLID); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_SOLID); fill.asc_putFill( new Asc.asc_CFillSolid()); fill.asc_getFill().asc_putColor(Common.Utils.ThemeColor.getRgbColor(this.ShapeColor.Color)); } @@ -681,10 +714,10 @@ define([ this.PatternFillType = record.get('type'); var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); fill.asc_getFill().asc_putPatternType(this.PatternFillType); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.asc_getFill().asc_putColorFg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); fill.asc_getFill().asc_putColorBg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -701,10 +734,10 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); fill.asc_getFill().asc_putColorFg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.asc_getFill().asc_putPatternType(this.PatternFillType); fill.asc_getFill().asc_putColorBg(Common.Utils.ThemeColor.getRgbColor(this.BGColor.Color)); } @@ -721,9 +754,9 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_PATT); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_PATT); fill.asc_putFill( new Asc.asc_CFillHatch()); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_PATT) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_PATT) { fill.asc_getFill().asc_putPatternType(this.PatternFillType); fill.asc_getFill().asc_putColorFg(Common.Utils.ThemeColor.getRgbColor(this.FGColor.Color)); } @@ -738,10 +771,10 @@ define([ onFillTypeSelect: function(combo, record) { this.BlipFillType = record.value; - if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == c_oAscFill.FILL_TYPE_BLIP) { + if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == Asc.c_oAscFill.FILL_TYPE_BLIP) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_BLIP); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP); fill.asc_putFill( new Asc.asc_CFillBlip()); fill.asc_getFill().asc_putType(this.BlipFillType); @@ -801,7 +834,7 @@ define([ onGradTypeSelect: function(combo, record){ this.GradFillType = record.value; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { this.mnuDirectionPicker.store.reset(this._viewDataLinear); this.mnuDirectionPicker.cmpEl.width(175); this.mnuDirectionPicker.restoreHeight = 174; @@ -811,7 +844,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - } else if (this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); this.mnuDirectionPicker.cmpEl.width(60); this.mnuDirectionPicker.restoreHeight = 58; @@ -825,10 +858,10 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } @@ -858,12 +891,12 @@ define([ } this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls); - (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; + (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0; if (this.api) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); fill.asc_getFill().asc_putLinearAngle(rawData.type * 60000); @@ -886,13 +919,13 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); fill.asc_getFill().asc_putColors([Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]), Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1])]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } @@ -929,13 +962,13 @@ define([ if (this._sliderChanged) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_GRAD); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); fill.asc_putFill( new Asc.asc_CFillGrad()); fill.asc_getFill().asc_putGradType(this.GradFillType); fill.asc_getFill().asc_putPositions([this.GradColor.values[0]*1000, this.GradColor.values[1]*1000]); - if (this.OriginalFillType !== c_oAscFill.FILL_TYPE_GRAD) { - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR) { + if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.asc_getFill().asc_putLinearAngle(this.GradLinearDirectionType * 60000); fill.asc_getFill().asc_putLinearScale(true); } @@ -957,13 +990,13 @@ define([ var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.asc_putType( c_oAscStrokeType.STROKE_NONE); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { - stroke.asc_putType( c_oAscStrokeType.STROKE_COLOR); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); if (this.BorderColor.Color == 'transparent' || this.BorderColor.Color.color == 'transparent') stroke.asc_putColor(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29})); - else if (this._state.StrokeType == c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) + else if (this._state.StrokeType == Asc.c_oAscStrokeType.STROKE_NONE || this._state.StrokeType === null) stroke.asc_putColor(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(this.BorderColor.Color))); stroke.asc_putWidth(this._pt2mm(this.BorderSize)); } @@ -981,8 +1014,9 @@ define([ onBorderSizeChanged: function(before, combo, record, e) { var me = this; if (before) { - var value = parseFloat(record.value); - if (!(/^\s*(\d*(\.|,)?\d+)\s*(pt)?\s*$/.exec(record.value)) || value<0 || value>1584) { + var value = parseFloat(record.value), + expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); + if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; Common.UI.error({ msg: this.textBorderSizeErr, @@ -1008,9 +1042,9 @@ define([ var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); if (this.BorderSize<0.01) { - stroke.asc_putType( c_oAscStrokeType.STROKE_NONE); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); } else { - stroke.asc_putType( c_oAscStrokeType.STROKE_COLOR); + stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.asc_putColor(Common.Utils.ThemeColor.getRgbColor(this.BorderColor.Color)); stroke.asc_putWidth(this._pt2mm(this.BorderSize)); } @@ -1032,7 +1066,7 @@ define([ if (me.BlipFillType !== null) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_BLIP); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP); fill.asc_putFill( new Asc.asc_CFillBlip()); fill.asc_getFill().asc_putType(me.BlipFillType); fill.asc_getFill().asc_putUrl(checkUrl); @@ -1089,13 +1123,13 @@ define([ if (fill===null || fill===undefined || fill_type===null) { // заливка не совпадает у неск. фигур this.OriginalFillType = null; - } else if (fill_type==c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет - this.OriginalFillType = c_oAscFill.FILL_TYPE_NOFILL; - } else if (fill_type==c_oAscFill.FILL_TYPE_SOLID) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) { fill = fill.asc_getFill(); color = fill.asc_getColor(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.ShapeColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else { this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; @@ -1103,23 +1137,23 @@ define([ } else this.ShapeColor = {Value: 0, Color: 'transparent'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; this.FGColor = (this.ShapeColor.Color!=='transparent') ? {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color)} : {Value: 1, Color: '000000'}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.GradColor.colors[0] = (this.ShapeColor.Color!=='transparent') ? Common.Utils.ThemeColor.colorValue2EffectId(this.ShapeColor.Color) : '000000'; this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_BLIP) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_BLIP) { fill = fill.asc_getFill(); this.BlipFillType = fill.asc_getType(); // null - не совпадают у нескольких фигур if (this._state.BlipFillType !== this.BlipFillType) { - if (this.BlipFillType == c_oAscFillBlipType.STRETCH || this.BlipFillType == c_oAscFillBlipType.TILE) { + if (this.BlipFillType == Asc.c_oAscFillBlipType.STRETCH || this.BlipFillType == Asc.c_oAscFillBlipType.TILE) { this.cmbFillType.setValue(this.BlipFillType); } else this.cmbFillType.setValue(''); this._state.BlipFillType = this.BlipFillType; } - this.OriginalFillType = c_oAscFill.FILL_TYPE_BLIP; - } else if (fill_type==c_oAscFill.FILL_TYPE_PATT) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_BLIP; + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_PATT) { fill = fill.asc_getFill(); this.PatternFillType = fill.asc_getPatternType(); // null - не совпадают у нескольких фигур if (this._state.PatternFillType !== this.PatternFillType) { @@ -1134,7 +1168,7 @@ define([ color = fill.asc_getColorFg(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else { this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; @@ -1144,7 +1178,7 @@ define([ color = fill.asc_getColorBg(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else { this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; @@ -1152,17 +1186,17 @@ define([ } else this.BGColor = {Value: 1, Color: 'ffffff'}; - this.OriginalFillType = c_oAscFill.FILL_TYPE_PATT; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; this.ShapeColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color); this.GradColor.colors[1] = 'ffffff'; - } else if (fill_type==c_oAscFill.FILL_TYPE_GRAD) { + } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_GRAD) { fill = fill.asc_getFill(); var gradfilltype = fill.asc_getGradType(); // null - не совпадают у нескольких фигур if (this._state.GradFillType !== gradfilltype || this.GradFillType !== gradfilltype) { this.GradFillType = gradfilltype; rec = undefined; - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == c_oAscFillGradType.GRAD_PATH) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.cmbGradType.setValue(this.GradFillType); rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); this.onGradTypeSelect(this.cmbGradType, rec.attributes); @@ -1173,7 +1207,7 @@ define([ this._state.GradFillType = this.GradFillType; } - if (this.GradFillType == c_oAscFillGradType.GRAD_LINEAR ) { + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR ) { var value = Math.floor(fill.asc_getLinearAngle()/60000); if (Math.abs(this.GradLinearDirectionType-value)>0.001) { this.GradLinearDirectionType=value; @@ -1190,7 +1224,7 @@ define([ if (colors && colors.length>0) { color = colors[0]; if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[0] = {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0]); } else { @@ -1201,7 +1235,7 @@ define([ color = colors[1]; if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.GradColor.colors[1] = {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue()}; Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[1]); } else { @@ -1229,7 +1263,7 @@ define([ this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(this.GradColor.colors[1]) == 'object') ? this.GradColor.colors[1].color : this.GradColor.colors[1]), 1); this.sldrGradient.setValue(0, this.GradColor.values[0]); this.sldrGradient.setValue(1, this.GradColor.values[1]); - this.OriginalFillType = c_oAscFill.FILL_TYPE_GRAD; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; @@ -1272,10 +1306,10 @@ define([ strokeType = (stroke) ? stroke.asc_getType() : null; if (stroke) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { color = stroke.asc_getColor(); if (color) { - if (color.asc_getType() == c_oAscColor.COLOR_TYPE_SCHEME) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { this.BorderColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; } else @@ -1314,10 +1348,10 @@ define([ this._state.StrokeColor = this.BorderColor.Color; } - if (this._state.StrokeType !== strokeType || strokeType == c_oAscStrokeType.STROKE_COLOR) { - if ( strokeType == c_oAscStrokeType.STROKE_COLOR ) { + if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { + if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.asc_getWidth(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !(/pt\s*$/.test(this.cmbBorderSize.getRawValue())); + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; @@ -1331,11 +1365,11 @@ define([ if (_selectedItem) this.cmbBorderSize.selectRecord(_selectedItem); else { - this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' pt' : ''); + this.cmbBorderSize.setValue((w!==null) ? parseFloat(w.toFixed(2)) + ' ' + this.txtPt : ''); } this.BorderSize = w; } - } else if (strokeType == c_oAscStrokeType.STROKE_NONE) { + } else if (strokeType == Asc.c_oAscStrokeType.STROKE_NONE) { this._state.StrokeWidth = 0; this.BorderSize = this.cmbBorderSize.store.at(0).get('value'); this.cmbBorderSize.setValue(this.BorderSize); @@ -1469,6 +1503,7 @@ define([ } this.UpdateThemeColors(); + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); }, onInitStandartTextures: function(texture) { @@ -1503,9 +1538,9 @@ define([ if (this.api) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); - fill.asc_putType(c_oAscFill.FILL_TYPE_BLIP); + fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP); fill.asc_putFill( new Asc.asc_CFillBlip()); - fill.asc_getFill().asc_putType(c_oAscFillBlipType.TILE); + fill.asc_getFill().asc_putType(Asc.c_oAscFillBlipType.TILE); fill.asc_getFill().asc_putTextureId(record.get('type')); props.asc_putFill(fill); this.shapeprops.put_TextArtProperties(props); @@ -1591,11 +1626,11 @@ define([ }, ShowHideElem: function(value) { - this.FillColorContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_SOLID); - this.FillImageContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_BLIP); - this.FillPatternContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_PATT); - this.FillGradientContainer.toggleClass('settings-hidden', value !== c_oAscFill.FILL_TYPE_GRAD); - this.TransparencyContainer.toggleClass('settings-hidden', (value === c_oAscFill.FILL_TYPE_NOFILL || value === null)); + this.FillColorContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_SOLID); + this.FillImageContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_BLIP); + this.FillPatternContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_PATT); + this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD); + this.TransparencyContainer.toggleClass('settings-hidden', (value === Asc.c_oAscFill.FILL_TYPE_NOFILL || value === null)); }, setLocked: function (locked) { diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 59b8393db..941da9cc5 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Toolbar.js * @@ -90,18 +122,18 @@ define([ }; me.numFormatTypes = {}; - me.numFormatTypes[c_oAscNumFormatType.General] = me.txtGeneral; - me.numFormatTypes[c_oAscNumFormatType.Custom] = me.txtCustom; - me.numFormatTypes[c_oAscNumFormatType.Text] = me.txtText; - me.numFormatTypes[c_oAscNumFormatType.Number] = me.txtNumber; - me.numFormatTypes[c_oAscNumFormatType.Integer] = me.txtInteger; - me.numFormatTypes[c_oAscNumFormatType.Scientific] = me.txtScientific; - me.numFormatTypes[c_oAscNumFormatType.Currency] = me.txtCurrency; - me.numFormatTypes[c_oAscNumFormatType.Accounting] = me.txtAccounting; - me.numFormatTypes[c_oAscNumFormatType.Date] = me.txtDate; - me.numFormatTypes[c_oAscNumFormatType.Time] = me.txtTime; - me.numFormatTypes[c_oAscNumFormatType.Percent] = me.txtPercentage; - me.numFormatTypes[c_oAscNumFormatType.Fraction] = me.txtFraction; + me.numFormatTypes[Asc.c_oAscNumFormatType.General] = me.txtGeneral; + me.numFormatTypes[Asc.c_oAscNumFormatType.Custom] = me.txtCustom; + me.numFormatTypes[Asc.c_oAscNumFormatType.Text] = me.txtText; + me.numFormatTypes[Asc.c_oAscNumFormatType.Number] = me.txtNumber; + me.numFormatTypes[Asc.c_oAscNumFormatType.Integer] = me.txtInteger; + me.numFormatTypes[Asc.c_oAscNumFormatType.Scientific] = me.txtScientific; + me.numFormatTypes[Asc.c_oAscNumFormatType.Currency] = me.txtCurrency; + me.numFormatTypes[Asc.c_oAscNumFormatType.Accounting] = me.txtAccounting; + me.numFormatTypes[Asc.c_oAscNumFormatType.Date] = me.txtDate; + me.numFormatTypes[Asc.c_oAscNumFormatType.Time] = me.txtTime; + me.numFormatTypes[Asc.c_oAscNumFormatType.Percent] = me.txtPercentage; + me.numFormatTypes[Asc.c_oAscNumFormatType.Fraction] = me.txtFraction; function dummyCmp() { return { @@ -165,21 +197,8 @@ define([ id : 'id-toolbar-btn-print', cls : 'btn-toolbar', iconCls : 'btn-print', - split : true, hint : me.tipPrint + Common.Utils.String.platformKey('Ctrl+P'), - lock : [_set.editCell, _set.cantPrint], - menu : new Common.UI.Menu({ - items: [ - { - caption: me.textPrint, - value: 'print' - }, - { - caption: me.textPrintOptions, - value: 'options' - } - ] - }) + lock : [_set.editCell, _set.cantPrint] }); me.btnSave = new Common.UI.Button({ @@ -380,25 +399,25 @@ define([ caption : me.textTopBorders, iconCls : 'mnu-border-top', icls : 'btn-border-top', - borderId : c_oAscBorderOptions.Top + borderId : Asc.c_oAscBorderOptions.Top }, { caption : me.textBottomBorders, iconCls : 'mnu-border-bottom', icls : 'btn-border-bottom', - borderId : c_oAscBorderOptions.Bottom + borderId : Asc.c_oAscBorderOptions.Bottom }, { caption : me.textLeftBorders, iconCls : 'mnu-border-left', icls : 'btn-border-left', - borderId : c_oAscBorderOptions.Left + borderId : Asc.c_oAscBorderOptions.Left }, { caption : me.textRightBorders, iconCls : 'mnu-border-right', icls : 'btn-border-right', - borderId : c_oAscBorderOptions.Right + borderId : Asc.c_oAscBorderOptions.Right }, { caption : me.textNoBorders, @@ -417,25 +436,25 @@ define([ caption : me.textCenterBorders, iconCls : 'mnu-border-vmiddle', icls : 'btn-border-vmiddle', - borderId : c_oAscBorderOptions.InnerV + borderId : Asc.c_oAscBorderOptions.InnerV }, { caption : me.textMiddleBorders, iconCls : 'mnu-border-hmiddle', icls : 'btn-border-hmiddle', - borderId : c_oAscBorderOptions.InnerH + borderId : Asc.c_oAscBorderOptions.InnerH }, { caption : me.textDiagUpBorder, iconCls : 'mnu-border-diagup', icls : 'btn-border-diagup', - borderId : c_oAscBorderOptions.DiagU + borderId : Asc.c_oAscBorderOptions.DiagU }, { caption : me.textDiagDownBorder, iconCls : 'mnu-border-diagdown', icls : 'btn-border-diagdown', - borderId : c_oAscBorderOptions.DiagD + borderId : Asc.c_oAscBorderOptions.DiagD }, {caption: '--'}, { @@ -557,19 +576,19 @@ define([ items: [ { caption : me.txtMergeCenter, - value : c_oAscMergeOptions.MergeCenter + value : Asc.c_oAscMergeOptions.MergeCenter }, { caption : me.txtMergeAcross, - value : c_oAscMergeOptions.MergeAcross + value : Asc.c_oAscMergeOptions.MergeAcross }, { caption : me.txtMergeCells, - value : c_oAscMergeOptions.Merge + value : Asc.c_oAscMergeOptions.Merge }, { caption : me.txtUnmerge, - value : c_oAscMergeOptions.Unmerge + value : Asc.c_oAscMergeOptions.Unmerge } ] }) @@ -1098,7 +1117,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-named-range', hint : me.txtNamedRange, - lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.selRange], menu : new Common.UI.Menu({ style : 'min-width: 110px', items : [ @@ -1131,27 +1150,27 @@ define([ items : [ { caption : me.txtClearAll, - value : c_oAscCleanOptions.All + value : Asc.c_oAscCleanOptions.All }, { caption : me.txtClearText, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.coAuth], - value : c_oAscCleanOptions.Text + value : Asc.c_oAscCleanOptions.Text }, { caption : me.txtClearFormat, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.coAuth], - value : c_oAscCleanOptions.Format + value : Asc.c_oAscCleanOptions.Format }, { caption : me.txtClearComments, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.coAuth], - value : c_oAscCleanOptions.Comments + value : Asc.c_oAscCleanOptions.Comments }, { caption : me.txtClearHyper, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.coAuth], - value : c_oAscCleanOptions.Hyperlinks + value : Asc.c_oAscCleanOptions.Hyperlinks } ] }) @@ -1176,19 +1195,19 @@ define([ items : [ { caption : me.textInsRight, - value : c_oAscInsertOptions.InsertCellsAndShiftRight + value : Asc.c_oAscInsertOptions.InsertCellsAndShiftRight }, { caption : me.textInsDown, - value : c_oAscInsertOptions.InsertCellsAndShiftDown + value : Asc.c_oAscInsertOptions.InsertCellsAndShiftDown }, { caption : me.textEntireRow, - value : c_oAscInsertOptions.InsertRows + value : Asc.c_oAscInsertOptions.InsertRows }, { caption : me.textEntireCol, - value : c_oAscInsertOptions.InsertColumns + value : Asc.c_oAscInsertOptions.InsertColumns } ] }) @@ -1204,19 +1223,19 @@ define([ items : [ { caption : me.textDelLeft, - value : c_oAscDeleteOptions.DeleteCellsAndShiftLeft + value : Asc.c_oAscDeleteOptions.DeleteCellsAndShiftLeft }, { caption : me.textDelUp, - value : c_oAscDeleteOptions.DeleteCellsAndShiftTop + value : Asc.c_oAscDeleteOptions.DeleteCellsAndShiftTop }, { caption : me.textEntireRow, - value : c_oAscDeleteOptions.DeleteRows + value : Asc.c_oAscDeleteOptions.DeleteRows }, { caption : me.textEntireCol, - value : c_oAscDeleteOptions.DeleteColumns + value : Asc.c_oAscDeleteOptions.DeleteColumns } ] }) @@ -1435,13 +1454,13 @@ define([ caption : me.txtSortAZ, iconCls : 'mnu-sort-asc', lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.coAuth, _set.ruleFilter], - value : 'ascending' + value : Asc.c_oAscSortOptions.Ascending }), me.mnuitemSortZA = new Common.UI.MenuItem({ caption : me.txtSortZA, iconCls : 'mnu-sort-desc', lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.coAuth, _set.ruleFilter], - value : 'descending' + value : Asc.c_oAscSortOptions.Descending }), me.mnuitemAutoFilter = new Common.UI.MenuItem({ caption : me.txtFilter, @@ -1470,8 +1489,6 @@ define([ }) }); - me.mnuPrint = me.btnPrint.menu; - me.lockControls = [ me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold, me.btnItalic, me.btnUnderline, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft, diff --git a/apps/spreadsheeteditor/main/app/view/Viewport.js b/apps/spreadsheeteditor/main/app/view/Viewport.js index 8cad8b9d4..9423fab86 100644 --- a/apps/spreadsheeteditor/main/app/view/Viewport.js +++ b/apps/spreadsheeteditor/main/app/view/Viewport.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ /** * Viewport.js * diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js new file mode 100644 index 000000000..289c3dace --- /dev/null +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -0,0 +1,214 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * app.js + * + * Created by Maxim Kadushkin on 21 March 2014 + * Copyright (c) 2014 Ascensio System SIA. All rights reserved. + * + */ + +'use strict'; +var reqerr; +require.config({ + // The shim config allows us to configure dependencies for + // scripts that do not call define() to register a module + baseUrl: '../../', + paths: { + jquery : '../vendor/jquery/jquery', + underscore : '../vendor/underscore/underscore', + backbone : '../vendor/backbone/backbone', + bootstrap : '../vendor/bootstrap/dist/js/bootstrap', + text : '../vendor/requirejs-text/text', + perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', + jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', + xregexp : '../vendor/xregexp/xregexp-all-min', + sockjs : '../vendor/sockjs/sockjs.min', + jsziputils : '../vendor/jszip-utils/jszip-utils.min', + jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', + api : 'api/documents/api', + core : 'common/main/lib/core/application', + notification : 'common/main/lib/core/NotificationCenter', + keymaster : 'common/main/lib/core/keymaster', + tip : 'common/main/lib/util/Tip', + localstorage : 'common/main/lib/util/LocalStorage', + analytics : 'common/Analytics', + gateway : 'common/Gateway', + locale : 'common/locale', + irregularstack : 'common/IrregularStack' + }, + shim: { + underscore: { + exports: '_' + }, + backbone: { + deps: [ + 'underscore', + 'jquery' + ], + exports: 'Backbone' + }, + bootstrap: { + deps: [ + 'jquery' + ] + }, + perfectscrollbar: { + deps: [ + 'jmousewheel' + ] + }, + notification: { + deps: [ + 'backbone' + ] + }, + core: { + deps: [ + 'backbone', + 'notification', + 'irregularstack' + ] + }, + gateway: { + deps: [ + 'jquery' + ] + }, + analytics: { + deps: [ + 'jquery' + ] + } + } +}); + +require([ + 'backbone', + 'bootstrap', + 'core', + 'api', + 'analytics', + 'gateway', + 'locale', + 'jsziputils', + 'jsrsasign', + 'sockjs', + 'underscore' +], function (Backbone, Bootstrap, Core) { + Backbone.history.start(); + + /** + * Application instance with SSE namespace defined + */ + var app = new Backbone.Application({ + nameSpace: 'SSE', + autoCreate: false, + controllers : [ + 'Viewport', + 'DocumentHolder', + 'CellEditor', + 'FormulaDialog', + 'Print', + 'Toolbar', + 'Statusbar', + 'RightMenu', + 'LeftMenu', + 'Main', + 'Common.Controllers.Fonts', + 'Common.Controllers.Chat', + 'Common.Controllers.Comments' + ] + }); + + Common.Locale.apply(); + + require([ + 'spreadsheeteditor/main/app/controller/Viewport', + 'spreadsheeteditor/main/app/controller/DocumentHolder', + 'spreadsheeteditor/main/app/controller/CellEditor', + 'spreadsheeteditor/main/app/controller/Toolbar', + 'spreadsheeteditor/main/app/controller/Statusbar', + 'spreadsheeteditor/main/app/controller/RightMenu', + 'spreadsheeteditor/main/app/controller/LeftMenu', + 'spreadsheeteditor/main/app/controller/Main', + 'spreadsheeteditor/main/app/controller/Print', + 'spreadsheeteditor/main/app/view/ParagraphSettings', + 'spreadsheeteditor/main/app/view/ImageSettings', + 'spreadsheeteditor/main/app/view/ChartSettings', + 'spreadsheeteditor/main/app/view/ShapeSettings', + 'spreadsheeteditor/main/app/view/TextArtSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts', + 'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat' + ], function() { + app.start(); + }); +}, function(err) { + if (err.requireType == 'timeout' && !reqerr) { + var getUrlParams = function() { + var e, + a = /\+/g, // Regex for replacing addition symbol with a space + r = /([^&=]+)=?([^&]*)/g, + d = function (s) { return decodeURIComponent(s.replace(a, " ")); }, + q = window.location.search.substring(1), + urlParams = {}; + + while (e = r.exec(q)) + urlParams[d(e[1])] = d(e[2]); + + return urlParams; + }; + + var encodeUrlParam = function(str) { + return str.replace(/&/g, '&') + .replace(/"/g, '"') + .replace(/'/g, ''') + .replace(//g, '>'); + }; + + var lang = (getUrlParams()["lang"] || 'en').split("-")[0]; + + if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; + else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; + else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; + else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; + else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; + + window.alert(reqerr); + window.location.reload(); + } +}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 42afda532..c44092db7 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -6,7 +6,7 @@ - + @@ -231,13 +231,27 @@
    + + + + + + + + - + diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 1a9d3ca55..39ff60dad 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -8,7 +8,7 @@ - + diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index e20a2ef35..a7d59f0f0 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruština", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "jako Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Obecný", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Tisk", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Tisk", "SSE.Views.FormulaDialog.cancelButtonText": "Zrušit", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "Vše", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Skutečná velikost", "SSE.Views.PrintSettings.textAllSheets": "Všechny listy", "SSE.Views.PrintSettings.textCurrentSheet": "Aktuální list", - "SSE.Views.PrintSettings.textFit": "Přizpůsobit šířce", + "del_SSE.Views.PrintSettings.textFit": "Přizpůsobit šířce", "SSE.Views.PrintSettings.textHideDetails": "Skrýt podrobnosti", "SSE.Views.PrintSettings.textLayout": "Rozložení", "SSE.Views.PrintSettings.textPageOrientation": "Otočení stránky", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 4814cad60..82f184436 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Allgemein", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Drucken", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Drucken", "SSE.Views.FormulaDialog.cancelButtonText": "Abbrechen", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Volle Größe", "SSE.Views.PrintSettings.textAllSheets": "Alle Blätter", "SSE.Views.PrintSettings.textCurrentSheet": "Aktuelles Blatt", - "SSE.Views.PrintSettings.textFit": "An Breite anpassen", + "del_SSE.Views.PrintSettings.textFit": "An Breite anpassen", "SSE.Views.PrintSettings.textHideDetails": "Details ausblenden", "SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Seitenorientierung", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 7a1a40a71..d46e386b2 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1,4 +1,6 @@ { + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", "cancelButtonText": "Cancel", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", @@ -91,6 +93,7 @@ "SSE.Controllers.DocumentHolder.tipIsLocked": "This element is being edited by another user.", "SSE.Controllers.DocumentHolder.txtHeight": "Height", "SSE.Controllers.DocumentHolder.txtRowHeight": "Row Height", + "SSE.Controllers.DocumentHolder.textSym": "sym", "SSE.Controllers.DocumentHolder.txtWidth": "Width", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.textByColumns": "By columns", @@ -109,6 +112,7 @@ "SSE.Controllers.LeftMenu.textWorkbook": "Workbook", "SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", "SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?", + "SSE.Controllers.Main.confirmPutMergeRange": "The source data contains merged cells.
    They will be unmerged before they are pasted into the table.", "SSE.Controllers.Main.convertationErrorText": "Conversion failed.", "SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", @@ -179,10 +183,12 @@ "SSE.Controllers.Main.saveTextText": "Saving spreadsheet...", "SSE.Controllers.Main.saveTitleText": "Saving Spreadsheet", "SSE.Controllers.Main.textAnonymous": "Anonymous", + "SSE.Controllers.Main.textBuyNow": "Buy now", "SSE.Controllers.Main.textCloseTip": "\nClick to close the tip", "SSE.Controllers.Main.textConfirm": "Confirmation", - "SSE.Controllers.Main.textLoadingDocument": "Loading document", + "SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet", "SSE.Controllers.Main.textNo": "No", + "SSE.Controllers.Main.textNoLicenseTitle": "License expired or not found", "SSE.Controllers.Main.textPleaseWait": "The operation might take more time than expected. Please wait...", "SSE.Controllers.Main.textRecalcFormulas": "Calculating formulas...", "SSE.Controllers.Main.textShape": "Shape", @@ -214,10 +220,9 @@ "SSE.Controllers.Main.uploadImageTitleText": "Uploading Image", "SSE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher", "SSE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", + "SSE.Controllers.Main.warnNoLicense": "The license could not be found or expired. You cannot edit files.
    Click 'Buy now' to purchase Enterprise Edition license or 'Contact us' if you use Integration Edition.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "SSE.Controllers.Main.textBuyNow": "Buy now", - "SSE.Controllers.Main.textNoLicenseTitle": "License expired", - "SSE.Controllers.Main.warnNoLicense": "The license expired. You cannot create or edit files.
    Click the \'Buy now\' button to prolong the license.", + "SSE.Controllers.Main.textContactUs": "Contact us", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect", @@ -240,6 +245,34 @@ "SSE.Views.AutoFilterDialog.txtEmpty": "Enter cell filter", "SSE.Views.AutoFilterDialog.txtTitle": "Filter", "SSE.Views.AutoFilterDialog.warnNoSelected": "You must choose at least one value", + "SSE.Views.AutoFilterDialog.txtSortLow2High": "Sort Lowest to Highest", + "SSE.Views.AutoFilterDialog.txtSortHigh2Low": "Sort Highest to Lowest", + "SSE.Views.AutoFilterDialog.txtSortCellColor": "Sort by cells color", + "SSE.Views.AutoFilterDialog.txtSortFontColor": "Sort by font color", + "SSE.Views.AutoFilterDialog.txtNumFilter": "Number filter", + "SSE.Views.AutoFilterDialog.txtTextFilter": "Text filter", + "SSE.Views.AutoFilterDialog.txtFilterCellColor": "Filter by cells color", + "SSE.Views.AutoFilterDialog.txtFilterFontColor": "Filter by font color", + "SSE.Views.AutoFilterDialog.txtClear": "Clear", + "SSE.Views.AutoFilterDialog.txtReapply": "Reapply", + "SSE.Views.AutoFilterDialog.txtEquals": "Equals...", + "SSE.Views.AutoFilterDialog.txtNotEquals": "Does not equal...", + "SSE.Views.AutoFilterDialog.txtGreater": "Greater than...", + "SSE.Views.AutoFilterDialog.txtGreaterEquals": "Greater than or equal to...", + "SSE.Views.AutoFilterDialog.txtLess": "Less than...", + "SSE.Views.AutoFilterDialog.txtLessEquals": "Less than or equal to...", + "SSE.Views.AutoFilterDialog.txtBetween": "Between...", + "SSE.Views.AutoFilterDialog.txtTop10": "Top 10", + "SSE.Views.AutoFilterDialog.txtAboveAve": "Above average", + "SSE.Views.AutoFilterDialog.txtBelowAve": "Below average", + "SSE.Views.AutoFilterDialog.txtBegins": "Begins with...", + "SSE.Views.AutoFilterDialog.txtNotBegins": "Does not begin with...", + "SSE.Views.AutoFilterDialog.txtEnds": "Ends with...", + "SSE.Views.AutoFilterDialog.txtNotEnds": "Does not end with...", + "SSE.Views.AutoFilterDialog.txtContains": "Contains...", + "SSE.Views.AutoFilterDialog.txtNotContains": "Does not contain...", + "SSE.Views.AutoFilterDialog.textSelectAllResults": "Select All Search Results", + "SSE.Views.AutoFilterDialog.textAddSelection": "Add current selection to filter", "SSE.Views.CellEditor.textManager": "Name Manager", "SSE.Views.CellEditor.tipFormula": "Insert Function", "SSE.Views.CellRangeDialog.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", @@ -441,6 +474,25 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.txtSelect": "Select", + "SSE.Views.DocumentHolder.selectRowText": "Select Row", + "SSE.Views.DocumentHolder.selectColumnText": "Select Entire Column", + "SSE.Views.DocumentHolder.selectDataText": "Select Column Data", + "SSE.Views.DocumentHolder.selectTableText": "Select Table", + "SSE.Views.DocumentHolder.insertRowAboveText": "Insert Row Above", + "SSE.Views.DocumentHolder.insertRowBelowText": "Insert Row Below", + "SSE.Views.DocumentHolder.insertColumnLeftText": "Insert Column Left", + "SSE.Views.DocumentHolder.insertColumnRightText": "Insert Column Right", + "SSE.Views.DocumentHolder.deleteRowText": "Delete Row", + "SSE.Views.DocumentHolder.deleteColumnText": "Delete Column", + "SSE.Views.DocumentHolder.deleteTableText": "Delete Table", + "SSE.Views.DocumentHolder.txtFilter": "Filter", + "SSE.Views.DocumentHolder.txtFilterValue": "Filter by Selected cell's value", + "SSE.Views.DocumentHolder.txtFilterCellColor": "Filter by cell's color", + "SSE.Views.DocumentHolder.txtFilterFontColor": "Filter by font color", + "SSE.Views.DocumentHolder.txtReapply": "Reapply", + "SSE.Views.DocumentHolder.txtSortCellColor": "Selected Cell Color on top", + "SSE.Views.DocumentHolder.txtSortFontColor": "Selected Font Color on top", "SSE.Views.FileMenu.btnBackCaption": "Go to Documents", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", "SSE.Views.FileMenu.btnDownloadCaption": "Download as...", @@ -467,8 +519,8 @@ "SSE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights", "SSE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights", "SSE.Views.FileMenuPanels.MainSettingsGeneral.okButtonText": "Apply", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strAutoRecover": "Turn on autorecover", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strAutosave": "Turn on autosave", - "SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthMode": "Co-editing Mode", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthModeDescFast": "Other users will see your changes at once", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", @@ -486,8 +538,8 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.text30Minutes": "Every 30 Minutes", "SSE.Views.FileMenuPanels.MainSettingsGeneral.text5Minutes": "Every 5 Minutes", "SSE.Views.FileMenuPanels.MainSettingsGeneral.text60Minutes": "Every Hour", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoRecover": "Autorecover", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoSave": "Autosave", - "SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Disabled", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Every Minute", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "Centimeter", @@ -497,10 +549,11 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Native", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Print", + "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings", "SSE.Views.FormulaDialog.cancelButtonText": "Cancel", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -583,7 +636,12 @@ "SSE.Views.MainSettingsPrint.strPrint": "Print", "SSE.Views.MainSettingsPrint.strRight": "Right", "SSE.Views.MainSettingsPrint.strTop": "Top", + "SSE.Views.MainSettingsPrint.textActualSize": "Actual Size", + "SSE.Views.MainSettingsPrint.textFitCols": "Fit All Columns on One Page", + "SSE.Views.MainSettingsPrint.textFitPage": "Fit Sheet on One Page", + "SSE.Views.MainSettingsPrint.textFitRows": "Fit All Rows on One Page", "SSE.Views.MainSettingsPrint.textPageOrientation": "Page Orientation", + "SSE.Views.MainSettingsPrint.textPageScaling": "Scaling", "SSE.Views.MainSettingsPrint.textPageSize": "Page Size", "SSE.Views.MainSettingsPrint.textPrintGrid": "Print Gridlines", "SSE.Views.MainSettingsPrint.textPrintHeadings": "Print Row and Column Headings", @@ -631,7 +689,7 @@ "SSE.Views.NameManagerDlg.tipIsLocked": "This element is being edited by another user.", "SSE.Views.NameManagerDlg.txtTitle": "Name Manager", "SSE.Views.ParagraphSettings.strLineHeight": "Line Spacing", - "SSE.Views.ParagraphSettings.strParagraphSpacing": "Spacing", + "SSE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "SSE.Views.ParagraphSettings.strSpacingAfter": "After", "SSE.Views.ParagraphSettings.strSpacingBefore": "Before", "SSE.Views.ParagraphSettings.textAdvanced": "Show advanced settings", @@ -680,15 +738,19 @@ "SSE.Views.PrintSettings.textActualSize": "Actual Size", "SSE.Views.PrintSettings.textAllSheets": "All Sheets", "SSE.Views.PrintSettings.textCurrentSheet": "Current Sheet", - "SSE.Views.PrintSettings.textFit": "Fit to width", + "SSE.Views.PrintSettings.textFitCols": "Fit All Columns on One Page", + "SSE.Views.PrintSettings.textFitPage": "Fit Sheet on One Page", + "SSE.Views.PrintSettings.textFitRows": "Fit All Rows on One Page", "SSE.Views.PrintSettings.textHideDetails": "Hide Details", "SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Page Orientation", + "SSE.Views.PrintSettings.textPageScaling": "Scaling", "SSE.Views.PrintSettings.textPageSize": "Page Size", "SSE.Views.PrintSettings.textPrintGrid": "Print Gridlines", "SSE.Views.PrintSettings.textPrintHeadings": "Print Row and Column Headings", "SSE.Views.PrintSettings.textPrintRange": "Print Range", "SSE.Views.PrintSettings.textSelection": "Selection", + "SSE.Views.PrintSettings.textSettings": "Sheet Settings", "SSE.Views.PrintSettings.textShowDetails": "Show Details", "SSE.Views.PrintSettings.textTitle": "Print Settings", "SSE.Views.RightMenu.txtChartSettings": "Chart Settings", @@ -696,6 +758,7 @@ "SSE.Views.RightMenu.txtParagraphSettings": "Text Settings", "SSE.Views.RightMenu.txtSettings": "Common Settings", "SSE.Views.RightMenu.txtShapeSettings": "Shape Settings", + "SSE.Views.RightMenu.txtTableSettings": "Table Settings", "SSE.Views.RightMenu.txtTextArtSettings": "Text Art Settings", "SSE.Views.SetValueDialog.cancelButtonText": "Cancel", "SSE.Views.SetValueDialog.okButtonText": "OK", @@ -812,6 +875,40 @@ "SSE.Views.TableOptionsDialog.txtFormat": "Create table", "SSE.Views.TableOptionsDialog.txtInvalidRange": "ERROR! Invalid cells range", "SSE.Views.TableOptionsDialog.txtTitle": "Title", + "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.
    Select a range so that the first table row was on the same row
    and the resulting table overlapped the current one.", + "SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.
    Select a range which does not include other tables.", + "SSE.Views.TableSettings.textEdit": "Rows & Columns", + "SSE.Views.TableSettings.selectRowText": "Select Row", + "SSE.Views.TableSettings.selectColumnText": "Select Entire Column", + "SSE.Views.TableSettings.selectDataText": "Select Column Data", + "SSE.Views.TableSettings.selectTableText": "Select Table", + "SSE.Views.TableSettings.insertRowAboveText": "Insert Row Above", + "SSE.Views.TableSettings.insertRowBelowText": "Insert Row Below", + "SSE.Views.TableSettings.insertColumnLeftText": "Insert Column Left", + "SSE.Views.TableSettings.insertColumnRightText": "Insert Column Right", + "SSE.Views.TableSettings.deleteRowText": "Delete Row", + "SSE.Views.TableSettings.deleteColumnText": "Delete Column", + "SSE.Views.TableSettings.deleteTableText": "Delete Table", + "SSE.Views.TableSettings.textOK": "OK", + "SSE.Views.TableSettings.textCancel": "Cancel", + "SSE.Views.TableSettings.textTemplate": "Select From Template", + "SSE.Views.TableSettings.textRows": "Rows", + "SSE.Views.TableSettings.textColumns": "Columns", + "SSE.Views.TableSettings.textHeader": "Header", + "SSE.Views.TableSettings.textTotal": "Total", + "SSE.Views.TableSettings.textBanded": "Banded", + "SSE.Views.TableSettings.textFirst": "First", + "SSE.Views.TableSettings.textLast": "Last", + "SSE.Views.TableSettings.textEmptyTemplate": "No templates", + "SSE.Views.TableSettings.textFilter": "Filter button", + "SSE.Views.TableSettings.textTableName": "Table Name", + "SSE.Views.TableSettings.textResize": "Resize table", + "SSE.Views.TableSettings.textSelectData": "Select Data", + "SSE.Views.TableSettings.textInvalidName": "ERROR! Invalid table name", + "SSE.Views.TableSettings.textExistName": "ERROR! Range with such a name already exists", + "SSE.Views.TableSettings.textIsLocked": "This element is being edited by another user.", + "SSE.Views.TableSettings.notcriticalErrorTitle": "Warning", + "SSE.Views.TableSettings.textReservedName": "The name you are trying to use is already referenced in cell formulas. Please use some other name.", "SSE.Views.TextArtSettings.strBackground": "Background color", "SSE.Views.TextArtSettings.strColor": "Color", "SSE.Views.TextArtSettings.strFill": "Fill", @@ -1023,5 +1120,13 @@ "SSE.Views.Toolbar.txtText": "Text", "SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", - "SSE.Views.Toolbar.txtYen": "¥ Yen" + "SSE.Views.Toolbar.txtYen": "¥ Yen", + "SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel", + "SSE.Views.Top10FilterDialog.okButtonText": "OK", + "SSE.Views.Top10FilterDialog.txtTitle": "Top 10 AutoFilter", + "SSE.Views.Top10FilterDialog.textType": "Show", + "SSE.Views.Top10FilterDialog.txtTop": "Top", + "SSE.Views.Top10FilterDialog.txtBottom": "Bottom", + "SSE.Views.Top10FilterDialog.txtItems": "Item", + "SSE.Views.Top10FilterDialog.txtPercent": "Percent" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 6507d28d5..377847c92 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -496,7 +496,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruso", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir", "SSE.Views.FormulaDialog.cancelButtonText": "Cancelar", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -676,7 +676,7 @@ "SSE.Views.PrintSettings.textActualSize": "Tamaño actual", "SSE.Views.PrintSettings.textAllSheets": "Todas las hojas", "SSE.Views.PrintSettings.textCurrentSheet": "Hoja actual", - "SSE.Views.PrintSettings.textFit": "Ajustar al ancho", + "del_SSE.Views.PrintSettings.textFit": "Ajustar al ancho", "SSE.Views.PrintSettings.textHideDetails": "Ocultar detalles", "SSE.Views.PrintSettings.textLayout": "Diseño", "SSE.Views.PrintSettings.textPageOrientation": "Orientación de página", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index d2c996b0d..6352f570b 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -496,7 +496,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Général", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimer", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimer", "SSE.Views.FormulaDialog.cancelButtonText": "Annuler", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -676,7 +676,7 @@ "SSE.Views.PrintSettings.textActualSize": "Taille réelle", "SSE.Views.PrintSettings.textAllSheets": "Toutes les feuilles", "SSE.Views.PrintSettings.textCurrentSheet": "Feuille active", - "SSE.Views.PrintSettings.textFit": "Ajuster à la largeur", + "del_SSE.Views.PrintSettings.textFit": "Ajuster à la largeur", "SSE.Views.PrintSettings.textHideDetails": "Masquer détails", "SSE.Views.PrintSettings.textLayout": "Disposition", "SSE.Views.PrintSettings.textPageOrientation": "Orientation de la page", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index b1777cf8b..95f4f2413 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "come Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Generale", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Stampa", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Stampa", "SSE.Views.FormulaDialog.cancelButtonText": "Annulla", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Dimensione reale", "SSE.Views.PrintSettings.textAllSheets": "Tutti i fogli", "SSE.Views.PrintSettings.textCurrentSheet": "Foglio attuale", - "SSE.Views.PrintSettings.textFit": "Adatta alla larghezza", + "del_SSE.Views.PrintSettings.textFit": "Adatta alla larghezza", "SSE.Views.PrintSettings.textHideDetails": "Nascondi dettagli", "SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Orientamento pagina", diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 8f822c585..32743f025 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Print", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Print", "SSE.Views.FormulaDialog.cancelButtonText": "Atcelt", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Actual Size", "SSE.Views.PrintSettings.textAllSheets": "All Sheets", "SSE.Views.PrintSettings.textCurrentSheet": "Current Sheet", - "SSE.Views.PrintSettings.textFit": "Fit to width", + "del_SSE.Views.PrintSettings.textFit": "Fit to width", "SSE.Views.PrintSettings.textHideDetails": "Hide Details", "SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Lapas orientācija", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 77a9e0a8b..cf84de471 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Geral", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir", "SSE.Views.FormulaDialog.cancelButtonText": "Cancelar", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Tamanho real", "SSE.Views.PrintSettings.textAllSheets": "Todas as folhas", "SSE.Views.PrintSettings.textCurrentSheet": "Folha atual", - "SSE.Views.PrintSettings.textFit": "Ajustar à Largura", + "del_SSE.Views.PrintSettings.textFit": "Ajustar à Largura", "SSE.Views.PrintSettings.textHideDetails": "Ocultar detalhes", "SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Orientação da página", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 72643cb1e..193d73671 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -1,4 +1,6 @@ { + "Common.Utils.Metric.txtCm": "см", + "Common.Utils.Metric.txtPt": "пт", "cancelButtonText": "Отмена", "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", @@ -20,6 +22,7 @@ "Common.UI.SearchDialog.textTitle": "Поиск и замена", "Common.UI.SearchDialog.textTitle2": "Найти", "Common.UI.SearchDialog.textWholeWords": "Только слово целиком", + "Common.UI.SearchDialog.txtBtnHideReplace": "Скрыть поле замены", "Common.UI.SearchDialog.txtBtnReplace": "Заменить", "Common.UI.SearchDialog.txtBtnReplaceAll": "Заменить все", "Common.UI.SynchronizeTip.textDontShow": "Больше не показывать это сообщение", @@ -90,6 +93,7 @@ "SSE.Controllers.DocumentHolder.tipIsLocked": "Этот элемент редактируется другим пользователем.", "SSE.Controllers.DocumentHolder.txtHeight": "Высота", "SSE.Controllers.DocumentHolder.txtRowHeight": "Высота строки", + "SSE.Controllers.DocumentHolder.textSym": "симв", "SSE.Controllers.DocumentHolder.txtWidth": "Ширина", "SSE.Controllers.LeftMenu.newDocumentTitle": "Электронная таблица без имени", "SSE.Controllers.LeftMenu.textByColumns": "По столбцам", @@ -136,6 +140,7 @@ "SSE.Controllers.Main.errorFillRange": "Не удается заполнить выбранный диапазон ячеек.
    Все объединенные ячейки должны быть одного размера.", "SSE.Controllers.Main.errorFormulaName": "Ошибка во введенной формуле.
    Использовано неверное имя формулы.", "SSE.Controllers.Main.errorFormulaParsing": "Внутренняя ошибка при синтаксическом анализе формулы.", + "SSE.Controllers.Main.errorFrmlWrongReferences": "Функция ссылается на лист, который не существует.
    Проверьте данные и повторите попытку.", "SSE.Controllers.Main.errorInvalidRef": "Введите корректное имя для выделенного диапазона или допустимую ссылку для перехода.", "SSE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа", "SSE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек", @@ -177,10 +182,12 @@ "SSE.Controllers.Main.saveTextText": "Сохранение электронной таблицы...", "SSE.Controllers.Main.saveTitleText": "Сохранение электронной таблицы", "SSE.Controllers.Main.textAnonymous": "Аноним", + "SSE.Controllers.Main.textBuyNow": "Купить", "SSE.Controllers.Main.textCloseTip": "\nЩелкните, чтобы закрыть эту подсказку", "SSE.Controllers.Main.textConfirm": "Подтверждение", - "SSE.Controllers.Main.textLoadingDocument": "Загрузка документа", + "SSE.Controllers.Main.textLoadingDocument": "Загрузка таблицы", "SSE.Controllers.Main.textNo": "Нет", + "SSE.Controllers.Main.textNoLicenseTitle": "Лицензия не найдена или истек ее срок действия", "SSE.Controllers.Main.textPleaseWait": "Операция может занять больше времени, чем предполагалось. Пожалуйста, подождите...", "SSE.Controllers.Main.textRecalcFormulas": "Вычисление формул...", "SSE.Controllers.Main.textShape": "Фигура", @@ -212,10 +219,8 @@ "SSE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "SSE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "SSE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0", + "SSE.Controllers.Main.warnNoLicense": "Лицензия не найдена или истек ее срок действия. Вы не можете редактировать файлы.
    Нажмите кнопку 'Купить' для покупки лицензии на Enterprise Edition или 'Связаться с нами', если вы используете Integration Edition.", "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", - "SSE.Controllers.Main.textBuyNow": "Купить", - "SSE.Controllers.Main.textNoLicenseTitle": "Истек срок действия лицензии", - "SSE.Controllers.Main.warnNoLicense": "Истек срок действия лицензии. Вы не можете создавать и редактировать файлы.
    Нажмите кнопку \'Купить\' для продления лицензии.", "SSE.Controllers.Print.strAllSheets": "Все листы", "SSE.Controllers.Print.textWarning": "Предупреждение", "SSE.Controllers.Print.warnCheckMargings": "Неправильные поля", @@ -465,6 +470,7 @@ "SSE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Изменить права доступа", "SSE.Views.FileMenuPanels.DocumentRights.txtRights": "Люди, имеющие права", "SSE.Views.FileMenuPanels.MainSettingsGeneral.okButtonText": "Применить", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strAutoRecover": "Включить автовосстановление", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strAutosave": "Включить автосохранение", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthMode": "Режим совместного редактирования", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthModeDescFast": "Другие пользователи будут сразу же видеть ваши изменения", @@ -483,6 +489,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.text30Minutes": "Каждые 30 минут", "SSE.Views.FileMenuPanels.MainSettingsGeneral.text5Minutes": "Каждые 5 минут", "SSE.Views.FileMenuPanels.MainSettingsGeneral.text60Minutes": "Каждый час", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoRecover": "Автовосстановление", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoSave": "Автосохранение", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Отключено", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Каждую минуту", @@ -495,8 +502,9 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Пункт", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Русский", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "как Windows", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Дюйм", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Общие", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Печать", + "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Параметры страницы", "SSE.Views.FormulaDialog.cancelButtonText": "Отмена", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -579,7 +587,12 @@ "SSE.Views.MainSettingsPrint.strPrint": "Печать", "SSE.Views.MainSettingsPrint.strRight": "Справа", "SSE.Views.MainSettingsPrint.strTop": "Сверху", + "SSE.Views.MainSettingsPrint.textActualSize": "Реальный размер", + "SSE.Views.MainSettingsPrint.textFitCols": "Вписать все столбцы на одну страницу", + "SSE.Views.MainSettingsPrint.textFitPage": "Вписать лист на одну страницу", + "SSE.Views.MainSettingsPrint.textFitRows": "Вписать все строки на одну страницу", "SSE.Views.MainSettingsPrint.textPageOrientation": "Ориентация страницы", + "SSE.Views.MainSettingsPrint.textPageScaling": "Масштаб", "SSE.Views.MainSettingsPrint.textPageSize": "Размер страницы", "SSE.Views.MainSettingsPrint.textPrintGrid": "Печать сетки", "SSE.Views.MainSettingsPrint.textPrintHeadings": "Печать заголовков строк и столбцов", @@ -626,8 +639,8 @@ "SSE.Views.NameManagerDlg.textWorkbook": "Книга", "SSE.Views.NameManagerDlg.tipIsLocked": "Этот элемент редактируется другим пользователем.", "SSE.Views.NameManagerDlg.txtTitle": "Диспетчер имен", - "SSE.Views.ParagraphSettings.strLineHeight": "Междустрочный", - "SSE.Views.ParagraphSettings.strParagraphSpacing": "Интервал", + "SSE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", + "SSE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "SSE.Views.ParagraphSettings.strSpacingAfter": "После", "SSE.Views.ParagraphSettings.strSpacingBefore": "Перед", "SSE.Views.ParagraphSettings.textAdvanced": "Дополнительные параметры", @@ -676,15 +689,19 @@ "SSE.Views.PrintSettings.textActualSize": "Реальный размер", "SSE.Views.PrintSettings.textAllSheets": "Все листы", "SSE.Views.PrintSettings.textCurrentSheet": "Текущий лист", - "SSE.Views.PrintSettings.textFit": "По ширине", + "SSE.Views.PrintSettings.textFitCols": "Вписать все столбцы на одну страницу", + "SSE.Views.PrintSettings.textFitPage": "Вписать лист на одну страницу", + "SSE.Views.PrintSettings.textFitRows": "Вписать все строки на одну страницу", "SSE.Views.PrintSettings.textHideDetails": "Скрыть детали", "SSE.Views.PrintSettings.textLayout": "Макет", "SSE.Views.PrintSettings.textPageOrientation": "Ориентация страницы", + "SSE.Views.PrintSettings.textPageScaling": "Масштаб", "SSE.Views.PrintSettings.textPageSize": "Размер страницы", "SSE.Views.PrintSettings.textPrintGrid": "Печать сетки", "SSE.Views.PrintSettings.textPrintHeadings": "Печать заголовков строк и столбцов", "SSE.Views.PrintSettings.textPrintRange": "Диапазон печати", "SSE.Views.PrintSettings.textSelection": "Выделение", + "SSE.Views.PrintSettings.textSettings": "Параметры листа", "SSE.Views.PrintSettings.textShowDetails": "Показать детали", "SSE.Views.PrintSettings.textTitle": "Параметры печати", "SSE.Views.RightMenu.txtChartSettings": "Параметры диаграммы", @@ -981,7 +998,7 @@ "SSE.Views.Toolbar.txtMergeCells": "Объединить ячейки", "SSE.Views.Toolbar.txtMergeCenter": "Объединить и поместить в центре", "SSE.Views.Toolbar.txtNamedRange": "Именованные диапазоны", - "SSE.Views.Toolbar.txtNewRange": "Define Name", + "SSE.Views.Toolbar.txtNewRange": "Присвоить имя", "SSE.Views.Toolbar.txtNoBorders": "Без границ", "SSE.Views.Toolbar.txtNumber": "Числовой", "SSE.Views.Toolbar.txtPasteRange": "Вставить имя", diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index fdccaf4a9..ec04002fb 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "kot Windows", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Splošen", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Natisni", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Natisni", "SSE.Views.FormulaDialog.cancelButtonText": "Prekliči", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Dejanska velikost", "SSE.Views.PrintSettings.textAllSheets": "Vsi listi", "SSE.Views.PrintSettings.textCurrentSheet": "Trenuten list", - "SSE.Views.PrintSettings.textFit": "Prilagodi k širini", + "del_SSE.Views.PrintSettings.textFit": "Prilagodi k širini", "SSE.Views.PrintSettings.textHideDetails": "Skrij podrobnosti", "SSE.Views.PrintSettings.textLayout": "Postavitev", "SSE.Views.PrintSettings.textPageOrientation": "Orientacija strani", diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index 8fff641e0..e02f619eb 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows olarak", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Genel", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Yazdır", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Yazdır", "SSE.Views.FormulaDialog.cancelButtonText": "İptal Et", "SSE.Views.FormulaDialog.okButtonText": "TAMAM", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Gerçek Boyut", "SSE.Views.PrintSettings.textAllSheets": "Tüm Tablolar", "SSE.Views.PrintSettings.textCurrentSheet": "Mevcut Tablo", - "SSE.Views.PrintSettings.textFit": "Genişliğe Sığdır", + "del_SSE.Views.PrintSettings.textFit": "Genişliğe Sığdır", "SSE.Views.PrintSettings.textHideDetails": "Detayları Gizle", "SSE.Views.PrintSettings.textLayout": "Tasarım", "SSE.Views.PrintSettings.textPageOrientation": "Sayfa Orientasyonu", diff --git a/apps/spreadsheeteditor/main/resources/formula-lang/de.json b/apps/spreadsheeteditor/main/resources/formula-lang/de.json index 72b70a720..d860ac829 100644 --- a/apps/spreadsheeteditor/main/resources/formula-lang/de.json +++ b/apps/spreadsheeteditor/main/resources/formula-lang/de.json @@ -1 +1 @@ -{"DATE":{"n":"DATUM","a":"( year, month, day )"},"DATEDIF":{"n":"DATEDIF","a":"( start-date , end-date , unit )"},"DATEVALUE":{"n":"DATWERT","a":"( date-time-string )"},"DAY":{"n":"TAG","a":"( date-value )"},"DAYS360":{"n":"TAGE360","a":"( start-date , end-date [ , method-flag ] )"},"EDATE":{"n":"EDATUM","a":"( start-date , month-offset )"},"EOMONTH":{"n":"MONATSENDE","a":"( start-date , month-offset )"},"HOUR":{"n":"STUNDE","a":"( time-value )"},"MINUTE":{"n":"MINUTE","a":"( time-value )"},"MONTH":{"n":"MONAT","a":"( date-value )"},"NETWORKDAYS":{"n":"NETTOARBEITSTAGE","a":"( start-date , end-date [ , holidays ] )"},"NOW":{"n":"JETZT","a":"()"},"SECOND":{"n":"SEKUNDE","a":"( time-value )"},"TIME":{"n":"ZEIT","a":"( hour, minute, second )"},"TIMEVALUE":{"n":"ZEITWERT","a":"( date-time-string )"},"TODAY":{"n":"HEUTE","a":"()"},"WEEKDAY":{"n":"WOCHENTAG","a":"( serial-value [ , weekday-start-flag ] )"},"WEEKNUM":{"n":"KALENDERWOCHE","a":"( serial-value [ , weekday-start-flag ] )"},"WORKDAY":{"n":"ARBEITSTAG","a":"( start-date , day-offset [ , holidays ] )"},"YEAR":{"n":"JAHR","a":"( date-value )"},"YEARFRAC":{"n":"BRTEILJAHRE","a":"( start-date , end-date [ , basis ] )"},"BIN2DEC":{"n":"BININDEZ","a":"( number )"},"BIN2HEX":{"n":"BININHEX","a":"( number [ , num-hex-digits ] )"},"BIN2OCT":{"n":"BININOKT","a":"( number [ , num-hex-digits ] )"},"COMPLEX":{"n":"KOMPLEXE","a":"( real-number , imaginary-number [ , suffix ] )"},"DEC2BIN":{"n":"DEZINBIN","a":"( number [ , num-hex-digits ] )"},"DEC2HEX":{"n":"DEZINHEX","a":"( number [ , num-hex-digits ] )"},"DEC2OCT":{"n":"DEZINOKT","a":"( number [ , num-hex-digits ] )"},"DELTA":{"n":"DELTA","a":"( number-1 [ , number-2 ] )"},"ERF":{"n":"GAUSSFEHLER","a":"( lower-bound [ , upper-bound ] )"},"ERFC":{"n":"GAUSSFKOMPL","a":"( lower-bound )"},"GESTEP":{"n":"GGANZZAHL","a":"( number [ , step ] )"},"HEX2BIN":{"n":"HEXINBIN","a":"( number [ , num-hex-digits ] )"},"HEX2DEC":{"n":"HEXINDEZ","a":"( number )"},"HEX2OCT":{"n":"HEXINOKT","a":"( number [ , num-hex-digits ] )"},"IMABS":{"n":"IMABS","a":"( complex-number )"},"IMAGINARY":{"n":"IMAGINÄRTEIL","a":"( complex-number )"},"IMARGUMENT":{"n":"IMARGUMENT","a":"( complex-number )"},"IMCONJUGATE":{"n":"IMKONJUGIERTE","a":"( complex-number )"},"IMCOS":{"n":"IMCOS","a":"( complex-number )"},"IMDIV":{"n":"IMDIV","a":"( complex-number-1 , complex-number-2 )"},"IMEXP":{"n":"IMEXP","a":"( complex-number )"},"IMLN":{"n":"IMLN","a":"( complex-number )"},"IMLOG10":{"n":"IMLOG10","a":"( complex-number )"},"IMLOG2":{"n":"IMLOG2","a":"( complex-number )"},"IMPOWER":{"n":"IMAPOTENZ","a":"( complex-number, power )"},"IMPRODUCT":{"n":"IMPRODUKT","a":"( argument-list )"},"IMREAL":{"n":"IMREALTEIL","a":"( complex-number )"},"IMSIN":{"n":"IMSIN","a":"( complex-number )"},"IMSQRT":{"n":"IMWURZEL","a":"( complex-number )"},"IMSUB":{"n":"IMSUB","a":"( complex-number-1 , complex-number-2 )"},"IMSUM":{"n":"IMSUMME","a":"( argument-list )"},"OCT2BIN":{"n":"OKTINBIN","a":"( number [ , num-hex-digits ] )"},"OCT2DEC":{"n":"OKTINDEZ","a":"( number )"},"OCT2HEX":{"n":"OKTINHEX","a":"( number [ , num-hex-digits ] )"},"CHAR":{"n":"ZEICHEN","a":"( number )"},"CLEAN":{"n":"SÄUBERN","a":"( string )"},"CODE":{"n":"CODE","a":"( string )"},"CONCATENATE":{"n":"VERKETTEN","a":"(text1, text2, ...)"},"DOLLAR":{"n":"DM","a":"( number [ , num-decimal ] )"},"EXACT":{"n":"IDENTISCH","a":"(text1, text2)"},"FIND":{"n":"FINDEN","a":"( string-1 , string-2 [ , start-pos ] )"},"FINDB":{"n":"FINDENB","a":"( string-1 , string-2 [ , start-pos ] )"},"FIXED":{"n":"FEST","a":"( number [ , [ num-decimal ] [ , suppress-commas-flag ] ] )"},"LEFT":{"n":"LINKS","a":"( string [ , number-chars ] )"},"LEFTB":{"n":"LINKSB","a":"( string [ , number-chars ] )"},"LEN":{"n":"LÄNGE","a":"( string )"},"LENB":{"n":"LENB","a":"( string )"},"LOWER":{"n":"KLEIN","a":"(text)"},"MID":{"n":"TEIL","a":"( string , start-pos , number-chars )"},"MIDB":{"n":"TEILB","a":"( string , start-pos , number-chars )"},"PROPER":{"n":"GROSS2","a":"( string )"},"REPLACE":{"n":"ERSETZEN","a":"( string-1, start-pos, number-chars, string-2 )"},"REPLACEB":{"n":"ERSETZENB","a":"( string-1, start-pos, number-chars, string-2 )"},"REPT":{"n":"WIEDERHOLEN","a":"(text, number_of_times)"},"RIGHT":{"n":"RECHTS","a":"( string [ , number-chars ] )"},"RIGHTB":{"n":"RECHTSB","a":"( string [ , number-chars ] )"},"SEARCH":{"n":"SUCHEN","a":"( string-1 , string-2 [ , start-pos ] )"},"SEARCHB":{"n":"SUCHENB","a":"( string-1 , string-2 [ , start-pos ] )"},"SUBSTITUTE":{"n":"WECHSELN","a":"( string , old-string , new-string [ , occurence ] )"},"T":{"n":"T","a":"( value )"},"TEXT":{"n":"TEXT","a":"( value , format )"},"TRIM":{"n":"GLÄTTEN","a":"( string )"},"UPPER":{"n":"GROSS","a":"(text)"},"VALUE":{"n":"WERT","a":"( string )"},"AVEDEV":{"n":"MITTELABW","a":"( argument-list )"},"AVERAGE":{"n":"MITTELWERT","a":"( argument-list )"},"AVERAGEA":{"n":"MITTELWERTA","a":"( argument-list )"},"AVERAGEIF":{"n":"MITTELWERTWENN","a":"( cell-range, selection-criteria [ , average-range ] )"},"BINOMDIST":{"n":"BINOMVERT","a":"( number-successes , number-trials , success-probability , cumulative-flag )"},"CONFIDENCE":{"n":"KONFIDENZ","a":"( alpha , standard-dev , size )"},"CORREL":{"n":"KORREL","a":"( array-1 , array-2 )"},"COUNT":{"n":"ANZAHL","a":"( argument-list )"},"COUNTA":{"n":"ANZAHL2","a":"( argument-list )"},"COUNTBLANK":{"n":"ANZAHLLEEREZELLEN","a":"( argument-list )"},"COUNTIF":{"n":"ZÄHLENWENN","a":"( cell-range, selection-criteria )"},"COVAR":{"n":"KOVAR","a":"( array-1 , array-2 )"},"CRITBINOM":{"n":"KRITBINOM","a":"( number-trials , success-probability , alpha )"},"DEVSQ":{"n":"SUMQUADABW","a":"( argument-list )"},"EXPONDIST":{"n":"EXPONVERT","a":"( x , lambda , cumulative-flag )"},"FISHER":{"n":"FISHER","a":"( number )"},"FISHERINV":{"n":"FISHERINV","a":"( number )"},"FORECAST":{"n":"SCHÄTZER","a":"( x , array-1 , array-2 )"},"FREQUENCY":{"n":"HÄUFIGKEIT","a":"( data-array , bins-array )"},"GAMMALN":{"n":"GAMMALN","a":"(number)"},"GEOMEAN":{"n":"GEOMITTEL","a":"( argument-list )"},"HARMEAN":{"n":"HARMITTEL","a":"( argument-list )"},"HYPGEOMDIST":{"n":"HYPGEOMVERT","a":"( sample-successes , number-sample , population-successes , number-population )"},"INTERCEPT":{"n":"ACHSENABSCHNITT","a":"( array-1 , array-2 )"},"KURT":{"n":"KURT","a":"( argument-list )"},"LARGE":{"n":"KGRÖSSTE","a":"( array , k )"},"LOGINV":{"n":"LOGINV","a":"( x , mean , standard-deviation )"},"LOGNORMDIST":{"n":"LOGNORMVERT","a":"( x , mean , standard-deviation )"},"MAX":{"n":"MAX","a":"(number1, number2, ...)"},"MAXA":{"n":"MAXA","a":"(number1, number2, ...)"},"MEDIAN":{"n":"MEDIAN","a":"( argument-list )"},"MIN":{"n":"MIN","a":"(number1, number2, ...)"},"MINA":{"n":"MINA","a":"(number1, number2, ...)"},"MODE":{"n":"MODALWERT","a":"( argument-list )"},"NEGBINOMDIST":{"n":"NEGBINOMVERT","a":"( number-failures , number-successes , success-probability )"},"NORMDIST":{"n":"NORMVERT","a":"( x , mean , standard-deviation , cumulative-flag )"},"NORMINV":{"n":"NORMINV","a":"( x , mean , standard-deviation )"},"NORMSDIST":{"n":"STANDNORMVERT","a":"(number)"},"NORMSINV":{"n":"STANDNORMINV","a":"( probability )"},"PEARSON":{"n":"PEARSON","a":"( array-1 , array-2 )"},"PERCENTILE":{"n":"QUANTIL","a":"( array , k )"},"PERCENTRANK":{"n":"QUANTILSRANG","a":"( array , x [ , significance ] )"},"PERMUT":{"n":"VARIATIONEN","a":"( number , number-chosen )"},"POISSON":{"n":"POISSON","a":"( x , mean , cumulative-flag )"},"PROB":{"n":"WAHRSCHBEREICH","a":"( x-range , probability-range , lower-limit [ , upper-limit ] )"},"QUARTILE":{"n":"QUARTILE","a":"( array , result-category )"},"RSQ":{"n":"BESTIMMTHEITSMASS","a":"( array-1 , array-2 )"},"SKEW":{"n":"SCHIEFE","a":"( argument-list )"},"SLOPE":{"n":"STEIGUNG","a":"( array-1 , array-2 )"},"SMALL":{"n":"KKLEINSTE","a":"( array , k )"},"STANDARDIZE":{"n":"STANDARDISIERUNG","a":"( x , mean , standard-deviation )"},"STDEV":{"n":"STABW","a":"( argument-list )"},"STDEVA":{"n":"STABWA","a":"( argument-list )"},"STDEVP":{"n":"STABWN","a":"( argument-list )"},"STDEVPA":{"n":"STABWNA","a":"( argument-list )"},"STEYX":{"n":"STFEHLERYX","a":"( known-ys , known-xs )"},"VAR":{"n":"VARIANZ","a":"( argument-list )"},"VARA":{"n":"VARIANZA","a":"( argument-list )"},"VARP":{"n":"VARIANZEN","a":"( argument-list )"},"VARPA":{"n":"VARIANZENA","a":"( argument-list )"},"ACCRINT":{"n":"AUFGELZINS","a":"( issue , first-interest , settlement , rate , [ par ] , frequency [ , [ basis ] ] )"},"ACCRINTM":{"n":"AUFGELZINSF","a":"( issue , settlement , rate , [ [ par ] [ , [ basis ] ] ] )"},"AMORDEGRC":{"n":"AMORDEGRK","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )"},"AMORLINC":{"n":"AMORLINEARK","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )"},"COUPDAYBS":{"n":"ZINSTERMTAGVA","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPDAYS":{"n":"ZINSTERMTAGE","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPDAYSNC":{"n":"ZINSTERMTAGNZ","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPNCD":{"n":"ZINSTERMNZ","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPNUM":{"n":"ZINSTERMZAHL","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPPCD":{"n":"ZINSTERMVZ","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"CUMIPMT":{"n":"KUMZINSZ","a":"( rate , nper , pv , start-period , end-period , type )"},"CUMPRINC":{"n":"KUMKAPITAL","a":"( rate , nper , pv , start-period , end-period , type )"},"DB":{"n":"GDA2","a":"( cost , salvage , life , period [ , [ month ] ] )"},"DDB":{"n":"GDA","a":"( cost , salvage , life , period [ , factor ] )"},"DISC":{"n":"DISAGIO","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )"},"DOLLARDE":{"n":"NOTIERUNGDEZ","a":"( fractional-dollar , fraction )"},"DOLLARFR":{"n":"NOTIERUNGBRU","a":"( decimal-dollar , fraction )"},"DURATION":{"n":"DURATIONТ","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )"},"EFFECT":{"n":"EFFEKTIV","a":"( nominal-rate , npery )"},"FV":{"n":"ZW","a":"( rate , nper , pmt [ , [ pv ] [ ,[ type ] ] ] )"},"FVSCHEDULE":{"n":"ZW2","a":"( principal , schedule )"},"INTRATE":{"n":"ZINSSATZ","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )"},"IPMT":{"n":"ZINSZ","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )"},"IRR":{"n":"IKV","a":"( values [ , [ guess ] ] )"},"ISPMT":{"n":"ISPMT","a":"( rate , per , nper , pv )"},"MDURATION":{"n":"MDURATION","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )"},"MIRR":{"n":"QIKV","a":"( values , finance-rate , reinvest-rate )"},"NOMINAL":{"n":"NOMINAL","a":"( effect-rate , npery )"},"NPER":{"n":"ZZR","a":"( rate , pmt , pv [ , [ fv ] [ , [ type ] ] ] )"},"NPV":{"n":"NBW","a":"( rate , argument-list )"},"ODDFPRICE":{"n":"UNREGER.KURS","a":"( settlement , maturity , issue , first-coupon , rate , yld , redemption , frequency [ , [ basis ] ] )"},"ODDFYIELD":{"n":"UNREGER.REND","a":"( settlement , maturity , issue , first-coupon , rate , pr , redemption , frequency [ , [ basis ] ] )"},"ODDLPRICE":{"n":"UNREGLE.KURS","a":"( settlement , maturity , last-interest , rate , yld , redemption , frequency [ , [ basis ] ] )"},"ODDLYIELD":{"n":"UNREGLE.REND","a":"( settlement , maturity , last-interest , rate , pr , redemption , frequency [ , [ basis ] ] )"},"PMT":{"n":"RMZ","a":"( rate , nper , pv [ , [ fv ] [ ,[ type ] ] ] )"},"PPMT":{"n":"KAPZ","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )"},"PRICE":{"n":"KURS","a":"( settlement , maturity , rate , yld , redemption , frequency [ , [ basis ] ] )"},"PRICEDISC":{"n":"KURSDISAGIO","a":"( settlement , maturity , discount , redemption [ , [ basis ] ] )"},"PRICEMAT":{"n":"KURSFÄLLIG","a":"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )"},"PV":{"n":"BW","a":"( rate , nper , pmt [ , [ fv ] [ ,[ type ] ] ] )"},"RATE":{"n":"ZINS","a":"( nper , pmt , pv [ , [ [ fv ] [ , [ [ type ] [ , [ guess ] ] ] ] ] ] )"},"RECEIVED":{"n":"AUSZAHLUNG","a":"( settlement , maturity , investment , discount [ , [ basis ] ] )"},"SLN":{"n":"LIA","a":"( cost , salvage , life )"},"SYD":{"n":"DIA","a":"( cost , salvage , life , per )"},"TBILLEQ":{"n":"TBILLÄQUIV","a":"( settlement , maturity , discount )"},"TBILLPRICE":{"n":"TBILLKURS","a":"( settlement , maturity , discount )"},"TBILLYIELD":{"n":"TBILLRENDITE","a":"( settlement , maturity , pr )"},"VDB":{"n":"VDB","a":"( cost , salvage , life , start-period , end-period [ , [ [ factor ] [ , [ no-switch-flag ] ] ] ] ] )"},"XIRR":{"n":"XINTZINSFUSS","a":"( values , dates [ , [ guess ] ] )"},"XNPV":{"n":"XKAPITALWERT","a":"( rate , values , dates )"},"YIELD":{"n":"RENDITE","a":"( settlement , maturity , rate , pr , redemption , frequency [ , [ basis ] ] )"},"YIELDDISC":{"n":"RENDITEDIS","a":"( settlement , maturity , pr , redemption , [ , [ basis ] ] )"},"YIELDMAT":{"n":"RENDITEFÄLL","a":"( settlement , maturity , issue , rate , pr [ , [ basis ] ] )"},"ABS":{"n":"ABS","a":"( x )"},"ACOS":{"n":"ARCCOS","a":"( x )"},"ACOSH":{"n":"ARCCOSHYP","a":"( x )"},"ASIN":{"n":"ARCSIN","a":"( x )"},"ASINH":{"n":"ARCSINHYP","a":"( x )"},"ATAN":{"n":"ARCTAN","a":"( x )"},"ATAN2":{"n":"ARCTAN2","a":"( x, y )"},"ATANH":{"n":"ARCTANHYP","a":"( x )"},"CEILING":{"n":"OBERGRENZE","a":"( x, significance )"},"COMBIN":{"n":"KOMBINATIONEN","a":"( number , number-chosen )"},"COS":{"n":"COS","a":"( x )"},"COSH":{"n":"COSHYP","a":"( x )"},"DEGREES":{"n":"GRAD","a":"( angle )"},"EVEN":{"n":"GERADE","a":"( x )"},"EXP":{"n":"EXP","a":"( x )"},"FACT":{"n":"FAKULTÄT","a":"( x )"},"FACTDOUBLE":{"n":"ZWEIFAKULTÄT","a":"( x )"},"FLOOR":{"n":"UNTERGRENZE","a":"( x, significance )"},"GCD":{"n":"GGT","a":"( argument-list )"},"INT":{"n":"GANZZAHL","a":"( x )"},"LCM":{"n":"KGV","a":"( argument-list )"},"LN":{"n":"LN","a":"( x )"},"LOG":{"n":"LOG","a":"( x [ , base ] )"},"LOG10":{"n":"LOG10","a":"( x )"},"MDETERM":{"n":"MDET","a":"( array )"},"MINVERSE":{"n":"MINV","a":"( array )"},"MMULT":{"n":"MMULT","a":"( array1, array2 )"},"MOD":{"n":"REST","a":"( x, y )"},"MROUND":{"n":"VRUNDEN","a":"( x, multiple )"},"MULTINOMIAL":{"n":"POLYNOMIAL","a":"( argument-list )"},"ODD":{"n":"UNGERADE","a":"( x )"},"PI":{"n":"PI","a":"()"},"POWER":{"n":"POTENZ","a":"( x, y )"},"PRODUCT":{"n":"PRODUKT","a":"( argument-list )"},"QUOTIENT":{"n":"QUOTIENT","a":"( dividend , divisor )"},"RADIANS":{"n":"BOGENMASS","a":"( angle )"},"RAND":{"n":"ZUFALLSZAHL","a":"()"},"RANDBETWEEN":{"n":"ZUFALLSBEREICH","a":"( lower-bound , upper-bound )"},"ROMAN":{"n":"RÖMISCH","a":"( number, form )"},"ROUND":{"n":"RUNDEN","a":"( x , number-digits )"},"ROUNDDOWN":{"n":"ABRUNDEN","a":"( x , number-digits )"},"ROUNDUP":{"n":"AUFRUNDEN","a":"( x , number-digits )"},"SERIESSUM":{"n":"POTENZREIHE","a":"( input-value , initial-power , step , coefficients )"},"SIGN":{"n":"VORZEICHEN","a":"( x )"},"SIN":{"n":"SIN","a":"( x )"},"SINH":{"n":"SINHYP","a":"( x )"},"SQRT":{"n":"WURZEL","a":"( x )"},"SQRTPI":{"n":"WURZELPI","a":"( x )"},"SUM":{"n":"SUMME","a":"( argument-list )"},"SUMIF":{"n":"SUMMEWENN","a":"( cell-range, selection-criteria [ , sum-range ] )"},"SUMPRODUCT":{"n":"SUMMENPRODUKT","a":"( argument-list )"},"SUMSQ":{"n":"QUADRATESUMME","a":"( argument-list )"},"SUMX2MY2":{"n":"SUMMEX2MY2","a":"( array-1 , array-2 )"},"SUMX2PY2":{"n":"SUMMEX2PY2","a":"( array-1 , array-2 )"},"SUMXMY2":{"n":"SUMMEXMY2","a":"( array-1 , array-2 )"},"TAN":{"n":"TAN","a":"( x )"},"TANH":{"n":"TANHYP","a":"( x )"},"TRUNC":{"n":"KÜRZEN","a":"( x [ , number-digits ] )"},"ADDRESS":{"n":"ADRESSE","a":"( row-number , col-number [ , [ ref-type ] [ , [ A1-ref-style-flag ] [ , sheet-name ] ] ] )"},"CHOOSE":{"n":"WAHL","a":"( index , argument-list )"},"COLUMN":{"n":"SPALTE","a":"( [ reference ] )"},"COLUMNS":{"n":"SPALTEN","a":"( array )"},"HLOOKUP":{"n":"WVERWEIS","a":"( lookup-value , table-array , row-index-num [ , [ range-lookup-flag ] ] )"},"INDEX":{"n":"INDEX","a":"( array , [ row-number ] [ , [ column-number ] ] ) INDEX( reference , [ row-number ] [ , [ column-number ] [ , [ area-number ] ] ] )"},"INDIRECT":{"n":"INDIREKT","a":"( ref-text [ , [ A1-ref-style-flag ] ] )"},"LOOKUP":{"n":"VERWEIS","a":"( lookup-value , lookup-vector , result-vector )"},"MATCH":{"n":"VERGLEICH","a":"( lookup-value , lookup-array [ , [ match-type ]] )"},"OFFSET":{"n":"BEREICH.VERSCHIEBEN","a":"( reference , rows , cols [ , [ height ] [ , [ width ] ] ] )"},"ROW":{"n":"ZEILE","a":"( [ reference ] )"},"ROWS":{"n":"ZEILEN","a":"( array )"},"TRANSPOSE":{"n":"MTRANS","a":"( array )"},"VLOOKUP":{"n":"SVERWEIS","a":"( lookup-value , table-array , col-index-num [ , [ range-lookup-flag ] ] )"},"ERROR.TYPE":{"n":"FEHLER.TYP","a":"(value)"},"ISBLANK":{"n":"ISTLEER","a":"(value)"},"ISERR":{"n":"ISTFEHL","a":"(value)"},"ISERROR":{"n":"ISTFEHLER","a":"(value)"},"ISEVEN":{"n":"ISTGERADE","a":"(number)"},"ISLOGICAL":{"n":"ISTLOG","a":"(value)"},"ISNA":{"n":"ISTNV","a":"(value)"},"ISNONTEXT":{"n":"ISTKTEXT","a":"(value)"},"ISNUMBER":{"n":"ISTZAHL","a":"(value)"},"ISODD":{"n":"ISTUNGERADE","a":"(number)"},"ISREF":{"n":"ISTBEZUG","a":"(value)"},"ISTEXT":{"n":"ISTTEXT","a":"(value)"},"N":{"n":"N","a":"(value)"},"NA":{"n":"NV","a":"()"},"TYPE":{"n":"TYP","a":"(value)"},"AND":{"n":"UND","a":"(logical1, logical2, ...)"},"FALSE":{"n":"FALSCH","a":"()"},"IF":{"n":"WENN","a":"(logical_test, value_if_true, value_if_false)"},"IFERROR":{"n":"WENNFEHLER","a":"(value, value_if_error)"},"NOT":{"n":"NICHT","a":"(logical)"},"OR":{"n":"ODER","a":"(logical1, logical2, ...)"},"TRUE":{"n":"WAHR","a":"()"},"LocalFormulaOperands":{"StructureTables":{"h": "Kopfzeilen","d": "Daten","a": "Alle","tr": "Diese Zeile","t": "Ergebnisse"},"CONST_TRUE_FALSE":{"t":"WAHR","f":"FALSCH"}}} \ No newline at end of file +{"DATE":"DATUM","DATEDIF":"DATEDIF","DATEVALUE":"DATWERT","DAY":"TAG","DAYS360":"TAGE360","EDATE":"EDATUM","EOMONTH":"MONATSENDE","HOUR":"STUNDE","MINUTE":"MINUTE","MONTH":"MONAT","NETWORKDAYS":"NETTOARBEITSTAGE","NOW":"JETZT","SECOND":"SEKUNDE","TIME":"ZEIT","TIMEVALUE":"ZEITWERT","TODAY":"HEUTE","WEEKDAY":"WOCHENTAG","WEEKNUM":"KALENDERWOCHE","WORKDAY":"ARBEITSTAG","YEAR":"JAHR","YEARFRAC":"BRTEILJAHRE","BIN2DEC":"BININDEZ","BIN2HEX":"BININHEX","BIN2OCT":"BININOKT","COMPLEX":"KOMPLEXE","DEC2BIN":"DEZINBIN","DEC2HEX":"DEZINHEX","DEC2OCT":"DEZINOKT","DELTA":"DELTA","ERF":"GAUSSFEHLER","ERFC":"GAUSSFKOMPL","GESTEP":"GGANZZAHL","HEX2BIN":"HEXINBIN","HEX2DEC":"HEXINDEZ","HEX2OCT":"HEXINOKT","IMABS":"IMABS","IMAGINARY":"IMAGINÄRTEIL","IMARGUMENT":"IMARGUMENT","IMCONJUGATE":"IMKONJUGIERTE","IMCOS":"IMCOS","IMDIV":"IMDIV","IMEXP":"IMEXP","IMLN":"IMLN","IMLOG10":"IMLOG10","IMLOG2":"IMLOG2","IMPOWER":"IMAPOTENZ","IMPRODUCT":"IMPRODUKT","IMREAL":"IMREALTEIL","IMSIN":"IMSIN","IMSQRT":"IMWURZEL","IMSUB":"IMSUB","IMSUM":"IMSUMME","OCT2BIN":"OKTINBIN","OCT2DEC":"OKTINDEZ","OCT2HEX":"OKTINHEX","CHAR":"ZEICHEN","CLEAN":"SÄUBERN","CODE":"CODE","CONCATENATE":"VERKETTEN","DOLLAR":"DM","EXACT":"IDENTISCH","FIND":"FINDEN","FINDB":"FINDENB","FIXED":"FEST","LEFT":"LINKS","LEFTB":"LINKSB","LEN":"LÄNGE","LENB":"LENB","LOWER":"KLEIN","MID":"TEIL","MIDB":"TEILB","PROPER":"GROSS2","REPLACE":"ERSETZEN","REPLACEB":"ERSETZENB","REPT":"WIEDERHOLEN","RIGHT":"RECHTS","RIGHTB":"RECHTSB","SEARCH":"SUCHEN","SEARCHB":"SUCHENB","SUBSTITUTE":"WECHSELN","T":"T","TEXT":"TEXT","TRIM":"GLÄTTEN","UPPER":"GROSS","VALUE":"WERT","AVEDEV":"MITTELABW","AVERAGE":"MITTELWERT","AVERAGEA":"MITTELWERTA","AVERAGEIF":"MITTELWERTWENN","BINOMDIST":"BINOMVERT","CONFIDENCE":"KONFIDENZ","CORREL":"KORREL","COUNT":"ANZAHL","COUNTA":"ANZAHL2","COUNTBLANK":"ANZAHLLEEREZELLEN","COUNTIF":"ZÄHLENWENN","COVAR":"KOVAR","CRITBINOM":"KRITBINOM","DEVSQ":"SUMQUADABW","EXPONDIST":"EXPONVERT","FISHER":"FISHER","FISHERINV":"FISHERINV","FORECAST":"SCHÄTZER","FREQUENCY":"HÄUFIGKEIT","GAMMALN":"GAMMALN","GEOMEAN":"GEOMITTEL","HARMEAN":"HARMITTEL","HYPGEOMDIST":"HYPGEOMVERT","INTERCEPT":"ACHSENABSCHNITT","KURT":"KURT","LARGE":"KGRÖSSTE","LOGINV":"LOGINV","LOGNORMDIST":"LOGNORMVERT","MAX":"MAX","MAXA":"MAXA","MEDIAN":"MEDIAN","MIN":"MIN","MINA":"MINA","MODE":"MODALWERT","NEGBINOMDIST":"NEGBINOMVERT","NORMDIST":"NORMVERT","NORMINV":"NORMINV","NORMSDIST":"STANDNORMVERT","NORMSINV":"STANDNORMINV","PEARSON":"PEARSON","PERCENTILE":"QUANTIL","PERCENTRANK":"QUANTILSRANG","PERMUT":"VARIATIONEN","POISSON":"POISSON","PROB":"WAHRSCHBEREICH","QUARTILE":"QUARTILE","RSQ":"BESTIMMTHEITSMASS","SKEW":"SCHIEFE","SLOPE":"STEIGUNG","SMALL":"KKLEINSTE","STANDARDIZE":"STANDARDISIERUNG","STDEV":"STABW","STDEVA":"STABWA","STDEVP":"STABWN","STDEVPA":"STABWNA","STEYX":"STFEHLERYX","VAR":"VARIANZ","VARA":"VARIANZA","VARP":"VARIANZEN","VARPA":"VARIANZENA","ACCRINT":"AUFGELZINS","ACCRINTM":"AUFGELZINSF","AMORDEGRC":"AMORDEGRK","AMORLINC":"AMORLINEARK","COUPDAYBS":"ZINSTERMTAGVA","COUPDAYS":"ZINSTERMTAGE","COUPDAYSNC":"ZINSTERMTAGNZ","COUPNCD":"ZINSTERMNZ","COUPNUM":"ZINSTERMZAHL","COUPPCD":"ZINSTERMVZ","CUMIPMT":"KUMZINSZ","CUMPRINC":"KUMKAPITAL","DB":"GDA2","DDB":"GDA","DISC":"DISAGIO","DOLLARDE":"NOTIERUNGDEZ","DOLLARFR":"NOTIERUNGBRU","DURATION":"DURATIONТ","EFFECT":"EFFEKTIV","FV":"ZW","FVSCHEDULE":"ZW2","INTRATE":"ZINSSATZ","IPMT":"ZINSZ","IRR":"IKV","ISPMT":"ISPMT","MDURATION":"MDURATION","MIRR":"QIKV","NOMINAL":"NOMINAL","NPER":"ZZR","NPV":"NBW","ODDFPRICE":"UNREGER.KURS","ODDFYIELD":"UNREGER.REND","ODDLPRICE":"UNREGLE.KURS","ODDLYIELD":"UNREGLE.REND","PMT":"RMZ","PPMT":"KAPZ","PRICE":"KURS","PRICEDISC":"KURSDISAGIO","PRICEMAT":"KURSFÄLLIG","PV":"BW","RATE":"ZINS","RECEIVED":"AUSZAHLUNG","SLN":"LIA","SYD":"DIA","TBILLEQ":"TBILLÄQUIV","TBILLPRICE":"TBILLKURS","TBILLYIELD":"TBILLRENDITE","VDB":"VDB","XIRR":"XINTZINSFUSS","XNPV":"XKAPITALWERT","YIELD":"RENDITE","YIELDDISC":"RENDITEDIS","YIELDMAT":"RENDITEFÄLL","ABS":"ABS","ACOS":"ARCCOS","ACOSH":"ARCCOSHYP","ASIN":"ARCSIN","ASINH":"ARCSINHYP","ATAN":"ARCTAN","ATAN2":"ARCTAN2","ATANH":"ARCTANHYP","CEILING":"OBERGRENZE","COMBIN":"KOMBINATIONEN","COS":"COS","COSH":"COSHYP","DEGREES":"GRAD","EVEN":"GERADE","EXP":"EXP","FACT":"FAKULTÄT","FACTDOUBLE":"ZWEIFAKULTÄT","FLOOR":"UNTERGRENZE","GCD":"GGT","INT":"GANZZAHL","LCM":"KGV","LN":"LN","LOG":"LOG","LOG10":"LOG10","MDETERM":"MDET","MINVERSE":"MINV","MMULT":"MMULT","MOD":"REST","MROUND":"VRUNDEN","MULTINOMIAL":"POLYNOMIAL","ODD":"UNGERADE","PI":"PI","POWER":"POTENZ","PRODUCT":"PRODUKT","QUOTIENT":"QUOTIENT","RADIANS":"BOGENMASS","RAND":"ZUFALLSZAHL","RANDBETWEEN":"ZUFALLSBEREICH","ROMAN":"RÖMISCH","ROUND":"RUNDEN","ROUNDDOWN":"ABRUNDEN","ROUNDUP":"AUFRUNDEN","SERIESSUM":"POTENZREIHE","SIGN":"VORZEICHEN","SIN":"SIN","SINH":"SINHYP","SQRT":"WURZEL","SQRTPI":"WURZELPI","SUBTOTAL":"TEILERGEBNIS","SUM":"SUMME","SUMIF":"SUMMEWENN","SUMPRODUCT":"SUMMENPRODUKT","SUMSQ":"QUADRATESUMME","SUMX2MY2":"SUMMEX2MY2","SUMX2PY2":"SUMMEX2PY2","SUMXMY2":"SUMMEXMY2","TAN":"TAN","TANH":"TANHYP","TRUNC":"KÜRZEN","ADDRESS":"ADRESSE","CHOOSE":"WAHL","COLUMN":"SPALTE","COLUMNS":"SPALTEN","HLOOKUP":"WVERWEIS","INDEX":"INDEX","INDIRECT":"INDIREKT","LOOKUP":"VERWEIS","MATCH":"VERGLEICH","OFFSET":"BEREICH.VERSCHIEBEN","ROW":"ZEILE","ROWS":"ZEILEN","TRANSPOSE":"MTRANS","VLOOKUP":"SVERWEIS","ERROR.TYPE":"FEHLER.TYP","ISBLANK":"ISTLEER","ISERR":"ISTFEHL","ISERROR":"ISTFEHLER","ISEVEN":"ISTGERADE","ISLOGICAL":"ISTLOG","ISNA":"ISTNV","ISNONTEXT":"ISTKTEXT","ISNUMBER":"ISTZAHL","ISODD":"ISTUNGERADE","ISREF":"ISTBEZUG","ISTEXT":"ISTTEXT","N":"N","NA":"NV","TYPE":"TYP","AND":"UND","FALSE":"FALSCH","IF":"WENN","IFERROR":"WENNFEHLER","NOT":"NICHT","OR":"ODER","TRUE":"WAHR","LocalFormulaOperands":{"StructureTables":{"h": "Kopfzeilen","d": "Daten","a": "Alle","tr": "Diese Zeile","t": "Ergebnisse"},"CONST_TRUE_FALSE":{"t":"WAHR","f":"FALSCH"},"CONST_ERROR":{"nil":"#NULL!","div":"#DIV\/0!","value":"#WERT!","ref":"#BEZUG!","name":"#NAME\\?","num":"#ZAHL!","na":"#NV","getdata":"#DATEN_ABRUFEN","uf":"#UNSUPPORTED_FUNCTION!"}}} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/formula-lang/en.json b/apps/spreadsheeteditor/main/resources/formula-lang/en.json index 24de342b5..f8c96604b 100644 --- a/apps/spreadsheeteditor/main/resources/formula-lang/en.json +++ b/apps/spreadsheeteditor/main/resources/formula-lang/en.json @@ -1 +1 @@ -{"DATE":{"n":"DATE","a":"( year, month, day )","d":"Date and time function used to add dates in the default format MM/dd/yyyy"},"DATEDIF":{"n":"DATEDIF","a":"( start-date , end-date , unit )","d":"Date and time function used to return the difference between two date values (start date and end date), based on the interval (unit) specified"},"DATEVALUE":{"n":"DATEVALUE","a":"( date-time-string )","d":"Date and time function used to return a serial number of the specified date"},"DAY":{"n":"DAY","a":"( date-value )","d":"Date and time function which returns the day (a number from 1 to 31) of the date given in the numerical format (MM/dd/yyyy by default)"},"DAYS360":{"n":"DAYS360","a":"( start-date , end-date [ , method-flag ] )","d":"Date and time function used to return the number of days between two dates (start-date and end-date) based on a 360-day year using one of the calculation method (US or European)"},"EDATE":{"n":"EDATE","a":"( start-date , month-offset )","d":"Date and time function used to return the serial number of the date which comes the indicated number of months (month-offset) before or after the specified date (start-date)"},"EOMONTH":{"n":"EOMONTH","a":"( start-date , month-offset )","d":"Date and time function used to return the serial number of the last day of the month that comes the indicated number of months before or after the specified start date"},"HOUR":{"n":"HOUR","a":"( time-value )","d":"Date and time function which returns the hour (a number from 0 to 23) of the time value"},"MINUTE":{"n":"MINUTE","a":"( time-value )","d":"Date and time function which returns the minute (a number from 0 to 59) of the time value"},"MONTH":{"n":"MONTH","a":"( date-value )","d":"Date and time function which returns the month (a number from 1 to 12) of the date given in the numerical format (MM/dd/yyyy by default)"},"NETWORKDAYS":{"n":"NETWORKDAYS","a":"( start-date , end-date [ , holidays ] )","d":"Date and time function used to return the number of the work days between two dates (start date and end-date) excluding weekends and dates considered as holidays"},"NOW":{"n":"NOW","a":"()","d":""},"SECOND":{"n":"SECOND","a":"( time-value )","d":"Date and time function which returns the second (a number from 0 to 59) of the time value"},"TIME":{"n":"TIME","a":"( hour, minute, second )","d":"Date and time function used to add a particular time in the selected format (hh:mm tt by default)"},"TIMEVALUE":{"n":"TIMEVALUE","a":"( date-time-string )","d":"Date and time function used to return the serial number of a time"},"TODAY":{"n":"TODAY","a":"()","d":"Date and time function used to add the current day in the following format MM/dd/yy. This function does not require an argument"},"WEEKDAY":{"n":"WEEKDAY","a":"( serial-value [ , weekday-start-flag ] )","d":"Date and time function used to determine which day of the week the specified date is"},"WEEKNUM":{"n":"WEEKNUM","a":"( serial-value [ , weekday-start-flag ] )","d":"date and time functions. It used to return the number of the week the specified date falls within the year"},"WORKDAY":{"n":"WORKDAY","a":"( start-date , day-offset [ , holidays ] )","d":"Date and time function used to return the date which comes the indicated number of days (day-offset) before or after the specified start date excluding weekends and dates considered as holidays"},"YEAR":{"n":"YEAR","a":"( date-value )","d":"Date and time function which returns the year (a number from 1900 to 9999) of the date given in the numerical format (MM/dd/yyyy by default)"},"YEARFRAC":{"n":"YEARFRAC","a":"( start-date , end-date [ , basis ] )","d":"Date and time function used to return the fraction of a year represented by the number of whole days from start-date to end-date calculated on the specified basis"},"BIN2DEC":{"n":"BIN2DEC","a":"( number )","d":"Engineering function used to convert a binary number into a decimal number"},"BIN2HEX":{"n":"BIN2HEX","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a binary number into a hexadecimal number"},"BIN2OCT":{"n":"BIN2OCT","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a binary number into an octal number"},"COMPLEX":{"n":"COMPLEX","a":"( real-number , imaginary-number [ , suffix ] )","d":"Engineering function used to convert a real part and an imaginary part into the complex number expressed in a + bi or a + bj form"},"DEC2BIN":{"n":"DEC2BIN","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a decimal number into a binary number"},"DEC2HEX":{"n":"DEC2HEX","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a decimal number into a hexadecimal number"},"DEC2OCT":{"n":"DEC2OCT","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a decimal number into an octal number"},"DELTA":{"n":"DELTA","a":"( number-1 [ , number-2 ] )","d":"Engineering function used to test if two numbers are equal. The function returns 1 if the numbers are equal and 0 otherwise"},"ERF":{"n":"ERF","a":"( lower-bound [ , upper-bound ] )","d":"Engineering function used to calculate the error function integrated between the specified lower and upper limits"},"ERFC":{"n":"ERFC","a":"( lower-bound )","d":"Engineering function used to calculate the complementary error function integrated between the specified lower limit and infinity"},"GESTEP":{"n":"GESTEP","a":"( number [ , step ] )","d":"Engineering function used to test if a number is greater than a threshold value. The function returns 1 if the number is greater than or equal to the threshold value and 0 otherwise"},"HEX2BIN":{"n":"HEX2BIN","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a hexadecimal number to a binary number"},"HEX2DEC":{"n":"HEX2DEC","a":"( number )","d":"Engineering function used to convert a hexadecimal number into a decimal number"},"HEX2OCT":{"n":"HEX2OCT","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a hexadecimal number to an octal number"},"IMABS":{"n":"IMABS","a":"( complex-number )","d":"Engineering function used to return the absolute value of a complex number"},"IMAGINARY":{"n":"IMAGINARY","a":"( complex-number )","d":"Engineering function used to return the imaginary part of the specified complex number"},"IMARGUMENT":{"n":"IMARGUMENT","a":"( complex-number )","d":"Engineering function used to return the argument Theta, an angle expressed in radians"},"IMCONJUGATE":{"n":"IMCONJUGATE","a":"( complex-number )","d":"Engineering function used to return the complex conjugate of a complex number"},"IMCOS":{"n":"IMCOS","a":"( complex-number )","d":"Engineering function used to return the cosine of a complex number"},"IMDIV":{"n":"IMDIV","a":"( complex-number-1 , complex-number-2 )","d":"Engineering function used to return the quotient of two complex numbers expressed in a + bi or a + bj form"},"IMEXP":{"n":"IMEXP","a":"( complex-number )","d":"Engineering function used to return the e constant raised to the to the power specified by a complex number. The e constant is equal to 2,71828182845904"},"IMLN":{"n":"IMLN","a":"( complex-number )","d":"Engineering function used to return the natural logarithm of a complex number"},"IMLOG10":{"n":"IMLOG10","a":"( complex-number )","d":"Engineering function used to return the logarithm of a complex number to a base of 10"},"IMLOG2":{"n":"IMLOG2","a":"( complex-number )","d":"Engineering function used to return the logarithm of a complex number to a base of 2"},"IMPOWER":{"n":"IMPOWER","a":"( complex-number, power )","d":"Engineering function used to return the result of a complex number raised to the desired power"},"IMPRODUCT":{"n":"IMPRODUCT","a":"( argument-list )","d":"Engineering function used to return the product of the specified complex numbers"},"IMREAL":{"n":"IMREAL","a":"( complex-number )","d":"Engineering function used to return the real part of the specified complex number"},"IMSIN":{"n":"IMSIN","a":"( complex-number )","d":"Engineering function used to return the sine of a complex number"},"IMSQRT":{"n":"IMSQRT","a":"( complex-number )","d":"Engineering function used to return the square root of a complex number"},"IMSUB":{"n":"IMSUB","a":"( complex-number-1 , complex-number-2 )","d":"Engineering function used to return the difference of two complex numbers expressed in a + bi or a + bj form"},"IMSUM":{"n":"IMSUM","a":"( argument-list )","d":"Engineering function used to return the sum of the specified complex numbers"},"OCT2BIN":{"n":"OCT2BIN","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert an octal number to a binary number"},"OCT2DEC":{"n":"OCT2DEC","a":"( number )","d":"Engineering function used to convert an octal number to a decimal number"},"OCT2HEX":{"n":"OCT2HEX","a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert an octal number to a hexadecimal number"},"CHAR":{"n":"CHAR","a":"( number )","d":"Text and data function used to return the ASCII character specified by a number"},"CLEAN":{"n":"CLEAN","a":"( string )","d":"Text and data function used to remove all the nonprintable characters from the selected string"},"CODE":{"n":"CODE","a":"( string )","d":"Text and data function used to return the ASCII value of the specified character or the first character in a cell"},"CONCATENATE":{"n":"CONCATENATE","a":"(text1, text2, ...)","d":"Text and data function used to combine the data from two or more cells into a single one"},"DOLLAR":{"n":"DOLLAR","a":"( number [ , num-decimal ] )","d":"Text and data function used to convert a number to text, using a currency format $#.##"},"EXACT":{"n":"EXACT","a":"(text1, text2)","d":"Text and data function used to compare data in two cells. The function returns TRUE if the data are the same, and FALSE if not"},"FIND":{"n":"FIND","a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to find the specified substring (string-1) within a string (string-2) and is intended for languages that use the single-byte character set (SBCS)"},"FINDB":{"n":"FINDB","a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to find the specified substring (string-1) within a string (string-2) and is intended for languages the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"FIXED":{"n":"FIXED","a":"( number [ , [ num-decimal ] [ , suppress-commas-flag ] ] )","d":"Text and data function used to return the text representation of a number rounded to a specified number of decimal places"},"LEFT":{"n":"LEFT","a":"( string [ , number-chars ] )","d":"Text and data function used to extract the substring from the specified string starting from the left character and is intended for languages that use the single-byte character set (SBCS)"},"LEFTB":{"n":"LEFTB","a":"( string [ , number-chars ] )","d":"Text and data function used to extract the substring from the specified string starting from the left character and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"LEN":{"n":"LEN","a":"( string )","d":"Text and data function used to analyse the specified string and return the number of characters it contains and is intended for languages that use the single-byte character set (SBCS)"},"LENB":{"n":"LENB","a":"( string )","d":"Text and data function used to analyse the specified string and return the number of characters it contains and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"LOWER":{"n":"LOWER","a":"(text)","d":"Text and data function used to convert uppercase letters to lowercase in the selected cell"},"MID":{"n":"MID","a":"( string , start-pos , number-chars )","d":"Text and data function used to extract the characters from the specified string starting from any position and is intended for languages that use the single-byte character set (SBCS)"},"MIDB":{"n":"MIDB","a":"( string , start-pos , number-chars )","d":"Text and data function used to extract the characters from the specified string starting from any position and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"PROPER":{"n":"PROPER","a":"( string )","d":"Text and data function used to convert the first character of each word to uppercase and all the remaining characters to lowercase"},"REPLACE":{"n":"REPLACE","a":"( string-1, start-pos, number-chars, string-2 )","d":"Text and data function used to replace a set of characters, based on the number of characters and the start position you specify, with a new set of characters and is intended for languages that use the single-byte character set (SBCS)"},"REPLACEB":{"n":"REPLACEB","a":"( string-1, start-pos, number-chars, string-2 )","d":"Text and data function used to replace a set of characters, based on the number of characters and the start position you specify, with a new set of characters and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"REPT":{"n":"REPT","a":"(text, number_of_times)","d":"Text and data function used to repeat the data in the selected cell as many time as you wish"},"RIGHT":{"n":"RIGHT","a":"( string [ , number-chars ] )","d":"Text and data function used to extract a substring from a string starting from the right-most character, based on the specified number of characters and is intended for languages that use the single-byte character set (SBCS)"},"RIGHTB":{"n":"RIGHTB","a":"( string [ , number-chars ] )","d":"Text and data function used to extract a substring from a string starting from the right-most character, based on the specified number of characters and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"SEARCH":{"n":"SEARCH","a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to return the location of the specified substring in a string and is intended for languages that use the single-byte character set (SBCS)"},"SEARCHB":{"n":"SEARCHB","a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to return the location of the specified substring in a string and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"SUBSTITUTE":{"n":"SUBSTITUTE","a":"( string , old-string , new-string [ , occurence ] )","d":"Text and data function used to replace a set of characters with a new one"},"T":{"n":"Т","a":"( value )","d":"Text and data function used to check whether the value in the cell (or used as argument) is text or not. In case it is not text, the function returns blank result. In case the value/argument is text, the function returns the same text value"},"TEXT":{"n":"TEXT","a":"( value , format )","d":"Text and data function used to convert a value to a text in the specified format"},"TRIM":{"n":"TRIM","a":"( string )","d":"Text and data function used to remove the leading and trailing spaces from a string"},"UPPER":{"n":"UPPER","a":"(text)","d":"Text and data function used to convert lowercase letters to uppercase in the selected cell"},"VALUE":{"n":"VALUE","a":"( string )","d":"Text and data function used to convert a text value that represents a number to a number. If the converted text is not a number, the function will return a #VALUE! error"},"AVEDEV":{"n":"AVEDEV","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the average of the absolute deviations of numbers from their mean"},"AVERAGE":{"n":"AVERAGE","a":"( argument-list )","d":"Statistical function used to analyze the range of data and find the average value"},"AVERAGEA":{"n":"AVERAGEA","a":"( argument-list )","d":"Statistical function used to analyze the range of data including text and logical values and find the average value. The AVERAGEA function treats text and FALSE as a value of 0 and TRUE as a value of 1"},"AVERAGEIF":{"n":"AVERAGEIF","a":"( cell-range, selection-criteria [ , average-range ] )","d":"Statistical function used to analyze the range of data and find the average value of all numbers in a range of cells, based on the specified criterion"},"BINOMDIST":{"n":"BINOMDIST","a":"( number-successes , number-trials , success-probability , cumulative-flag )","d":"Statistical function used to return the individual term binomial distribution probability"},"CONFIDENCE":{"n":"CONFIDENCE","a":"( alpha , standard-dev , size )","d":"Statistical function used to return the confidence interval"},"CORREL":{"n":"CORREL","a":"( array-1 , array-2 )","d":"Statistical function used to analyze the range of data and return the correlation coefficient of two range of cells"},"COUNT":{"n":"COUNT","a":"( argument-list )","d":"Statistical function used to count the number of the selected cells which contain numbers ignoring empty cells or those contaning text"},"COUNTA":{"n":"COUNTA","a":"( argument-list )","d":"Statistical function used to analyze the range of cells and count the number of cells that are not empty"},"COUNTBLANK":{"n":"COUNTBLANK","a":"( argument-list )","d":"Statistical function used to analyze the range of cells and return the number of the empty cells"},"COUNTIF":{"n":"COUNTIF","a":"( cell-range, selection-criteria )","d":"Statistical function used to count the number of the selected cells based on the specified criterion"},"COVAR":{"n":"COVAR","a":"( array-1 , array-2 )","d":"Statistical function used to return the covariance of two ranges of data"},"CRITBINOM":{"n":"CRITBINOM","a":"( number-trials , success-probability , alpha )","d":"Statistical function used to return the smallest value for which the cumulative binomial distribution is greater than or equal to the specified alpha value"},"DEVSQ":{"n":"DEVSQ","a":"( argument-list )","d":"Statistical function used to analyze the range of data and sum the squares of the deviations of numbers from their mean"},"EXPONDIST":{"n":"EXPONDIST","a":"( x , lambda , cumulative-flag )","d":"Statistical function used to return the exponential distribution"},"FISHER":{"n":"FISHER","a":"( number )","d":"Statistical function used to return the Fisher transformation of a number"},"FISHERINV":{"n":"FISHERINV","a":"( number )","d":"Statistical function used to perform the inverse of Fisher transformation"},"FORECAST":{"n":"FORECAST","a":"( x , array-1 , array-2 )","d":"Statistical function used to predict a future value based on existing values provided"},"FREQUENCY":{"n":"FREQUENCY","a":"( data-array , bins-array )","d":"Statistical function used to сalculate how often values occur within the selected range of cells and display the first value of the returned vertical array of numbers"},"GAMMALN":{"n":"GAMMALN","a":"(number)","d":"Statistical function used to return the natural logarithm of the gamma function"},"GEOMEAN":{"n":"GEOMEAN","a":"( argument-list )","d":"Statistical function used to calculate the geometric mean of the argument list"},"HARMEAN":{"n":"HARMEAN","a":"( argument-list )","d":"Statistical function used to calculate the harmonic mean of the argument list"},"HYPGEOMDIST":{"n":"HYPGEOMDIST","a":"( sample-successes , number-sample , population-successes , number-population )","d":"Statistical function used to return the hypergeometric distribution, the probability of a given number of sample successes, given the sample size, population successes, and population size"},"INTERCEPT":{"n":"INTERCEPT","a":"( array-1 , array-2 )","d":"Statistical function used to analyze the first array values and second array values to calculate the intersection point"},"KURT":{"n":"KURT","a":"( argument-list )","d":"Statistical function used to return the kurtosis of the argument list"},"LARGE":{"n":"LARGE","a":"( array , k )","d":"Statistical function used to analyze the range of cells and return the nth largest value"},"LOGINV":{"n":"LOGINV","a":"( x , mean , standard-deviation )","d":"Statistical function used to return the inverse of the lognormal cumulative distribution function of the given x value with the specified parameters"},"LOGNORMDIST":{"n":"LOGNORMDIST","a":"( x , mean , standard-deviation )","d":"Statistical function used to analyze logarithmically transformed data and return the lognormal cumulative distribution function of the given x value with the specified parameters"},"MAX":{"n":"MAX","a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the largest number"},"MAXA":{"n":"MAXA","a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the largest value"},"MEDIAN":{"n":"MEDIAN","a":"( argument-list )","d":"Statistical function used to calculate the median of the argument list"},"MIN":{"n":"MIN","a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the smallest number"},"MINA":{"n":"MINA","a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the smallest value"},"MODE":{"n":"MODE","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the most frequently occurring value"},"NEGBINOMDIST":{"n":"NEGBINOMDIST","a":"( number-failures , number-successes , success-probability )","d":"Statistical function used to return the negative binomial distribution"},"NORMDIST":{"n":"NORMDIST","a":"( x , mean , standard-deviation , cumulative-flag )","d":"Statistical function used to return the normal distribution for the specified mean and standard deviation"},"NORMINV":{"n":"NORMINV","a":"( x , mean , standard-deviation )","d":"Statistical function used to return the inverse of the normal cumulative distribution for the specified mean and standard deviation"},"NORMSDIST":{"n":"NORMSDIST","a":"(number)","d":"Statistical function used to return the standard normal cumulative distribution function"},"NORMSINV":{"n":"NORMSINV","a":"( probability )","d":"Statistical function used to return the inverse of the standard normal cumulative distribution"},"PEARSON":{"n":"PEARSON","a":"( array-1 , array-2 )","d":"Statistical function used to return the Pearson product moment correlation coefficient"},"PERCENTILE":{"n":"PERCENTILE","a":"( array , k )","d":"Statistical function used to analyze the range of data and return the nth percentile"},"PERCENTRANK":{"n":"PERCENTRANK","a":"( array , x [ , significance ] )","d":"Statistical function used to return the rank of a value in a set of values as a percentage of the set"},"PERMUT":{"n":"PERMUT","a":"( number , number-chosen )","d":"Statistical function used to return the number of permutations for a specified number of items"},"POISSON":{"n":"POISSON","a":"( x , mean , cumulative-flag )","d":"Statistical function used to return the Poisson distribution"},"PROB":{"n":"PROB","a":"( x-range , probability-range , lower-limit [ , upper-limit ] )","d":"Statistical function used to return the probability that values in a range are between lower and upper limits"},"QUARTILE":{"n":"QUARTILE","a":"( array , result-category )","d":"Statistical function used to analyze the range of data and return the quartile"},"RSQ":{"n":"RSQ","a":"( array-1 , array-2 )","d":"Statistical function used to return the square of the Pearson product moment correlation coefficient"},"SKEW":{"n":"SKEW","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the skewness of a distribution of the argument list"},"SLOPE":{"n":"SLOPE","a":"( array-1 , array-2 )","d":"Statistical function used to return the slope of the linear regression line through data in two arrays"},"SMALL":{"n":"SMALL","a":"( array , k )","d":"Statistical function used to analyze the range of data and find the nth smallest value"},"STANDARDIZE":{"n":"STANDARDIZE","a":"( x , mean , standard-deviation )","d":"Statistical function used to return a normalized value from a distribution characterized by the specified parameters"},"STDEV":{"n":"STDEV","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of a population based on a set of numbers"},"STDEVA":{"n":"STDEVA","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of a population based on a set of numbers, text, and logical values (TRUE or FALSE). The STDEVA function treats text and FALSE as a value of 0 and TRUE as a value of 1"},"STDEVP":{"n":"STDEVP","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of an entire population"},"STDEVPA":{"n":"STDEVPA","a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of an entire population"},"STEYX":{"n":"STEYX","a":"( known-ys , known-xs )","d":"Statistical function used to return the standard error of the predicted y-value for each x in the regression line"},"VAR":{"n":"VAR","a":"( argument-list )","d":"Statistical function used to analyze the set of values and calculate the sample variance"},"VARA":{"n":"VARA","a":"( argument-list )","d":"Statistical function used to analyze the set of values and calculate the sample variance"},"VARP":{"n":"VARP","a":"( argument-list )","d":"Statistical function used to analyze the set of values and calculate the variance of an entire population"},"VARPA":{"n":"VARPA","a":"( argument-list )","d":"Statistical function used to analyze the set of values and return the variance of an entire population"},"ACCRINT":{"n":"ACCRINT","a":"( issue , first-interest , settlement , rate , [ par ] , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the accrued interest for a security that pays periodic interest"},"ACCRINTM":{"n":"ACCRINTM","a":"( issue , settlement , rate , [ [ par ] [ , [ basis ] ] ] )","d":"Financial function used to calculate the accrued interest for a security that pays interest at maturity"},"AMORDEGRC":{"n":"AMORDEGRC","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Financial function used to calculate the depreciation of an asset for each accounting period using a degressive depreciation method"},"AMORLINC":{"n":"AMORLINC","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Financial function used to calculate the depreciation of an asset for each accounting period using a linear depreciation method"},"COUPDAYBS":{"n":"COUPDAYBS","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of days from the beginning of the coupon period to the settlement date"},"COUPDAYS":{"n":"COUPDAYS","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of days in the coupon period that contains the settlement date"},"COUPDAYSNC":{"n":"COUPDAYSNC","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of days from the settlement date to the next coupon payment"},"COUPNCD":{"n":"COUPNCD","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the next coupon date after the settlement date"},"COUPNUM":{"n":"COUPNUM","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of coupons between the settlement date and the maturity date"},"COUPPCD":{"n":"COUPPCD","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the previous coupon date before the settlement date"},"CUMIPMT":{"n":"CUMIPMT","a":"( rate , nper , pv , start-period , end-period , type )","d":"Financial function used to calculate the cumulative interest paid on an investment between two periods based on a specified interest rate and a constant payment schedule"},"CUMPRINC":{"n":"CUMPRINC","a":"( rate , nper , pv , start-period , end-period , type )","d":"Financial function used to calculate the cumulative principal paid on an investment between two periods based on a specified interest rate and a constant payment schedule"},"DB":{"n":"DB","a":"( cost , salvage , life , period [ , [ month ] ] )","d":"Financial function used to calculate the depreciation of an asset for a specified accounting period using the fixed-declining balance method"},"DDB":{"n":"DDB","a":"( cost , salvage , life , period [ , factor ] )","d":"Financial function used to calculate the depreciation of an asset for a specified accounting period using the double-declining balance method"},"DISC":{"n":"DISC","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Financial function used to calculate the discount rate for a security"},"DOLLARDE":{"n":"DOLLARDE","a":"( fractional-dollar , fraction )","d":"Financial function used to convert a dollar price represented as a fraction into a dollar price represented as a decimal number"},"DOLLARFR":{"n":"DOLLARFR","a":"( decimal-dollar , fraction )","d":"Financial function used to convert a dollar price represented as a decimal number into a dollar price represented as a fraction"},"DURATION":{"n":"DURATION","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the Macaulay duration of a security with an assumed par value of $100"},"EFFECT":{"n":"EFFECT","a":"( nominal-rate , npery )","d":"Financial function used to calculate the effective annual interest rate for a security based on a specified nominal annual interest rate and the number of compounding periods per year"},"FV":{"n":"FV","a":"( rate , nper , pmt [ , [ pv ] [ ,[ type ] ] ] )","d":"Financial function used to calculate the future value of an investment based on a specified interest rate and a constant payment schedule"},"FVSCHEDULE":{"n":"FVSCHEDULE","a":"( principal , schedule )","d":"Financial function used to calculate the future value of an investment based on a series of changeable interest rates"},"INTRATE":{"n":"INTRATE","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Financial function used to calculate the interest rate for a fully invested security that pays interest only at maturity"},"IPMT":{"n":"IPMT","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Financial function used to calculate the interest payment for an investment based on a specified interest rate and a constant payment schedule"},"IRR":{"n":"IRR","a":"( values [ , [ guess ] ] )","d":"Financial function used to calculate the internal rate of return for a series of periodic cash flows"},"ISPMT":{"n":"ISPMT","a":"( rate , per , nper , pv )","d":"Financial function used to calculate the interest payment for a specified period of an investment based on a constant payment schedule"},"MDURATION":{"n":"MDURATION","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the modified Macaulay duration of a security with an assumed par value of $100"},"MIRR":{"n":"MIRR","a":"( values , finance-rate , reinvest-rate )","d":"Financial function used to calculate the modified internal rate of return for a series of periodic cash flows"},"NOMINAL":{"n":"NOMINAL","a":"( effect-rate , npery )","d":"Financial function used to calculate the nominal annual interest rate for a security based on a specified effective annual interest rate and the number of compounding periods per year"},"NPER":{"n":"NPER","a":"( rate , pmt , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Financial function used to calculate the number of periods for an investment based on a specified interest rate and a constant payment schedule"},"NPV":{"n":"NPV","a":"( rate , argument-list )","d":"Financial function used to calculate the net present value of an investment based on a specified discount rate"},"ODDFPRICE":{"n":"ODDFPRICE","a":"( settlement , maturity , issue , first-coupon , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays periodic interest but has an odd first period (it is shorter or longer than other periods)"},"ODDFYIELD":{"n":"ODDFYIELD","a":"( settlement , maturity , issue , first-coupon , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the yield of a security that pays periodic interest but has an odd first period (it is shorter or longer than other periods)"},"ODDLPRICE":{"n":"ODDLPRICE","a":"( settlement , maturity , last-interest , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays periodic interest but has an odd last period (it is shorter or longer than other periods)"},"ODDLYIELD":{"n":"ODDLYIELD","a":"( settlement , maturity , last-interest , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the yield of a security that pays periodic interest but has an odd last period (it is shorter or longer than other periods)"},"PMT":{"n":"PMT","a":"( rate , nper , pv [ , [ fv ] [ ,[ type ] ] ] )","d":"Financial function used to calculate the payment amount for a loan based on a specified interest rate and a constant payment schedule"},"PPMT":{"n":"PPMT","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Financial function used to calculate the principal payment for an investment based on a specified interest rate and a constant payment schedule"},"PRICE":{"n":"PRICE","a":"( settlement , maturity , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays periodic interest"},"PRICEDISC":{"n":"PRICEDISC","a":"( settlement , maturity , discount , redemption [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a discounted security"},"PRICEMAT":{"n":"PRICEMAT","a":"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays interest at maturity"},"PV":{"n":"PV","a":"( rate , nper , pmt [ , [ fv ] [ ,[ type ] ] ] )","d":"Financial function used to calculate the present value of an investment based on a specified interest rate and a constant payment schedule"},"RATE":{"n":"RATE","a":"( nper , pmt , pv [ , [ [ fv ] [ , [ [ type ] [ , [ guess ] ] ] ] ] ] )","d":"Financial function used to calculate the interest rate for an investment based on a constant payment schedule"},"RECEIVED":{"n":"RECEIVED","a":"( settlement , maturity , investment , discount [ , [ basis ] ] )","d":"Financial function used to calculate the amount received at maturity for a fully invested security"},"SLN":{"n":"SLN","a":"( cost , salvage , life )","d":"Financial function used to calculate the depreciation of an asset for one accounting period using the straight-line depreciation method"},"SYD":{"n":"SYD","a":"( cost , salvage , life , per )","d":"Financial function used to calculate the depreciation of an asset for a specified accounting period using the sum of the years' digits method"},"TBILLEQ":{"n":"TBILLEQ","a":"( settlement , maturity , discount )","d":"Financial function used to calculate the bond-equivalent yield of a Treasury bill"},"TBILLPRICE":{"n":"TBILLPRICE","a":"( settlement , maturity , discount )","d":"Financial function used to calculate the price per $100 par value for a Treasury bill"},"TBILLYIELD":{"n":"TBILLYIELD","a":"( settlement , maturity , pr )","d":"Financial function used to calculate the yield of a Treasury bill"},"VDB":{"n":"VDB","a":"( cost , salvage , life , start-period , end-period [ , [ [ factor ] [ , [ no-switch-flag ] ] ] ] ] )","d":"Financial function used to calculate the depreciation of an asset for a specified or partial accounting period using the variable declining balance method"},"XIRR":{"n":"XIRR","a":"( values , dates [ , [ guess ] ] )","d":"Financial function used to calculate the internal rate of return for a series of irregular cash flows"},"XNPV":{"n":"XNPV","a":"( rate , values , dates )","d":"Financial function used to calculate the net present value for an investment based on a specified interest rate and a schedule of irregular payments"},"YIELD":{"n":"YIELD","a":"( settlement , maturity , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the yield of a security that pays periodic interest"},"YIELDDISC":{"n":"YIELDDISC","a":"( settlement , maturity , pr , redemption , [ , [ basis ] ] )","d":"Financial function used to calculate the annual yield of a discounted security"},"YIELDMAT":{"n":"YIELDMAT","a":"( settlement , maturity , issue , rate , pr [ , [ basis ] ] )","d":"Financial function used to calculate the annual yield of a security that pays interest at maturity"},"ABS":{"n":"ABS","a":"( x )","d":"Math and trigonometry function used to return the absolute value of a number"},"ACOS":{"n":"ACOS","a":"( x )","d":"Math and trigonometry function used to return the arccosine of a number"},"ACOSH":{"n":"ACOSH","a":"( x )","d":"Math and trigonometry function used to return the inverse hyperbolic cosine of a number"},"ASIN":{"n":"ASIN","a":"( x )","d":"Math and trigonometry function used to return the arcsine of a number"},"ASINH":{"n":"ASINH","a":"( x )","d":"Math and trigonometry function used to return the inverse hyperbolic sine of a number"},"ATAN":{"n":"ATAN","a":"( x )","d":"Math and trigonometry function used to return the arctangent of a number"},"ATAN2":{"n":"ATAN2","a":"( x, y )","d":"Math and trigonometry function used to return the arctangent of x and y coordinates"},"ATANH":{"n":"ATANH","a":"( x )","d":"Math and trigonometry function used to return the inverse hyperbolic tangent of a number"},"CEILING":{"n":"CEILING","a":"( x, significance )","d":"Math and trigonometry function used to round the number up to the nearest multiple of significance"},"COMBIN":{"n":"COMBIN","a":"( number , number-chosen )","d":"Math and trigonometry function used to return the number of combinations for a specified number of items"},"COS":{"n":"COS","a":"( x )","d":"Math and trigonometry function used to return the cosine of an angle"},"COSH":{"n":"COSH","a":"( x )","d":"Math and trigonometry function used to return the hyperbolic cosine of a number"},"DEGREES":{"n":"DEGREES","a":"( angle )","d":"Math and trigonometry function used to convert radians into degrees"},"EVEN":{"n":"EVEN","a":"( x )","d":"Math and trigonometry function used to round the number up to the nearest even integer"},"EXP":{"n":"EXP","a":"( x )","d":"Math and trigonometry function used to return the e constant raised to the desired power. The e constant is equal to 2,71828182845904"},"FACT":{"n":"FACT","a":"( x )","d":"Math and trigonometry function used to return the factorial of a number"},"FACTDOUBLE":{"n":"FACTDOUBLE","a":"( x )","d":"Math and trigonometry function used to return the double factorial of a number"},"FLOOR":{"n":"FLOOR","a":"( x, significance )","d":"Math and trigonometry function used to round the number down to the nearest multiple of significance"},"GCD":{"n":"GCD","a":"( argument-list )","d":"Math and trigonometry function used to return the greatest common divisor of two or more numbers"},"INT":{"n":"INT","a":"( x )","d":"Math and trigonometry function used to analyze and return the integer part of the specified number"},"LCM":{"n":"LCM","a":"( argument-list )","d":"Math and trigonometry function used to return the lowest common multiple of one or more numbers"},"LN":{"n":"LN","a":"( x )","d":"Math and trigonometry function used to return the natural logarithm of a number"},"LOG":{"n":"LOG","a":"( x [ , base ] )","d":"Math and trigonometry function used to return the logarithm of a number to a specified base"},"LOG10":{"n":"LOG10","a":"( x )","d":"Math and trigonometry function used to return the logarithm of a number to a base of 10"},"MDETERM":{"n":"MDETERM","a":"( array )","d":"Math and trigonometry function used to return the matrix determinant of an array"},"MINVERSE":{"n":"MINVERSE","a":"( array )","d":"Math and trigonometry function used to return the inverse matrix for a given matrix and display the first value of the returned array of numbers"},"MMULT":{"n":"MMULT","a":"( array1, array2 )","d":"Math and trigonometry function used to return the matrix product of two arrays and display the first value of the returned array of numbers"},"MOD":{"n":"MOD","a":"( x, y )","d":"Math and trigonometry function used to return the remainder after the division of a number by the specified divisor"},"MROUND":{"n":"MROUND","a":"( x, multiple )","d":"Math and trigonometry function used to round the number to the desired multiple"},"MULTINOMIAL":{"n":"MULTINOMIAL","a":"( argument-list )","d":"Math and trigonometry function used to return the ratio of the factorial of a sum of numbers to the product of factorials"},"ODD":{"n":"ODD","a":"( x )","d":"Math and trigonometry function used to round the number up to the nearest odd integer"},"PI":{"n":"PI","a":"()","d":"math and trigonometry functions. The function returns the mathematical constant pi, equal to 3.14159265358979. It does not require any argument"},"POWER":{"n":"POWER","a":"( x, y )","d":"Math and trigonometry function used to return the result of a number raised to the desired power"},"PRODUCT":{"n":"PRODUCT","a":"( argument-list )","d":"Math and trigonometry function used to multiply all the numbers in the selected range of cells and return the product"},"QUOTIENT":{"n":"QUOTIENT","a":"( dividend , divisor )","d":"Math and trigonometry function used to return the integer portion of a division"},"RADIANS":{"n":"RADIANS","a":"( angle )","d":"Math and trigonometry function used to convert degrees into radians"},"RAND":{"n":"RAND","a":"()","d":"math and trigonometry functions. The function returns a random number greater than or equal to 0 and less than 1. It does not require any argument"},"RANDBETWEEN":{"n":"RANDBETWEEN","a":"( lower-bound , upper-bound )","d":"math and trigonometry functions. The function returns a random number greater than or equal to lower-bound and less than or equal to upper-bound"},"ROMAN":{"n":"ROMAN","a":"( number, form )","d":"math and trigonometry functions. The function is used to convert a number to a roman numeral"},"ROUND":{"n":"ROUND","a":"( x , number-digits )","d":"Math and trigonometry function used to round the number to the desired number of digits"},"ROUNDDOWN":{"n":"ROUNDDOWN","a":"( x , number-digits )","d":"Math and trigonometry function used to round the number down to the desired number of digits"},"ROUNDUP":{"n":"ROUNDUP","a":"( x , number-digits )","d":"Math and trigonometry function used to round the number up to the desired number of digits"},"SERIESSUM":{"n":"SERIESSUM","a":"( input-value , initial-power , step , coefficients )","d":"Math and trigonometry function used to return the sum of a power series"},"SIGN":{"n":"SIGN","a":"( x )","d":"Math and trigonometry function used to return the sign of a number. If the number is positive, the function returns 1. If the number is negative, the function returns -1. If the number is 0, the function returns 0"},"SIN":{"n":"SIN","a":"( x )","d":"Math and trigonometry function used to return the sine of an angle"},"SINH":{"n":"SINH","a":"( x )","d":"Math and trigonometry function used to return the hyperbolic sine of a number"},"SQRT":{"n":"SQRT","a":"( x )","d":"Math and trigonometry function used to return the square root of a number"},"SQRTPI":{"n":"SQRTPI","a":"( x )","d":"one of the Math and trigonometry function used to return the square root of the pi constant (3.14159265358979) multiplied by the specified number"},"SUM":{"n":"SUM","a":"( argument-list )","d":"Math and trigonometry function used to add all the numbers in the selected range of cells and return the result"},"SUMIF":{"n":"SUMIF","a":"( cell-range, selection-criteria [ , sum-range ] )","d":"Math and trigonometry function used to add all the numbers in the selected range of cells based on the specified criterion and return the result"},"SUMPRODUCT":{"n":"SUMPRODUCT","a":"( argument-list )","d":"Math and trigonometry function used to multiply the values in the selected ranges of cells or arrays and return the sum of the products"},"SUMSQ":{"n":"SUMSQ","a":"( argument-list )","d":"Math and trigonometry function used to add the squares of numbers and return the result"},"SUMX2MY2":{"n":"SUMX2MY2","a":"( array-1 , array-2 )","d":"Math and trigonometry function used to sum the difference of squares between two arrays"},"SUMX2PY2":{"n":"SUMX2PY2","a":"( array-1 , array-2 )","d":"Math and trigonometry function used to sum the squares of numbers in the selected arrays and return the sum of the results"},"SUMXMY2":{"n":"SUMXMY2","a":"( array-1 , array-2 )","d":"Math and trigonometry function used to return the sum of the squares of the differences between corresponding items in the arrays"},"TAN":{"n":"TAN","a":"( x )","d":"Math and trigonometry function used to return the tangent of an angle"},"TANH":{"n":"TANH","a":"( x )","d":"Math and trigonometry function used to return the hyperbolic tangent of a number"},"TRUNC":{"n":"TRUNC","a":"( x [ , number-digits ] )","d":"Math and trigonometry function used to return a number truncated to a specified number of digits"},"ADDRESS":{"n":"ADDRESS","a":"( row-number , col-number [ , [ ref-type ] [ , [ A1-ref-style-flag ] [ , sheet-name ] ] ] )","d":"Lookup and reference function used to return a text representation of a cell address"},"CHOOSE":{"n":"CHOOSE","a":"( index , argument-list )","d":"Lookup and reference function used to return a value from a list of values based on a specified index (position)"},"COLUMN":{"n":"COLUMN","a":"( [ reference ] )","d":"Lookup and reference function used to return the column number of a cell"},"COLUMNS":{"n":"COLUMNS","a":"( array )","d":"Lookup and reference function used to return the number of columns in a cell reference"},"HLOOKUP":{"n":"HLOOKUP","a":"( lookup-value , table-array , row-index-num [ , [ range-lookup-flag ] ] )","d":"Lookup and reference function used to perform the horizontal search for a value in the top row of a table or an array and return the value in the same column based on a specified row index number"},"INDEX":{"n":"INDEX","a":"( array , [ row-number ] [ , [ column-number ] ] ) INDEX( reference , [ row-number ] [ , [ column-number ] [ , [ area-number ] ] ] )","d":"Lookup and reference function used to return a value within a range of cells on the base of a specified row and column number. The INDEX function has two forms"},"INDIRECT":{"n":"INDIRECT","a":"( ref-text [ , [ A1-ref-style-flag ] ] )","d":"Lookup and reference function used to return the reference to a cell based on its string representation"},"LOOKUP":{"n":"LOOKUP","a":"( lookup-value , lookup-vector , result-vector )","d":"Lookup and reference function used to return a value from a selected range (row or column containing the data in ascending order)"},"MATCH":{"n":"MATCH","a":"( lookup-value , lookup-array [ , [ match-type ]] )","d":"Lookup and reference function used to return a relative position of a specified item in a range of cells"},"OFFSET":{"n":"OFFSET","a":"( reference , rows , cols [ , [ height ] [ , [ width ] ] ] )","d":"Lookup and reference function used to return a reference to a cell displaced from the specified cell (or the upper-left cell in the range of cells) to a certain number of rows and columns"},"ROW":{"n":"ROW","a":"( [ reference ] )","d":"Lookup and reference function used to return the row number of a cell reference"},"ROWS":{"n":"ROWS","a":"( array )","d":"Lookup and reference function used to return the number of rows in a cell references"},"TRANSPOSE":{"n":"TRANSPOSE","a":"( array )","d":"Lookup and reference function used to return the first element of an array"},"VLOOKUP":{"n":"VLOOKUP","a":"( lookup-value , table-array , col-index-num [ , [ range-lookup-flag ] ] )","d":"Lookup and reference function used to perform the vertical search for a value in the left-most column of a table or an array and return the value in the same row based on a specified column index number"},"ERROR.TYPE":{"n":"ERROR.TYPE","a":"(value)","d":"Information function used to return the numeric representation of one of the existing errors"},"ISBLANK":{"n":"ISBLANK","a":"(value)","d":"Information function used to check if the cell is empty or not. If the cell does not contain any value, the function returns TRUE, otherwise the function returns FALSE"},"ISERR":{"n":"ISERR","a":"(value)","d":"Information function used to check for an error value. If the cell contains an error value (except #N/A), the function returns TRUE, otherwise the function returns FALSE"},"ISERROR":{"n":"ISERROR","a":"(value)","d":"Information function used to check for an error value. If the cell contains one of the error values: #N/A, #VALUE!, #REF!, #DIV/0!, #NUM!, #NAME? or #NULL, the function returns TRUE, otherwise the function returns FALSE"},"ISEVEN":{"n":"ISEVEN","a":"(number)","d":"Information function used to check for an even value. If the cell contains an even value, the function returns TRUE. If the value is odd, it returns FALSE"},"ISLOGICAL":{"n":"ISLOGICAL","a":"(value)","d":"Information function used to check for a logical value (TRUE or FALSE). If the cell contains a logical value, the function returns TRUE, otherwise the function returns FALSE"},"ISNA":{"n":"ISNA","a":"(value)","d":"Information function used to check for a #N/A error. If the cell contains a #N/A error value, the function returns TRUE, otherwise the function returns FALSE"},"ISNONTEXT":{"n":"ISNONTEXT","a":"(value)","d":"Information function used to check for a value that is not a text. If the cell does not contain a text value, the function returns TRUE, otherwise the function returns FALSE"},"ISNUMBER":{"n":"ISNUMBER","a":"(value)","d":"Information function used to check for a numeric value. If the cell contains a numeric value, the function returns TRUE, otherwise the function returns FALSE"},"ISODD":{"n":"ISODD","a":"(number)","d":"Information function used to check for an odd value. If the cell contains an odd value, the function returns TRUE. If the value is even, it returns FALSE"},"ISREF":{"n":"ISREF","a":"(value)","d":"Information function used to verify if the value is a valid cell reference"},"ISTEXT":{"n":"ISTEXT","a":"(value)","d":"Information function used to check for a text value. If the cell contains a text value, the function returns TRUE, otherwise the function returns FALSE"},"N":{"n":"N","a":"(value)","d":"Information function used to convert a value to a number"},"NA":{"n":"NA","a":"()","d":"Information function used to return the #N/A error value. This function does not require an argument"},"TYPE":{"n":"TYPE","a":"(value)","d":"Information function used to determine the type of the resulting or displayed value"},"AND":{"n":"AND","a":"(logical1, logical2, ...)","d":"Logical function used to check if the logical value you enter is TRUE or FALSE. The function returns TRUE if all the arguments are TRUE"},"FALSE":{"n":"FALSE","a":"()","d":"logical functions. The function returns FALSE and does not require any argument"},"IF":{"n":"IF","a":"(logical_test, value_if_true, value_if_false)","d":"Logical function used to check the logical expression and return one value if it is TRUE, or another if it is FALSE"},"IFERROR":{"n":"IFERROR","a":"(value, value_if_error)","d":"Logical function used to check if there is an error in the formula in the first argument. The function returns the result of the formula if there is no error, or the value_if_error if there is one"},"NOT":{"n":"NOT","a":"(logical)","d":"Logical function used to check if the logical value you enter is TRUE or FALSE. The function returns TRUE if the argument is FALSE and FALSE if the argument is TRUE"},"OR":{"n":"OR","a":"(logical1, logical2, ...)","d":"Logical function used to check if the logical value you enter is TRUE or FALSE. The function returns FALSE if all the arguments are FALSE"},"TRUE":{"n":"TRUE","a":"()","d":"logical functions which returns TRUE and does not require any argument"},"LocalFormulaOperands":{"StructureTables":{"h": "Headers","d": "Data","a": "All","tr": "This row","t": "Totals"},"CONST_TRUE_FALSE":{"t":"TRUE","f":"FALSE"}}} \ No newline at end of file +{"DATE":"DATE","DATEDIF":"DATEDIF","DATEVALUE":"DATEVALUE","DAY":"DAY","DAYS360":"DAYS360","EDATE":"EDATE","EOMONTH":"EOMONTH","HOUR":"HOUR","MINUTE":"MINUTE","MONTH":"MONTH","NETWORKDAYS":"NETWORKDAYS","NOW":"NOW","SECOND":"SECOND","TIME":"TIME","TIMEVALUE":"TIMEVALUE","TODAY":"TODAY","WEEKDAY":"WEEKDAY","WEEKNUM":"WEEKNUM","WORKDAY":"WORKDAY","YEAR":"YEAR","YEARFRAC":"YEARFRAC","BIN2DEC":"BIN2DEC","BIN2HEX":"BIN2HEX","BIN2OCT":"BIN2OCT","COMPLEX":"COMPLEX","DEC2BIN":"DEC2BIN","DEC2HEX":"DEC2HEX","DEC2OCT":"DEC2OCT","DELTA":"DELTA","ERF":"ERF","ERFC":"ERFC","GESTEP":"GESTEP","HEX2BIN":"HEX2BIN","HEX2DEC":"HEX2DEC","HEX2OCT":"HEX2OCT","IMABS":"IMABS","IMAGINARY":"IMAGINARY","IMARGUMENT":"IMARGUMENT","IMCONJUGATE":"IMCONJUGATE","IMCOS":"IMCOS","IMDIV":"IMDIV","IMEXP":"IMEXP","IMLN":"IMLN","IMLOG10":"IMLOG10","IMLOG2":"IMLOG2","IMPOWER":"IMPOWER","IMPRODUCT":"IMPRODUCT","IMREAL":"IMREAL","IMSIN":"IMSIN","IMSQRT":"IMSQRT","IMSUB":"IMSUB","IMSUM":"IMSUM","OCT2BIN":"OCT2BIN","OCT2DEC":"OCT2DEC","OCT2HEX":"OCT2HEX","CHAR":"CHAR","CLEAN":"CLEAN","CODE":"CODE","CONCATENATE":"CONCATENATE","DOLLAR":"DOLLAR","EXACT":"EXACT","FIND":"FIND","FINDB":"FINDB","FIXED":"FIXED","LEFT":"LEFT","LEFTB":"LEFTB","LEN":"LEN","LENB":"LENB","LOWER":"LOWER","MID":"MID","MIDB":"MIDB","PROPER":"PROPER","REPLACE":"REPLACE","REPLACEB":"REPLACEB","REPT":"REPT","RIGHT":"RIGHT","RIGHTB":"RIGHTB","SEARCH":"SEARCH","SEARCHB":"SEARCHB","SUBSTITUTE":"SUBSTITUTE","T":"Т","TEXT":"TEXT","TRIM":"TRIM","UPPER":"UPPER","VALUE":"VALUE","AVEDEV":"AVEDEV","AVERAGE":"AVERAGE","AVERAGEA":"AVERAGEA","AVERAGEIF":"AVERAGEIF","BINOMDIST":"BINOMDIST","CONFIDENCE":"CONFIDENCE","CORREL":"CORREL","COUNT":"COUNT","COUNTA":"COUNTA","COUNTBLANK":"COUNTBLANK","COUNTIF":"COUNTIF","COVAR":"COVAR","CRITBINOM":"CRITBINOM","DEVSQ":"DEVSQ","EXPONDIST":"EXPONDIST","FISHER":"FISHER","FISHERINV":"FISHERINV","FORECAST":"FORECAST","FREQUENCY":"FREQUENCY","GAMMALN":"GAMMALN","GEOMEAN":"GEOMEAN","HARMEAN":"HARMEAN","HYPGEOMDIST":"HYPGEOMDIST","INTERCEPT":"INTERCEPT","KURT":"KURT","LARGE":"LARGE","LOGINV":"LOGINV","LOGNORMDIST":"LOGNORMDIST","MAX":"MAX","MAXA":"MAXA","MEDIAN":"MEDIAN","MIN":"MIN","MINA":"MINA","MODE":"MODE","NEGBINOMDIST":"NEGBINOMDIST","NORMDIST":"NORMDIST","NORMINV":"NORMINV","NORMSDIST":"NORMSDIST","NORMSINV":"NORMSINV","PEARSON":"PEARSON","PERCENTILE":"PERCENTILE","PERCENTRANK":"PERCENTRANK","PERMUT":"PERMUT","POISSON":"POISSON","PROB":"PROB","QUARTILE":"QUARTILE","RSQ":"RSQ","SKEW":"SKEW","SLOPE":"SLOPE","SMALL":"SMALL","STANDARDIZE":"STANDARDIZE","STDEV":"STDEV","STDEVA":"STDEVA","STDEVP":"STDEVP","STDEVPA":"STDEVPA","STEYX":"STEYX","VAR":"VAR","VARA":"VARA","VARP":"VARP","VARPA":"VARPA","ACCRINT":"ACCRINT","ACCRINTM":"ACCRINTM","AMORDEGRC":"AMORDEGRC","AMORLINC":"AMORLINC","COUPDAYBS":"COUPDAYBS","COUPDAYS":"COUPDAYS","COUPDAYSNC":"COUPDAYSNC","COUPNCD":"COUPNCD","COUPNUM":"COUPNUM","COUPPCD":"COUPPCD","CUMIPMT":"CUMIPMT","CUMPRINC":"CUMPRINC","DB":"DB","DDB":"DDB","DISC":"DISC","DOLLARDE":"DOLLARDE","DOLLARFR":"DOLLARFR","DURATION":"DURATION","EFFECT":"EFFECT","FV":"FV","FVSCHEDULE":"FVSCHEDULE","INTRATE":"INTRATE","IPMT":"IPMT","IRR":"IRR","ISPMT":"ISPMT","MDURATION":"MDURATION","MIRR":"MIRR","NOMINAL":"NOMINAL","NPER":"NPER","NPV":"NPV","ODDFPRICE":"ODDFPRICE","ODDFYIELD":"ODDFYIELD","ODDLPRICE":"ODDLPRICE","ODDLYIELD":"ODDLYIELD","PMT":"PMT","PPMT":"PPMT","PRICE":"PRICE","PRICEDISC":"PRICEDISC","PRICEMAT":"PRICEMAT","PV":"PV","RATE":"RATE","RECEIVED":"RECEIVED","SLN":"SLN","SYD":"SYD","TBILLEQ":"TBILLEQ","TBILLPRICE":"TBILLPRICE","TBILLYIELD":"TBILLYIELD","VDB":"VDB","XIRR":"XIRR","XNPV":"XNPV","YIELD":"YIELD","YIELDDISC":"YIELDDISC","YIELDMAT":"YIELDMAT","ABS":"ABS","ACOS":"ACOS","ACOSH":"ACOSH","ASIN":"ASIN","ASINH":"ASINH","ATAN":"ATAN","ATAN2":"ATAN2","ATANH":"ATANH","CEILING":"CEILING","COMBIN":"COMBIN","COS":"COS","COSH":"COSH","DEGREES":"DEGREES","EVEN":"EVEN","EXP":"EXP","FACT":"FACT","FACTDOUBLE":"FACTDOUBLE","FLOOR":"FLOOR","GCD":"GCD","INT":"INT","LCM":"LCM","LN":"LN","LOG":"LOG","LOG10":"LOG10","MDETERM":"MDETERM","MINVERSE":"MINVERSE","MMULT":"MMULT","MOD":"MOD","MROUND":"MROUND","MULTINOMIAL":"MULTINOMIAL","ODD":"ODD","PI":"PI","POWER":"POWER","PRODUCT":"PRODUCT","QUOTIENT":"QUOTIENT","RADIANS":"RADIANS","RAND":"RAND","RANDBETWEEN":"RANDBETWEEN","ROMAN":"ROMAN","ROUND":"ROUND","ROUNDDOWN":"ROUNDDOWN","ROUNDUP":"ROUNDUP","SERIESSUM":"SERIESSUM","SIGN":"SIGN","SIN":"SIN","SINH":"SINH","SQRT":"SQRT","SQRTPI":"SQRTPI","SUBTOTAL":"SUBTOTAL","SUM":"SUM","SUMIF":"SUMIF","SUMPRODUCT":"SUMPRODUCT","SUMSQ":"SUMSQ","SUMX2MY2":"SUMX2MY2","SUMX2PY2":"SUMX2PY2","SUMXMY2":"SUMXMY2","TAN":"TAN","TANH":"TANH","TRUNC":"TRUNC","ADDRESS":"ADDRESS","CHOOSE":"CHOOSE","COLUMN":"COLUMN","COLUMNS":"COLUMNS","HLOOKUP":"HLOOKUP","INDEX":"INDEX","INDIRECT":"INDIRECT","LOOKUP":"LOOKUP","MATCH":"MATCH","OFFSET":"OFFSET","ROW":"ROW","ROWS":"ROWS","TRANSPOSE":"TRANSPOSE","VLOOKUP":"VLOOKUP","ERROR.TYPE":"ERROR.TYPE","ISBLANK":"ISBLANK","ISERR":"ISERR","ISERROR":"ISERROR","ISEVEN":"ISEVEN","ISLOGICAL":"ISLOGICAL","ISNA":"ISNA","ISNONTEXT":"ISNONTEXT","ISNUMBER":"ISNUMBER","ISODD":"ISODD","ISREF":"ISREF","ISTEXT":"ISTEXT","N":"N","NA":"NA","TYPE":"TYPE","AND":"AND","FALSE":"FALSE","IF":"IF","IFERROR":"IFERROR","NOT":"NOT","OR":"OR","TRUE":"TRUE","LocalFormulaOperands":{"StructureTables":{"h": "Headers","d": "Data","a": "All","tr": "This row","t": "Totals"},"CONST_TRUE_FALSE":{"t":"TRUE","f":"FALSE"},"CONST_ERROR":{"nil":"#NULL!","div":"#DIV\/0!","value":"#VALUE!","ref":"#REF!","name":"#NAME\\?","num":"#NUM!","na":"#N\/A","getdata":"#GETTING_DATA","uf":"#UNSUPPORTED_FUNCTION!"}}} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/formula-lang/en_desc.json b/apps/spreadsheeteditor/main/resources/formula-lang/en_desc.json new file mode 100644 index 000000000..5a0150635 --- /dev/null +++ b/apps/spreadsheeteditor/main/resources/formula-lang/en_desc.json @@ -0,0 +1 @@ +{"DATE":{"a":"( year, month, day )","d":"Date and time function used to add dates in the default format MM/dd/yyyy"},"DATEDIF":{"a":"( start-date , end-date , unit )","d":"Date and time function used to return the difference between two date values (start date and end date), based on the interval (unit) specified"},"DATEVALUE":{"a":"( date-time-string )","d":"Date and time function used to return a serial number of the specified date"},"DAY":{"a":"( date-value )","d":"Date and time function which returns the day (a number from 1 to 31) of the date given in the numerical format (MM/dd/yyyy by default)"},"DAYS360":{"a":"( start-date , end-date [ , method-flag ] )","d":"Date and time function used to return the number of days between two dates (start-date and end-date) based on a 360-day year using one of the calculation method (US or European)"},"EDATE":{"a":"( start-date , month-offset )","d":"Date and time function used to return the serial number of the date which comes the indicated number of months (month-offset) before or after the specified date (start-date)"},"EOMONTH":{"a":"( start-date , month-offset )","d":"Date and time function used to return the serial number of the last day of the month that comes the indicated number of months before or after the specified start date"},"HOUR":{"a":"( time-value )","d":"Date and time function which returns the hour (a number from 0 to 23) of the time value"},"MINUTE":{"a":"( time-value )","d":"Date and time function which returns the minute (a number from 0 to 59) of the time value"},"MONTH":{"a":"( date-value )","d":"Date and time function which returns the month (a number from 1 to 12) of the date given in the numerical format (MM/dd/yyyy by default)"},"NETWORKDAYS":{"a":"( start-date , end-date [ , holidays ] )","d":"Date and time function used to return the number of the work days between two dates (start date and end-date) excluding weekends and dates considered as holidays"},"NOW":{"a":"()","d":""},"SECOND":{"a":"( time-value )","d":"Date and time function which returns the second (a number from 0 to 59) of the time value"},"TIME":{"a":"( hour, minute, second )","d":"Date and time function used to add a particular time in the selected format (hh:mm tt by default)"},"TIMEVALUE":{"a":"( date-time-string )","d":"Date and time function used to return the serial number of a time"},"TODAY":{"a":"()","d":"Date and time function used to add the current day in the following format MM/dd/yy. This function does not require an argument"},"WEEKDAY":{"a":"( serial-value [ , weekday-start-flag ] )","d":"Date and time function used to determine which day of the week the specified date is"},"WEEKNUM":{"a":"( serial-value [ , weekday-start-flag ] )","d":"date and time functions. It used to return the number of the week the specified date falls within the year"},"WORKDAY":{"a":"( start-date , day-offset [ , holidays ] )","d":"Date and time function used to return the date which comes the indicated number of days (day-offset) before or after the specified start date excluding weekends and dates considered as holidays"},"YEAR":{"a":"( date-value )","d":"Date and time function which returns the year (a number from 1900 to 9999) of the date given in the numerical format (MM/dd/yyyy by default)"},"YEARFRAC":{"a":"( start-date , end-date [ , basis ] )","d":"Date and time function used to return the fraction of a year represented by the number of whole days from start-date to end-date calculated on the specified basis"},"BIN2DEC":{"a":"( number )","d":"Engineering function used to convert a binary number into a decimal number"},"BIN2HEX":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a binary number into a hexadecimal number"},"BIN2OCT":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a binary number into an octal number"},"COMPLEX":{"a":"( real-number , imaginary-number [ , suffix ] )","d":"Engineering function used to convert a real part and an imaginary part into the complex number expressed in a + bi or a + bj form"},"DEC2BIN":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a decimal number into a binary number"},"DEC2HEX":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a decimal number into a hexadecimal number"},"DEC2OCT":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a decimal number into an octal number"},"DELTA":{"a":"( number-1 [ , number-2 ] )","d":"Engineering function used to test if two numbers are equal. The function returns 1 if the numbers are equal and 0 otherwise"},"ERF":{"a":"( lower-bound [ , upper-bound ] )","d":"Engineering function used to calculate the error function integrated between the specified lower and upper limits"},"ERFC":{"a":"( lower-bound )","d":"Engineering function used to calculate the complementary error function integrated between the specified lower limit and infinity"},"GESTEP":{"a":"( number [ , step ] )","d":"Engineering function used to test if a number is greater than a threshold value. The function returns 1 if the number is greater than or equal to the threshold value and 0 otherwise"},"HEX2BIN":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a hexadecimal number to a binary number"},"HEX2DEC":{"a":"( number )","d":"Engineering function used to convert a hexadecimal number into a decimal number"},"HEX2OCT":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert a hexadecimal number to an octal number"},"IMABS":{"a":"( complex-number )","d":"Engineering function used to return the absolute value of a complex number"},"IMAGINARY":{"a":"( complex-number )","d":"Engineering function used to return the imaginary part of the specified complex number"},"IMARGUMENT":{"a":"( complex-number )","d":"Engineering function used to return the argument Theta, an angle expressed in radians"},"IMCONJUGATE":{"a":"( complex-number )","d":"Engineering function used to return the complex conjugate of a complex number"},"IMCOS":{"a":"( complex-number )","d":"Engineering function used to return the cosine of a complex number"},"IMDIV":{"a":"( complex-number-1 , complex-number-2 )","d":"Engineering function used to return the quotient of two complex numbers expressed in a + bi or a + bj form"},"IMEXP":{"a":"( complex-number )","d":"Engineering function used to return the e constant raised to the to the power specified by a complex number. The e constant is equal to 2,71828182845904"},"IMLN":{"a":"( complex-number )","d":"Engineering function used to return the natural logarithm of a complex number"},"IMLOG10":{"a":"( complex-number )","d":"Engineering function used to return the logarithm of a complex number to a base of 10"},"IMLOG2":{"a":"( complex-number )","d":"Engineering function used to return the logarithm of a complex number to a base of 2"},"IMPOWER":{"a":"( complex-number, power )","d":"Engineering function used to return the result of a complex number raised to the desired power"},"IMPRODUCT":{"a":"( argument-list )","d":"Engineering function used to return the product of the specified complex numbers"},"IMREAL":{"a":"( complex-number )","d":"Engineering function used to return the real part of the specified complex number"},"IMSIN":{"a":"( complex-number )","d":"Engineering function used to return the sine of a complex number"},"IMSQRT":{"a":"( complex-number )","d":"Engineering function used to return the square root of a complex number"},"IMSUB":{"a":"( complex-number-1 , complex-number-2 )","d":"Engineering function used to return the difference of two complex numbers expressed in a + bi or a + bj form"},"IMSUM":{"a":"( argument-list )","d":"Engineering function used to return the sum of the specified complex numbers"},"OCT2BIN":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert an octal number to a binary number"},"OCT2DEC":{"a":"( number )","d":"Engineering function used to convert an octal number to a decimal number"},"OCT2HEX":{"a":"( number [ , num-hex-digits ] )","d":"Engineering function used to convert an octal number to a hexadecimal number"},"CHAR":{"a":"( number )","d":"Text and data function used to return the ASCII character specified by a number"},"CLEAN":{"a":"( string )","d":"Text and data function used to remove all the nonprintable characters from the selected string"},"CODE":{"a":"( string )","d":"Text and data function used to return the ASCII value of the specified character or the first character in a cell"},"CONCATENATE":{"a":"(text1, text2, ...)","d":"Text and data function used to combine the data from two or more cells into a single one"},"DOLLAR":{"a":"( number [ , num-decimal ] )","d":"Text and data function used to convert a number to text, using a currency format $#.##"},"EXACT":{"a":"(text1, text2)","d":"Text and data function used to compare data in two cells. The function returns TRUE if the data are the same, and FALSE if not"},"FIND":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to find the specified substring (string-1) within a string (string-2) and is intended for languages that use the single-byte character set (SBCS)"},"FINDB":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to find the specified substring (string-1) within a string (string-2) and is intended for languages the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"FIXED":{"a":"( number [ , [ num-decimal ] [ , suppress-commas-flag ] ] )","d":"Text and data function used to return the text representation of a number rounded to a specified number of decimal places"},"LEFT":{"a":"( string [ , number-chars ] )","d":"Text and data function used to extract the substring from the specified string starting from the left character and is intended for languages that use the single-byte character set (SBCS)"},"LEFTB":{"a":"( string [ , number-chars ] )","d":"Text and data function used to extract the substring from the specified string starting from the left character and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"LEN":{"a":"( string )","d":"Text and data function used to analyse the specified string and return the number of characters it contains and is intended for languages that use the single-byte character set (SBCS)"},"LENB":{"a":"( string )","d":"Text and data function used to analyse the specified string and return the number of characters it contains and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"LOWER":{"a":"(text)","d":"Text and data function used to convert uppercase letters to lowercase in the selected cell"},"MID":{"a":"( string , start-pos , number-chars )","d":"Text and data function used to extract the characters from the specified string starting from any position and is intended for languages that use the single-byte character set (SBCS)"},"MIDB":{"a":"( string , start-pos , number-chars )","d":"Text and data function used to extract the characters from the specified string starting from any position and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"PROPER":{"a":"( string )","d":"Text and data function used to convert the first character of each word to uppercase and all the remaining characters to lowercase"},"REPLACE":{"a":"( string-1, start-pos, number-chars, string-2 )","d":"Text and data function used to replace a set of characters, based on the number of characters and the start position you specify, with a new set of characters and is intended for languages that use the single-byte character set (SBCS)"},"REPLACEB":{"a":"( string-1, start-pos, number-chars, string-2 )","d":"Text and data function used to replace a set of characters, based on the number of characters and the start position you specify, with a new set of characters and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"REPT":{"a":"(text, number_of_times)","d":"Text and data function used to repeat the data in the selected cell as many time as you wish"},"RIGHT":{"a":"( string [ , number-chars ] )","d":"Text and data function used to extract a substring from a string starting from the right-most character, based on the specified number of characters and is intended for languages that use the single-byte character set (SBCS)"},"RIGHTB":{"a":"( string [ , number-chars ] )","d":"Text and data function used to extract a substring from a string starting from the right-most character, based on the specified number of characters and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"SEARCH":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to return the location of the specified substring in a string and is intended for languages that use the single-byte character set (SBCS)"},"SEARCHB":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Text and data function used to return the location of the specified substring in a string and is intended for languages that use the double-byte character set (DBCS) like Japanese, Chinese, Korean etc."},"SUBSTITUTE":{"a":"( string , old-string , new-string [ , occurence ] )","d":"Text and data function used to replace a set of characters with a new one"},"T":{"a":"( value )","d":"Text and data function used to check whether the value in the cell (or used as argument) is text or not. In case it is not text, the function returns blank result. In case the value/argument is text, the function returns the same text value"},"TEXT":{"a":"( value , format )","d":"Text and data function used to convert a value to a text in the specified format"},"TRIM":{"a":"( string )","d":"Text and data function used to remove the leading and trailing spaces from a string"},"UPPER":{"a":"(text)","d":"Text and data function used to convert lowercase letters to uppercase in the selected cell"},"VALUE":{"a":"( string )","d":"Text and data function used to convert a text value that represents a number to a number. If the converted text is not a number, the function will return a #VALUE! error"},"AVEDEV":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the average of the absolute deviations of numbers from their mean"},"AVERAGE":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and find the average value"},"AVERAGEA":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data including text and logical values and find the average value. The AVERAGEA function treats text and FALSE as a value of 0 and TRUE as a value of 1"},"AVERAGEIF":{"a":"( cell-range, selection-criteria [ , average-range ] )","d":"Statistical function used to analyze the range of data and find the average value of all numbers in a range of cells, based on the specified criterion"},"BINOMDIST":{"a":"( number-successes , number-trials , success-probability , cumulative-flag )","d":"Statistical function used to return the individual term binomial distribution probability"},"CONFIDENCE":{"a":"( alpha , standard-dev , size )","d":"Statistical function used to return the confidence interval"},"CORREL":{"a":"( array-1 , array-2 )","d":"Statistical function used to analyze the range of data and return the correlation coefficient of two range of cells"},"COUNT":{"a":"( argument-list )","d":"Statistical function used to count the number of the selected cells which contain numbers ignoring empty cells or those contaning text"},"COUNTA":{"a":"( argument-list )","d":"Statistical function used to analyze the range of cells and count the number of cells that are not empty"},"COUNTBLANK":{"a":"( argument-list )","d":"Statistical function used to analyze the range of cells and return the number of the empty cells"},"COUNTIF":{"a":"( cell-range, selection-criteria )","d":"Statistical function used to count the number of the selected cells based on the specified criterion"},"COVAR":{"a":"( array-1 , array-2 )","d":"Statistical function used to return the covariance of two ranges of data"},"CRITBINOM":{"a":"( number-trials , success-probability , alpha )","d":"Statistical function used to return the smallest value for which the cumulative binomial distribution is greater than or equal to the specified alpha value"},"DEVSQ":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and sum the squares of the deviations of numbers from their mean"},"EXPONDIST":{"a":"( x , lambda , cumulative-flag )","d":"Statistical function used to return the exponential distribution"},"FISHER":{"a":"( number )","d":"Statistical function used to return the Fisher transformation of a number"},"FISHERINV":{"a":"( number )","d":"Statistical function used to perform the inverse of Fisher transformation"},"FORECAST":{"a":"( x , array-1 , array-2 )","d":"Statistical function used to predict a future value based on existing values provided"},"FREQUENCY":{"a":"( data-array , bins-array )","d":"Statistical function used to сalculate how often values occur within the selected range of cells and display the first value of the returned vertical array of numbers"},"GAMMALN":{"a":"(number)","d":"Statistical function used to return the natural logarithm of the gamma function"},"GEOMEAN":{"a":"( argument-list )","d":"Statistical function used to calculate the geometric mean of the argument list"},"HARMEAN":{"a":"( argument-list )","d":"Statistical function used to calculate the harmonic mean of the argument list"},"HYPGEOMDIST":{"a":"( sample-successes , number-sample , population-successes , number-population )","d":"Statistical function used to return the hypergeometric distribution, the probability of a given number of sample successes, given the sample size, population successes, and population size"},"INTERCEPT":{"a":"( array-1 , array-2 )","d":"Statistical function used to analyze the first array values and second array values to calculate the intersection point"},"KURT":{"a":"( argument-list )","d":"Statistical function used to return the kurtosis of the argument list"},"LARGE":{"a":"( array , k )","d":"Statistical function used to analyze the range of cells and return the nth largest value"},"LOGINV":{"a":"( x , mean , standard-deviation )","d":"Statistical function used to return the inverse of the lognormal cumulative distribution function of the given x value with the specified parameters"},"LOGNORMDIST":{"a":"( x , mean , standard-deviation )","d":"Statistical function used to analyze logarithmically transformed data and return the lognormal cumulative distribution function of the given x value with the specified parameters"},"MAX":{"a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the largest number"},"MAXA":{"a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the largest value"},"MEDIAN":{"a":"( argument-list )","d":"Statistical function used to calculate the median of the argument list"},"MIN":{"a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the smallest number"},"MINA":{"a":"(number1, number2, ...)","d":"Statistical function used to analyze the range of data and find the smallest value"},"MODE":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the most frequently occurring value"},"NEGBINOMDIST":{"a":"( number-failures , number-successes , success-probability )","d":"Statistical function used to return the negative binomial distribution"},"NORMDIST":{"a":"( x , mean , standard-deviation , cumulative-flag )","d":"Statistical function used to return the normal distribution for the specified mean and standard deviation"},"NORMINV":{"a":"( x , mean , standard-deviation )","d":"Statistical function used to return the inverse of the normal cumulative distribution for the specified mean and standard deviation"},"NORMSDIST":{"a":"(number)","d":"Statistical function used to return the standard normal cumulative distribution function"},"NORMSINV":{"a":"( probability )","d":"Statistical function used to return the inverse of the standard normal cumulative distribution"},"PEARSON":{"a":"( array-1 , array-2 )","d":"Statistical function used to return the Pearson product moment correlation coefficient"},"PERCENTILE":{"a":"( array , k )","d":"Statistical function used to analyze the range of data and return the nth percentile"},"PERCENTRANK":{"a":"( array , x [ , significance ] )","d":"Statistical function used to return the rank of a value in a set of values as a percentage of the set"},"PERMUT":{"a":"( number , number-chosen )","d":"Statistical function used to return the number of permutations for a specified number of items"},"POISSON":{"a":"( x , mean , cumulative-flag )","d":"Statistical function used to return the Poisson distribution"},"PROB":{"a":"( x-range , probability-range , lower-limit [ , upper-limit ] )","d":"Statistical function used to return the probability that values in a range are between lower and upper limits"},"QUARTILE":{"a":"( array , result-category )","d":"Statistical function used to analyze the range of data and return the quartile"},"RSQ":{"a":"( array-1 , array-2 )","d":"Statistical function used to return the square of the Pearson product moment correlation coefficient"},"SKEW":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the skewness of a distribution of the argument list"},"SLOPE":{"a":"( array-1 , array-2 )","d":"Statistical function used to return the slope of the linear regression line through data in two arrays"},"SMALL":{"a":"( array , k )","d":"Statistical function used to analyze the range of data and find the nth smallest value"},"STANDARDIZE":{"a":"( x , mean , standard-deviation )","d":"Statistical function used to return a normalized value from a distribution characterized by the specified parameters"},"STDEV":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of a population based on a set of numbers"},"STDEVA":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of a population based on a set of numbers, text, and logical values (TRUE or FALSE). The STDEVA function treats text and FALSE as a value of 0 and TRUE as a value of 1"},"STDEVP":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of an entire population"},"STDEVPA":{"a":"( argument-list )","d":"Statistical function used to analyze the range of data and return the standard deviation of an entire population"},"STEYX":{"a":"( known-ys , known-xs )","d":"Statistical function used to return the standard error of the predicted y-value for each x in the regression line"},"VAR":{"a":"( argument-list )","d":"Statistical function used to analyze the set of values and calculate the sample variance"},"VARA":{"a":"( argument-list )","d":"Statistical function used to analyze the set of values and calculate the sample variance"},"VARP":{"a":"( argument-list )","d":"Statistical function used to analyze the set of values and calculate the variance of an entire population"},"VARPA":{"a":"( argument-list )","d":"Statistical function used to analyze the set of values and return the variance of an entire population"},"ACCRINT":{"a":"( issue , first-interest , settlement , rate , [ par ] , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the accrued interest for a security that pays periodic interest"},"ACCRINTM":{"a":"( issue , settlement , rate , [ [ par ] [ , [ basis ] ] ] )","d":"Financial function used to calculate the accrued interest for a security that pays interest at maturity"},"AMORDEGRC":{"a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Financial function used to calculate the depreciation of an asset for each accounting period using a degressive depreciation method"},"AMORLINC":{"a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Financial function used to calculate the depreciation of an asset for each accounting period using a linear depreciation method"},"COUPDAYBS":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of days from the beginning of the coupon period to the settlement date"},"COUPDAYS":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of days in the coupon period that contains the settlement date"},"COUPDAYSNC":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of days from the settlement date to the next coupon payment"},"COUPNCD":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the next coupon date after the settlement date"},"COUPNUM":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the number of coupons between the settlement date and the maturity date"},"COUPPCD":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the previous coupon date before the settlement date"},"CUMIPMT":{"a":"( rate , nper , pv , start-period , end-period , type )","d":"Financial function used to calculate the cumulative interest paid on an investment between two periods based on a specified interest rate and a constant payment schedule"},"CUMPRINC":{"a":"( rate , nper , pv , start-period , end-period , type )","d":"Financial function used to calculate the cumulative principal paid on an investment between two periods based on a specified interest rate and a constant payment schedule"},"DB":{"a":"( cost , salvage , life , period [ , [ month ] ] )","d":"Financial function used to calculate the depreciation of an asset for a specified accounting period using the fixed-declining balance method"},"DDB":{"a":"( cost , salvage , life , period [ , factor ] )","d":"Financial function used to calculate the depreciation of an asset for a specified accounting period using the double-declining balance method"},"DISC":{"a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Financial function used to calculate the discount rate for a security"},"DOLLARDE":{"a":"( fractional-dollar , fraction )","d":"Financial function used to convert a dollar price represented as a fraction into a dollar price represented as a decimal number"},"DOLLARFR":{"a":"( decimal-dollar , fraction )","d":"Financial function used to convert a dollar price represented as a decimal number into a dollar price represented as a fraction"},"DURATION":{"a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the Macaulay duration of a security with an assumed par value of $100"},"EFFECT":{"a":"( nominal-rate , npery )","d":"Financial function used to calculate the effective annual interest rate for a security based on a specified nominal annual interest rate and the number of compounding periods per year"},"FV":{"a":"( rate , nper , pmt [ , [ pv ] [ ,[ type ] ] ] )","d":"Financial function used to calculate the future value of an investment based on a specified interest rate and a constant payment schedule"},"FVSCHEDULE":{"a":"( principal , schedule )","d":"Financial function used to calculate the future value of an investment based on a series of changeable interest rates"},"INTRATE":{"a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Financial function used to calculate the interest rate for a fully invested security that pays interest only at maturity"},"IPMT":{"a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Financial function used to calculate the interest payment for an investment based on a specified interest rate and a constant payment schedule"},"IRR":{"a":"( values [ , [ guess ] ] )","d":"Financial function used to calculate the internal rate of return for a series of periodic cash flows"},"ISPMT":{"a":"( rate , per , nper , pv )","d":"Financial function used to calculate the interest payment for a specified period of an investment based on a constant payment schedule"},"MDURATION":{"a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the modified Macaulay duration of a security with an assumed par value of $100"},"MIRR":{"a":"( values , finance-rate , reinvest-rate )","d":"Financial function used to calculate the modified internal rate of return for a series of periodic cash flows"},"NOMINAL":{"a":"( effect-rate , npery )","d":"Financial function used to calculate the nominal annual interest rate for a security based on a specified effective annual interest rate and the number of compounding periods per year"},"NPER":{"a":"( rate , pmt , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Financial function used to calculate the number of periods for an investment based on a specified interest rate and a constant payment schedule"},"NPV":{"a":"( rate , argument-list )","d":"Financial function used to calculate the net present value of an investment based on a specified discount rate"},"ODDFPRICE":{"a":"( settlement , maturity , issue , first-coupon , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays periodic interest but has an odd first period (it is shorter or longer than other periods)"},"ODDFYIELD":{"a":"( settlement , maturity , issue , first-coupon , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the yield of a security that pays periodic interest but has an odd first period (it is shorter or longer than other periods)"},"ODDLPRICE":{"a":"( settlement , maturity , last-interest , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays periodic interest but has an odd last period (it is shorter or longer than other periods)"},"ODDLYIELD":{"a":"( settlement , maturity , last-interest , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the yield of a security that pays periodic interest but has an odd last period (it is shorter or longer than other periods)"},"PMT":{"a":"( rate , nper , pv [ , [ fv ] [ ,[ type ] ] ] )","d":"Financial function used to calculate the payment amount for a loan based on a specified interest rate and a constant payment schedule"},"PPMT":{"a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Financial function used to calculate the principal payment for an investment based on a specified interest rate and a constant payment schedule"},"PRICE":{"a":"( settlement , maturity , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays periodic interest"},"PRICEDISC":{"a":"( settlement , maturity , discount , redemption [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a discounted security"},"PRICEMAT":{"a":"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )","d":"Financial function used to calculate the price per $100 par value for a security that pays interest at maturity"},"PV":{"a":"( rate , nper , pmt [ , [ fv ] [ ,[ type ] ] ] )","d":"Financial function used to calculate the present value of an investment based on a specified interest rate and a constant payment schedule"},"RATE":{"a":"( nper , pmt , pv [ , [ [ fv ] [ , [ [ type ] [ , [ guess ] ] ] ] ] ] )","d":"Financial function used to calculate the interest rate for an investment based on a constant payment schedule"},"RECEIVED":{"a":"( settlement , maturity , investment , discount [ , [ basis ] ] )","d":"Financial function used to calculate the amount received at maturity for a fully invested security"},"SLN":{"a":"( cost , salvage , life )","d":"Financial function used to calculate the depreciation of an asset for one accounting period using the straight-line depreciation method"},"SYD":{"a":"( cost , salvage , life , per )","d":"Financial function used to calculate the depreciation of an asset for a specified accounting period using the sum of the years' digits method"},"TBILLEQ":{"a":"( settlement , maturity , discount )","d":"Financial function used to calculate the bond-equivalent yield of a Treasury bill"},"TBILLPRICE":{"a":"( settlement , maturity , discount )","d":"Financial function used to calculate the price per $100 par value for a Treasury bill"},"TBILLYIELD":{"a":"( settlement , maturity , pr )","d":"Financial function used to calculate the yield of a Treasury bill"},"VDB":{"a":"( cost , salvage , life , start-period , end-period [ , [ [ factor ] [ , [ no-switch-flag ] ] ] ] ] )","d":"Financial function used to calculate the depreciation of an asset for a specified or partial accounting period using the variable declining balance method"},"XIRR":{"a":"( values , dates [ , [ guess ] ] )","d":"Financial function used to calculate the internal rate of return for a series of irregular cash flows"},"XNPV":{"a":"( rate , values , dates )","d":"Financial function used to calculate the net present value for an investment based on a specified interest rate and a schedule of irregular payments"},"YIELD":{"a":"( settlement , maturity , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Financial function used to calculate the yield of a security that pays periodic interest"},"YIELDDISC":{"a":"( settlement , maturity , pr , redemption , [ , [ basis ] ] )","d":"Financial function used to calculate the annual yield of a discounted security"},"YIELDMAT":{"a":"( settlement , maturity , issue , rate , pr [ , [ basis ] ] )","d":"Financial function used to calculate the annual yield of a security that pays interest at maturity"},"ABS":{"a":"( x )","d":"Math and trigonometry function used to return the absolute value of a number"},"ACOS":{"a":"( x )","d":"Math and trigonometry function used to return the arccosine of a number"},"ACOSH":{"a":"( x )","d":"Math and trigonometry function used to return the inverse hyperbolic cosine of a number"},"ASIN":{"a":"( x )","d":"Math and trigonometry function used to return the arcsine of a number"},"ASINH":{"a":"( x )","d":"Math and trigonometry function used to return the inverse hyperbolic sine of a number"},"ATAN":{"a":"( x )","d":"Math and trigonometry function used to return the arctangent of a number"},"ATAN2":{"a":"( x, y )","d":"Math and trigonometry function used to return the arctangent of x and y coordinates"},"ATANH":{"a":"( x )","d":"Math and trigonometry function used to return the inverse hyperbolic tangent of a number"},"CEILING":{"a":"( x, significance )","d":"Math and trigonometry function used to round the number up to the nearest multiple of significance"},"COMBIN":{"a":"( number , number-chosen )","d":"Math and trigonometry function used to return the number of combinations for a specified number of items"},"COS":{"a":"( x )","d":"Math and trigonometry function used to return the cosine of an angle"},"COSH":{"a":"( x )","d":"Math and trigonometry function used to return the hyperbolic cosine of a number"},"DEGREES":{"a":"( angle )","d":"Math and trigonometry function used to convert radians into degrees"},"EVEN":{"a":"( x )","d":"Math and trigonometry function used to round the number up to the nearest even integer"},"EXP":{"a":"( x )","d":"Math and trigonometry function used to return the e constant raised to the desired power. The e constant is equal to 2,71828182845904"},"FACT":{"a":"( x )","d":"Math and trigonometry function used to return the factorial of a number"},"FACTDOUBLE":{"a":"( x )","d":"Math and trigonometry function used to return the double factorial of a number"},"FLOOR":{"a":"( x, significance )","d":"Math and trigonometry function used to round the number down to the nearest multiple of significance"},"GCD":{"a":"( argument-list )","d":"Math and trigonometry function used to return the greatest common divisor of two or more numbers"},"INT":{"a":"( x )","d":"Math and trigonometry function used to analyze and return the integer part of the specified number"},"LCM":{"a":"( argument-list )","d":"Math and trigonometry function used to return the lowest common multiple of one or more numbers"},"LN":{"a":"( x )","d":"Math and trigonometry function used to return the natural logarithm of a number"},"LOG":{"a":"( x [ , base ] )","d":"Math and trigonometry function used to return the logarithm of a number to a specified base"},"LOG10":{"a":"( x )","d":"Math and trigonometry function used to return the logarithm of a number to a base of 10"},"MDETERM":{"a":"( array )","d":"Math and trigonometry function used to return the matrix determinant of an array"},"MINVERSE":{"a":"( array )","d":"Math and trigonometry function used to return the inverse matrix for a given matrix and display the first value of the returned array of numbers"},"MMULT":{"a":"( array1, array2 )","d":"Math and trigonometry function used to return the matrix product of two arrays and display the first value of the returned array of numbers"},"MOD":{"a":"( x, y )","d":"Math and trigonometry function used to return the remainder after the division of a number by the specified divisor"},"MROUND":{"a":"( x, multiple )","d":"Math and trigonometry function used to round the number to the desired multiple"},"MULTINOMIAL":{"a":"( argument-list )","d":"Math and trigonometry function used to return the ratio of the factorial of a sum of numbers to the product of factorials"},"ODD":{"a":"( x )","d":"Math and trigonometry function used to round the number up to the nearest odd integer"},"PI":{"a":"()","d":"math and trigonometry functions. The function returns the mathematical constant pi, equal to 3.14159265358979. It does not require any argument"},"POWER":{"a":"( x, y )","d":"Math and trigonometry function used to return the result of a number raised to the desired power"},"PRODUCT":{"a":"( argument-list )","d":"Math and trigonometry function used to multiply all the numbers in the selected range of cells and return the product"},"QUOTIENT":{"a":"( dividend , divisor )","d":"Math and trigonometry function used to return the integer portion of a division"},"RADIANS":{"a":"( angle )","d":"Math and trigonometry function used to convert degrees into radians"},"RAND":{"a":"()","d":"math and trigonometry functions. The function returns a random number greater than or equal to 0 and less than 1. It does not require any argument"},"RANDBETWEEN":{"a":"( lower-bound , upper-bound )","d":"math and trigonometry functions. The function returns a random number greater than or equal to lower-bound and less than or equal to upper-bound"},"ROMAN":{"a":"( number, form )","d":"math and trigonometry functions. The function is used to convert a number to a roman numeral"},"ROUND":{"a":"( x , number-digits )","d":"Math and trigonometry function used to round the number to the desired number of digits"},"ROUNDDOWN":{"a":"( x , number-digits )","d":"Math and trigonometry function used to round the number down to the desired number of digits"},"ROUNDUP":{"a":"( x , number-digits )","d":"Math and trigonometry function used to round the number up to the desired number of digits"},"SERIESSUM":{"a":"( input-value , initial-power , step , coefficients )","d":"Math and trigonometry function used to return the sum of a power series"},"SIGN":{"a":"( x )","d":"Math and trigonometry function used to return the sign of a number. If the number is positive, the function returns 1. If the number is negative, the function returns -1. If the number is 0, the function returns 0"},"SIN":{"a":"( x )","d":"Math and trigonometry function used to return the sine of an angle"},"SINH":{"a":"( x )","d":"Math and trigonometry function used to return the hyperbolic sine of a number"},"SQRT":{"a":"( x )","d":"Math and trigonometry function used to return the square root of a number"},"SQRTPI":{"a":"( x )","d":"one of the Math and trigonometry function used to return the square root of the pi constant (3.14159265358979) multiplied by the specified number"},"SUBTOTAL":{"a":"( function-number , argument-list )","d":"Returns a subtotal in a list or database"},"SUM":{"a":"( argument-list )","d":"Math and trigonometry function used to add all the numbers in the selected range of cells and return the result"},"SUMIF":{"a":"( cell-range, selection-criteria [ , sum-range ] )","d":"Math and trigonometry function used to add all the numbers in the selected range of cells based on the specified criterion and return the result"},"SUMPRODUCT":{"a":"( argument-list )","d":"Math and trigonometry function used to multiply the values in the selected ranges of cells or arrays and return the sum of the products"},"SUMSQ":{"a":"( argument-list )","d":"Math and trigonometry function used to add the squares of numbers and return the result"},"SUMX2MY2":{"a":"( array-1 , array-2 )","d":"Math and trigonometry function used to sum the difference of squares between two arrays"},"SUMX2PY2":{"a":"( array-1 , array-2 )","d":"Math and trigonometry function used to sum the squares of numbers in the selected arrays and return the sum of the results"},"SUMXMY2":{"a":"( array-1 , array-2 )","d":"Math and trigonometry function used to return the sum of the squares of the differences between corresponding items in the arrays"},"TAN":{"a":"( x )","d":"Math and trigonometry function used to return the tangent of an angle"},"TANH":{"a":"( x )","d":"Math and trigonometry function used to return the hyperbolic tangent of a number"},"TRUNC":{"a":"( x [ , number-digits ] )","d":"Math and trigonometry function used to return a number truncated to a specified number of digits"},"ADDRESS":{"a":"( row-number , col-number [ , [ ref-type ] [ , [ A1-ref-style-flag ] [ , sheet-name ] ] ] )","d":"Lookup and reference function used to return a text representation of a cell address"},"CHOOSE":{"a":"( index , argument-list )","d":"Lookup and reference function used to return a value from a list of values based on a specified index (position)"},"COLUMN":{"a":"( [ reference ] )","d":"Lookup and reference function used to return the column number of a cell"},"COLUMNS":{"a":"( array )","d":"Lookup and reference function used to return the number of columns in a cell reference"},"HLOOKUP":{"a":"( lookup-value , table-array , row-index-num [ , [ range-lookup-flag ] ] )","d":"Lookup and reference function used to perform the horizontal search for a value in the top row of a table or an array and return the value in the same column based on a specified row index number"},"INDEX":{"a":"( array , [ row-number ] [ , [ column-number ] ] ) INDEX( reference , [ row-number ] [ , [ column-number ] [ , [ area-number ] ] ] )","d":"Lookup and reference function used to return a value within a range of cells on the base of a specified row and column number. The INDEX function has two forms"},"INDIRECT":{"a":"( ref-text [ , [ A1-ref-style-flag ] ] )","d":"Lookup and reference function used to return the reference to a cell based on its string representation"},"LOOKUP":{"a":"( lookup-value , lookup-vector , result-vector )","d":"Lookup and reference function used to return a value from a selected range (row or column containing the data in ascending order)"},"MATCH":{"a":"( lookup-value , lookup-array [ , [ match-type ]] )","d":"Lookup and reference function used to return a relative position of a specified item in a range of cells"},"OFFSET":{"a":"( reference , rows , cols [ , [ height ] [ , [ width ] ] ] )","d":"Lookup and reference function used to return a reference to a cell displaced from the specified cell (or the upper-left cell in the range of cells) to a certain number of rows and columns"},"ROW":{"a":"( [ reference ] )","d":"Lookup and reference function used to return the row number of a cell reference"},"ROWS":{"a":"( array )","d":"Lookup and reference function used to return the number of rows in a cell references"},"TRANSPOSE":{"a":"( array )","d":"Lookup and reference function used to return the first element of an array"},"VLOOKUP":{"a":"( lookup-value , table-array , col-index-num [ , [ range-lookup-flag ] ] )","d":"Lookup and reference function used to perform the vertical search for a value in the left-most column of a table or an array and return the value in the same row based on a specified column index number"},"ERROR.TYPE":{"a":"(value)","d":"Information function used to return the numeric representation of one of the existing errors"},"ISBLANK":{"a":"(value)","d":"Information function used to check if the cell is empty or not. If the cell does not contain any value, the function returns TRUE, otherwise the function returns FALSE"},"ISERR":{"a":"(value)","d":"Information function used to check for an error value. If the cell contains an error value (except #N/A), the function returns TRUE, otherwise the function returns FALSE"},"ISERROR":{"a":"(value)","d":"Information function used to check for an error value. If the cell contains one of the error values: #N/A, #VALUE!, #REF!, #DIV/0!, #NUM!, #NAME? or #NULL, the function returns TRUE, otherwise the function returns FALSE"},"ISEVEN":{"a":"(number)","d":"Information function used to check for an even value. If the cell contains an even value, the function returns TRUE. If the value is odd, it returns FALSE"},"ISLOGICAL":{"a":"(value)","d":"Information function used to check for a logical value (TRUE or FALSE). If the cell contains a logical value, the function returns TRUE, otherwise the function returns FALSE"},"ISNA":{"a":"(value)","d":"Information function used to check for a #N/A error. If the cell contains a #N/A error value, the function returns TRUE, otherwise the function returns FALSE"},"ISNONTEXT":{"a":"(value)","d":"Information function used to check for a value that is not a text. If the cell does not contain a text value, the function returns TRUE, otherwise the function returns FALSE"},"ISNUMBER":{"a":"(value)","d":"Information function used to check for a numeric value. If the cell contains a numeric value, the function returns TRUE, otherwise the function returns FALSE"},"ISODD":{"a":"(number)","d":"Information function used to check for an odd value. If the cell contains an odd value, the function returns TRUE. If the value is even, it returns FALSE"},"ISREF":{"a":"(value)","d":"Information function used to verify if the value is a valid cell reference"},"ISTEXT":{"a":"(value)","d":"Information function used to check for a text value. If the cell contains a text value, the function returns TRUE, otherwise the function returns FALSE"},"N":{"a":"(value)","d":"Information function used to convert a value to a number"},"NA":{"a":"()","d":"Information function used to return the #N/A error value. This function does not require an argument"},"TYPE":{"a":"(value)","d":"Information function used to determine the type of the resulting or displayed value"},"AND":{"a":"(logical1, logical2, ...)","d":"Logical function used to check if the logical value you enter is TRUE or FALSE. The function returns TRUE if all the arguments are TRUE"},"FALSE":{"a":"()","d":"logical functions. The function returns FALSE and does not require any argument"},"IF":{"a":"(logical_test, value_if_true, value_if_false)","d":"Logical function used to check the logical expression and return one value if it is TRUE, or another if it is FALSE"},"IFERROR":{"a":"(value, value_if_error)","d":"Logical function used to check if there is an error in the formula in the first argument. The function returns the result of the formula if there is no error, or the value_if_error if there is one"},"NOT":{"a":"(logical)","d":"Logical function used to check if the logical value you enter is TRUE or FALSE. The function returns TRUE if the argument is FALSE and FALSE if the argument is TRUE"},"OR":{"a":"(logical1, logical2, ...)","d":"Logical function used to check if the logical value you enter is TRUE or FALSE. The function returns FALSE if all the arguments are FALSE"},"TRUE":{"a":"()","d":"logical functions which returns TRUE and does not require any argument"}} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/formula-lang/ru.json b/apps/spreadsheeteditor/main/resources/formula-lang/ru.json index 18362e385..5de93b7e2 100644 --- a/apps/spreadsheeteditor/main/resources/formula-lang/ru.json +++ b/apps/spreadsheeteditor/main/resources/formula-lang/ru.json @@ -1 +1 @@ -{"DATE":{"n":"ДАТА","a":"( year, month, day )","d":"Функция даты и времени, используется для добавления дат в стандартном формате ММ/дд/гггг"},"DATEDIF":{"n":"РАЗНДАТ","a":"( start-date , end-date , unit )","d":"Функция даты и времени, возвращает разницу между двумя датами (начальной и конечной) согласно заданному интервалу (единице)"},"DATEVALUE":{"n":"ДАТАЗНАЧ","a":"( date-time-string )","d":"Функция даты и времени, возвращает порядковый номер заданной даты"},"DAY":{"n":"ДЕНЬ","a":"( date-value )","d":"Функция даты и времени, возвращает день (число от 1 до 31), соответствующий дате, заданной в числовом формате (MM/дд/гггг по умолчанию)"},"DAYS360":{"n":"ДНЕЙ360","a":"( start-date , end-date [ , method-flag ] )","d":"Функция даты и времени, возвращает количество дней между двумя датами (начальной и конечной) на основе 360-дневного года с использованием одного из методов вычислений (американского или европейского)"},"EDATE":{"n":"ДАТАМЕС","a":"( start-date , month-offset )","d":"Функция даты и времени, возвращает порядковый номер даты, которая идет на заданное число месяцев (month-offset) до или после заданной даты (start-date)"},"EOMONTH":{"n":"КОНМЕСЯЦА","a":"( start-date , month-offset )","d":"Функция даты и времени, возвращает порядковый номер последнего дня месяца, который идет на заданное число месяцев до или после заданной начальной даты"},"HOUR":{"n":"ЧАС","a":"( time-value )","d":"Функция даты и времени, возвращает количество часов (число от 0 до 23), соответствующее заданному значению времени"},"MINUTE":{"n":"МИНУТЫ","a":"( time-value )","d":"Функция даты и времени, возвращает количество минут (число от 0 до 59), соответствующее заданному значению времени"},"MONTH":{"n":"МЕСЯЦ","a":"( date-value )","d":"Функция даты и времени, возвращает месяц (число от 1 до 12), соответствующий дате, заданной в числовом формате (MM/дд/гггг по умолчанию)"},"NETWORKDAYS":{"n":"ЧИСТРАБДНИ","a":"( start-date , end-date [ , holidays ] )","d":"Функция даты и времени, возвращает количество рабочих дней между двумя датами (начальной и конечной). Выходные и праздничные дни в это число не включаются"},"NOW":{"n":"ТДАТА","a":"()","d":"Функция даты и времени, используется для добавления в электронную таблицу текущей даты и времени в следующем формате: MM/дд/гг чч:мм. Данная функция не требует аргумента"},"SECOND":{"n":"СЕКУНДЫ","a":"( time-value )","d":"Функция даты и времени, возвращает количество секунд (число от 0 до 59), соответствующее заданному значению времени"},"TIME":{"n":"ВРЕМЯ","a":"( hour, minute, second )","d":"Функция даты и времени, используется для добавления определенного времени в выбранном формате (по умолчанию чч:мм tt (указатель половины дня a.m./p.m.))"},"TIMEVALUE":{"n":"ВРЕМЗНАЧ","a":"( date-time-string )","d":"Функция даты и времени, возвращает порядковый номер, соответствующий заданному времени"},"TODAY":{"n":"СЕГОДНЯ","a":"()","d":"Функция даты и времени, используется для добавления текущей даты в следующем формате: MM/дд/гг. Данная функция не требует аргумента"},"WEEKDAY":{"n":"ДЕНЬНЕД","a":"( serial-value [ , weekday-start-flag ] )","d":"Функция даты и времени, определяет, какой день недели соответствует заданной дате"},"WEEKNUM":{"n":"НОМНЕДЕЛИ","a":"( serial-value [ , weekday-start-flag ] )","d":"Функция даты и времени, возвращает порядковый номер той недели в течение года, на которую приходится заданная дата"},"WORKDAY":{"n":"РАБДЕНЬ","a":"( start-date , day-offset [ , holidays ] )","d":"Функция даты и времени, возвращает дату, которая идет на заданное число дней (day-offset) до или после заданной начальной даты, без учета выходных и праздничных дней"},"YEAR":{"n":"ГОД","a":"( date-value )","d":"Функция даты и времени, возвращает год (число от 1900 до 9999), соответствующий дате, заданной в числовом формате (MM/дд/гггг по умолчанию)"},"YEARFRAC":{"n":"ДОЛЯГОДА","a":"( start-date , end-date [ , basis ] )","d":"Функция даты и времени, возвращает долю года, представленную числом целых дней между начальной и конечной датами, вычисляемую заданным способом"},"BIN2DEC":{"n":"ДВ.В.ДЕС","a":"( number )","d":"Инженерная функция, преобразует двоичное число в десятичное"},"BIN2HEX":{"n":"ДВ.В.ШЕСТН","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует двоичное число в шестнадцатеричное"},"BIN2OCT":{"n":"ДВ.В.ВОСЬМ","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует двоичное число в восьмеричное"},"COMPLEX":{"n":"КОМПЛЕКСН","a":"( real-number , imaginary-number [ , suffix ] )","d":"Инженерная функция, используется для преобразования действительной и мнимой части в комплексное число, выраженное в формате a + bi или a + bj"},"DEC2BIN":{"n":"ДЕС.В.ДВ","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует десятичное число в двоичное"},"DEC2HEX":{"n":"ДЕС.В.ШЕСТН","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует десятичное число в шестнадцатеричное"},"DEC2OCT":{"n":"ДЕС.В.ВОСЬМ","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует десятичное число в восьмеричное"},"DELTA":{"n":"ДЕЛЬТА","a":"( number-1 [ , number-2 ] )","d":"Инженерная функция, используется для проверки равенства двух чисел. Функция возвращает 1, если числа равны, в противном случае возвращает 0"},"ERF":{"n":"ФОШ","a":"( lower-bound [ , upper-bound ] )","d":"Инженерная функция, используется для расчета значения функции ошибки, проинтегрированного в интервале от заданного нижнего до заданного верхнего предела"},"ERFC":{"n":"ДФОШ","a":"( lower-bound )","d":"Инженерная функция, используется для расчета значения дополнительной функции ошибки, проинтегрированного в интервале от заданного нижнего предела до бесконечности"},"GESTEP":{"n":"ПОРОГ","a":"( number [ , step ] )","d":"Инженерная функция, используется для проверки того, превышает ли какое-то число пороговое значение. Функция возвращает 1, если число больше или равно пороговому значению, в противном случае возвращает 0"},"HEX2BIN":{"n":"ШЕСТН.В.ДВ","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует шестнадцатеричное число в двоичное"},"HEX2DEC":{"n":"ШЕСТН.В.ДЕС","a":"( number )","d":"Инженерная функция, преобразует шестнадцатеричное число в десятичное"},"HEX2OCT":{"n":"ШЕСТН.В.ВОСЬМ","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует шестнадцатеричное число в восьмеричное"},"IMABS":{"n":"МНИМ.ABS","a":"( complex-number )","d":"Инженерная функция, возвращает абсолютное значение комплексного числа"},"IMAGINARY":{"n":"МНИМ.ЧАСТЬ","a":"( complex-number )","d":"Инженерная функция, возвращает мнимую часть заданного комплексного числа"},"IMARGUMENT":{"n":"МНИМ.АРГУМЕНТ","a":"( complex-number )","d":"Инженерная функция, возвращает значение аргумента Тета, то есть угол в радианах"},"IMCONJUGATE":{"n":"МНИМ.СОПРЯЖ","a":"( complex-number )","d":"Инженерная функция, возвращает комплексно-сопряженное значение комплексного числа"},"IMCOS":{"n":"МНИМ.COS","a":"( complex-number )","d":"Инженерная функция, возвращает косинус комплексного числа"},"IMDIV":{"n":"МНИМ.ДЕЛ","a":"( complex-number-1 , complex-number-2 )","d":"Инженерная функция, возвращает частное от деления двух комплексных чисел, представленных в формате a + bi или a + bj"},"IMEXP":{"n":"МНИМ.EXP","a":"( complex-number )","d":"Инженерная функция, возвращает экспоненту комплексного числа (значение константы e, возведенной в степень, заданную комплексным числом). Константа e равна 2,71828182845904"},"IMLN":{"n":"МНИМ.LN","a":"( complex-number )","d":"Инженерная функция, возвращает натуральный логарифм комплексного числа"},"IMLOG10":{"n":"МНИМ.LOG10","a":"( complex-number )","d":"Инженерная функция, возвращает двоичный логарифм комплексного числа"},"IMLOG2":{"n":"МНИМ.LOG2","a":"( complex-number )","d":"Инженерная функция, возвращает десятичный логарифм комплексного числа"},"IMPOWER":{"n":"МНИМ.СТЕПЕНЬ","a":"( complex-number, power )","d":"Инженерная функция, возвращает комплексное число, возведенное в заданную степень"},"IMPRODUCT":{"n":"МНИМ.ПРОИЗВЕД","a":"( argument-list )","d":"Инженерная функция, возвращает произведение указанных комплексных чисел"},"IMREAL":{"n":"МНИМ.ВЕЩ","a":"( complex-number )","d":"Инженерная функция, возвращает действительную часть комплексного числа"},"IMSIN":{"n":"МНИМ.SIN","a":"( complex-number )","d":"Инженерная функция, возвращает синус комплексного числа"},"IMSQRT":{"n":"МНИМ.КОРЕНЬ","a":"( complex-number )","d":"Инженерная функция, возвращает значение квадратного корня из комплексного числа"},"IMSUB":{"n":"МНИМ.РАЗН","a":"( complex-number-1 , complex-number-2 )","d":"Инженерная функция, возвращает разность двух комплексных чисел, представленных в формате a + bi или a + bj"},"IMSUM":{"n":"МНИМ.СУММ","a":"( argument-list )","d":"Инженерная функция, возвращает сумму двух комплексных чисел, представленных в формате a + bi или a + bj"},"OCT2BIN":{"n":"ВОСЬМ.В.ДВ","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует восьмеричное число в двоичное"},"OCT2DEC":{"n":"ВОСЬМ.В.ДЕС","a":"( number )","d":"Инженерная функция, преобразует восьмеричное число в десятичное"},"OCT2HEX":{"n":"ВОСЬМ.В.ШЕСТН","a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует восьмеричное число в шестнадцатеричное"},"CHAR":{"n":"СИМВОЛ","a":"( number )","d":"Функция для работы с текстом и данными, возвращает символ ASCII, соответствующий заданному числовому коду"},"CLEAN":{"n":"ПЕЧСИМВ","a":"( string )","d":"Функция для работы с текстом и данными, используется для удаления всех непечатаемых символов из выбранной строки"},"CODE":{"n":"КОДСИМВ","a":"( string )","d":"Функция для работы с текстом и данными, возвращает числовой код ASCII, соответствующий заданному символу или первому символу в ячейке"},"CONCATENATE":{"n":"СЦЕПИТЬ","a":"(text1, text2, ...)","d":"Функция для работы с текстом и данными, используется для объединения данных из двух или более ячеек в одну"},"DOLLAR":{"n":"РУБЛЬ","a":"( number [ , num-decimal ] )","d":"Функция для работы с текстом и данными, преобразует число в текст, используя денежный формат $#.##"},"EXACT":{"n":"СОВПАД","a":"(text1, text2)","d":"Функция для работы с текстом и данными, используется для сравнения данных в двух ячейках. Функция возвращает значение TRUE (ИСТИНА), если данные совпадают, и FALSE (ЛОЖЬ), если нет"},"FIND":{"n":"НАЙТИ","a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, используется для поиска заданной подстроки (string-1) внутри строки (string-2), предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"FINDB":{"n":"НАЙТИБ","a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, используется для поиска заданной подстроки (string-1) внутри строки (string-2), предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"FIXED":{"n":"ФИКСИРОВАННЫЙ","a":"( number [ , [ num-decimal ] [ , suppress-commas-flag ] ] )","d":"Функция для работы с текстом и данными, возвращает текстовое представление числа, округленного до заданного количества десятичных знаков"},"LEFT":{"n":"ЛЕВСИМВ","a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с левого символа, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"LEFTB":{"n":"ЛЕВБ","a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с левого символа, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"LEN":{"n":"ДЛСТР","a":"( string )","d":"Функция для работы с текстом и данными, анализирует заданную строку и возвращает количество символов, которые она содержит, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"LENB":{"n":"ДЛИНБ","a":"( string )","d":"Функция для работы с текстом и данными, анализирует заданную строку и возвращает количество символов, которые она содержит, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"LOWER":{"n":"СТРОЧН","a":"(text)","d":"Функция для работы с текстом и данными, используется для преобразования букв в выбранной ячейке из верхнего регистра в нижний"},"MID":{"n":"ПСТР","a":"( string , start-pos , number-chars )","d":"Функция для работы с текстом и данными, извлекает символы из заданной строки, начиная с любого места, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"MIDB":{"n":"ПСТРБ","a":"( string , start-pos , number-chars )","d":"Функция для работы с текстом и данными, извлекает символы из заданной строки, начиная с любого места, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"PROPER":{"n":"ПРОПНАЧ","a":"( string )","d":"Функция для работы с текстом и данными, преобразует первую букву каждого слова в прописную (верхний регистр), а все остальные буквы - в строчные (нижний регистр)"},"REPLACE":{"n":"ЗАМЕНИТЬ","a":"( string-1, start-pos, number-chars, string-2 )","d":"Функция для работы с текстом и данными, заменяет ряд символов на новый, с учетом заданного количества символов и начальной позиции, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"REPLACEB":{"n":"ЗАМЕНИТЬБ","a":"( string-1, start-pos, number-chars, string-2 )","d":"Функция для работы с текстом и данными, заменяет ряд символов на новый, с учетом заданного количества символов и начальной позиции, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"REPT":{"n":"ПОВТОР","a":"(text, number_of_times)","d":"Функция для работы с текстом и данными, используется для повторения данных в выбранной ячейке заданное количество раз"},"RIGHT":{"n":"ПРАВСИМВ","a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с крайнего правого символа, согласно заданному количеству символов, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"RIGHTB":{"n":"ПРАВБ","a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с крайнего правого символа, согласно заданному количеству символов, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"SEARCH":{"n":"ПОИСК","a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, возвращает местоположение заданной подстроки в строке, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"SEARCHB":{"n":"ПОИСКБ","a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, возвращает местоположение заданной подстроки в строке, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"SUBSTITUTE":{"n":"ПОДСТАВИТЬ","a":"( string , old-string , new-string [ , occurence ] )","d":"Функция для работы с текстом и данными, заменяет ряд символов на новый"},"T":{"n":"Т","a":"( value )","d":"Функция для работы с текстом и данными, используется для проверки, является ли значение в ячейке (или используемое как аргумент) текстом или нет. Если это не текст, функция возвращает пустой результат. Если значение/аргумент является текстом, функция возвращает это же текстовое значение"},"TEXT":{"n":"ТЕКСТ","a":"( value , format )","d":"Функция для работы с текстом и данными, преобразует числовое значение в текст в заданном формате"},"TRIM":{"n":"СЖПРОБЕЛЫ","a":"( string )","d":"Функция для работы с текстом и данными, удаляет пробелы из начала и конца строки"},"UPPER":{"n":"ПРОПИСН","a":"(text)","d":"Функция для работы с текстом и данными, используется для преобразования букв в выбранной ячейке из нижнего регистра в верхний"},"VALUE":{"n":"ЗНАЧЕН","a":"( string )","d":"Функция для работы с текстом и данными, преобразует текстовое значение, представляющее число, в числовое значение. Если преобразуемый текст не является числом, функция возвращает ошибку #VALUE!"},"AVEDEV":{"n":"СРОТКЛ","a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает среднее абсолютных значений отклонений чисел от их среднего значения"},"AVERAGE":{"n":"СРЗНАЧ","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и вычисляет среднее значение"},"AVERAGEA":{"n":"СРЗНАЧА","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных, включая текстовые и логические значения, и вычисляет среднее значение. Функция AVERAGEA интерпретирует текст и логическое значение FALSE (ЛОЖЬ) как числовое значение 0, а логическое значение TRUE (ИСТИНА) как числовое значение 1"},"AVERAGEIF":{"n":"СРЗНАЧЕСЛИ","a":"( cell-range, selection-criteria [ , average-range ] )","d":"Статистическая функция, анализирует диапазон данных и вычисляет среднее значение всех чисел в диапазоне ячеек, которые соответствуют заданному условию"},"BINOMDIST":{"n":"БИНОМРАСП","a":"( number-successes , number-trials , success-probability , cumulative-flag )","d":"Статистическая функция, возвращает отдельное значение вероятности биномиального распределения"},"CONFIDENCE":{"n":"ДОВЕРИТ","a":"( alpha , standard-dev , size )","d":"Статистическая функция, возвращает доверительный интервал"},"CORREL":{"n":"КОРРЕЛ","a":"( array-1 , array-2 )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает коэффициент корреляции между двумя диапазонами ячеек"},"COUNT":{"n":"СЧЁТ","a":"( argument-list )","d":"Статистическая функция, используется для подсчета количества ячеек в выбранном диапазоне, содержащих числа, без учета пустых или содержащих текст ячеек"},"COUNTA":{"n":"СЧЁТЗ","a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона ячеек и подсчета количества непустых ячеек"},"COUNTBLANK":{"n":"СЧИТАТЬПУСТОТЫ","a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона ячеек и возвращает количество пустых ячеек"},"COUNTIF":{"n":"СЧЁТЕСЛИ","a":"( cell-range, selection-criteria )","d":"Статистическая функция, используется для подсчета количества ячеек выделенного диапазона, соответствующих заданному условию"},"COVAR":{"n":"КОВАР","a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает ковариацию в двух диапазонах данных"},"CRITBINOM":{"n":"КРИТБИНОМ","a":"( number-trials , success-probability , alpha )","d":"Статистическая функция, возвращает наименьшее значение, для которого интегральное биномиальное распределение больше или равно заданному условию"},"DEVSQ":{"n":"КВАДРОТКЛ","a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона ячеек и возвращает сумму квадратов отклонений чисел от их среднего значения"},"EXPONDIST":{"n":"ЭКСПРАСП","a":"( x , lambda , cumulative-flag )","d":"Статистическая функция, возвращает экспоненциальное распределение"},"FISHER":{"n":"ФИШЕР","a":"( number )","d":"Статистическая функция, возвращает преобразование Фишера для числа"},"FISHERINV":{"n":"ФИШЕРОБР","a":"( number )","d":"Статистическая функция, выполняет обратное преобразование Фишера"},"FORECAST":{"n":"ПРОГНОЗ","a":"( x , array-1 , array-2 )","d":"Статистическая функция, предсказывает будущее значение на основе существующих значений"},"FREQUENCY":{"n":"ЧАСТОТА","a":"( data-array , bins-array )","d":"Статистическая функция, вычисляет частоту появления значений в выбранном диапазоне ячеек и отображает первое значение возвращаемого вертикального массива чисел"},"GAMMALN":{"n":"ГАММАНЛОГ","a":"(number)","d":"Статистическая функция, возвращает натуральный логарифм гамма-функции"},"GEOMEAN":{"n":"СРГЕОМ","a":"( argument-list )","d":"Статистическая функция, вычисляет среднее геометрическое для списка значений"},"HARMEAN":{"n":"СРГАРМ","a":"( argument-list )","d":"Статистическая функция, вычисляет среднее гармоническое для списка значений"},"HYPGEOMDIST":{"n":"ГИПЕРГЕОМЕТ","a":"( sample-successes , number-sample , population-successes , number-population )","d":"Статистическая функция, возвращает гипергеометрическое распределение, вероятность заданного количества успехов в выборке, если заданы размер выборки, количество успехов в генеральной совокупности и размер генеральной совокупности"},"INTERCEPT":{"n":"ОТРЕЗОК","a":"( array-1 , array-2 )","d":"Статистическая функция, анализирует значения первого и второго массивов для вычисления точки пересечения"},"KURT":{"n":"ЭКСЦЕСС","a":"( argument-list )","d":"Статистическая функция, возвращает эксцесс списка значений"},"LARGE":{"n":"НАИБОЛЬШИЙ","a":"( array , k )","d":"Статистическая функция, анализирует диапазон ячеек и возвращает n-ое по величине значение"},"LOGINV":{"n":"ЛОГНОРМОБР","a":"( x , mean , standard-deviation )","d":"Статистическая функция, возвращает обратное логарифмическое нормальное распределение для заданного значения x с указанными параметрами"},"LOGNORMDIST":{"n":"ЛОГНОРМРАСП","a":"( x , mean , standard-deviation )","d":"Статистическая функция, анализирует логарифмически преобразованные данные и возвращает логарифмическое нормальное распределение для заданного значения x с указанными параметрами"},"MAX":{"n":"МАКС","a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наибольшего числа"},"MAXA":{"n":"МАКСА","a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наибольшего значения"},"MEDIAN":{"n":"МЕДИАНА","a":"( argument-list )","d":"Статистическая функция, вычисляет медиану для списка значений"},"MIN":{"n":"МИН","a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наименьшего числа"},"MINA":{"n":"МИНА","a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наименьшего значения"},"MODE":{"n":"МОДА","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает наиболее часто встречающееся значение"},"NEGBINOMDIST":{"n":"ОТРБИНОМРАСП","a":"( number-failures , number-successes , success-probability )","d":"Статистическая функция, возвращает отрицательное биномиальное распределение"},"NORMDIST":{"n":"НОРМРАСП","a":"( x , mean , standard-deviation , cumulative-flag )","d":"Статистическая функция, возвращает нормальную функцию распределения для указанного среднего значения и стандартного отклонения"},"NORMINV":{"n":"НОРМОБР","a":"( x , mean , standard-deviation )","d":"Статистическая функция, возвращает обратное нормальное распределение для указанного среднего значения и стандартного отклонения"},"NORMSDIST":{"n":"НОРМСТРАСП","a":"(number)","d":"Статистическая функция, возвращает стандартное нормальное интегральное распределение"},"NORMSINV":{"n":"НОРМСТОБР","a":"( probability )","d":"Статистическая функция, возвращает обратное значение стандартного нормального распределения"},"PEARSON":{"n":"ПИРСОН","a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает коэффициент корреляции Пирсона"},"PERCENTILE":{"n":"ПЕРСЕНТИЛЬ","a":"( array , k )","d":"Статистическая функция, анализирует диапазон данных и возвращает n-ый процентиль"},"PERCENTRANK":{"n":"ПРОЦЕНТРАНГ","a":"( array , x [ , significance ] )","d":"Статистическая функция, возвращает категорию значения в наборе данных как процентное содержание в наборе данных"},"PERMUT":{"n":"ПЕРЕСТ","a":"( number , number-chosen )","d":"Статистическая функция, возвращает количество перестановок для заданного числа элементов"},"POISSON":{"n":"ПУАССОН","a":"( x , mean , cumulative-flag )","d":"Статистическая функция, возвращает распределение Пуассона"},"PROB":{"n":"ВЕРОЯТНОСТЬ","a":"( x-range , probability-range , lower-limit [ , upper-limit ] )","d":"Статистическая функция, возвращает вероятность того, что значения из интервала находятся внутри нижнего и верхнего пределов"},"QUARTILE":{"n":"КВАРТИЛЬ","a":"( array , result-category )","d":"Статистическая функция, анализирует диапазон данных и возвращает квартиль"},"RSQ":{"n":"КВПИРСОН","a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает квадрат коэффициента корреляции Пирсона"},"SKEW":{"n":"СКОС","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает асимметрию распределения для списка значений"},"SLOPE":{"n":"НАКЛОН","a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает наклон линии линейной регрессии для данных в двух массивах"},"SMALL":{"n":"НАИМЕНЬШИЙ","a":"( array , k )","d":"Статистическая функция, анализирует диапазон данных и находит n-ое наименьшее значение"},"STANDARDIZE":{"n":"НОРМАЛИЗАЦИЯ","a":"( x , mean , standard-deviation )","d":"Статистическая функция, возвращает нормализованное значение для распределения, характеризуемого заданными параметрами"},"STDEV":{"n":"СТАНДОТКЛОН","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает стандартное отклонение по выборке, содержащей числа"},"STDEVA":{"n":"СТАНДОТКЛОНА","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает стандартное отклонение по выборке, содержащей числа, текст и логические значения (TRUE или FALSE). Текст и логические значения FALSE (ЛОЖЬ) интерпретируются как 0, а логические значения TRUE (ИСТИНА) - как 1"},"STDEVP":{"n":"СТАНДОТКЛОНП","a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает стандартное отклонение по всей совокупности значений"},"STDEVPA":{"n":"СТАНДОТКЛОНПА","a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает стандартное отклонение по всей совокупности значений"},"STEYX":{"n":"СТОШYX","a":"( known-ys , known-xs )","d":"Статистическая функция, возвращает стандартную ошибку предсказанных значений Y для каждого значения X по регрессивной шкале"},"VAR":{"n":"ДИСП","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по выборке, содержащей числа"},"VARA":{"n":"ДИСПА","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по выборке"},"VARP":{"n":"ДИСПР","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по всей совокупности значений"},"VARPA":{"n":"ДИСПРА","a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по всей совокупности значений"},"ACCRINT":{"n":"НАКОПДОХОД","a":"( issue , first-interest , settlement , rate , [ par ] , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценным бумагам с периодической выплатой процентов"},"ACCRINTM":{"n":"НАКОПДОХОДПОГАШ","a":"( issue , settlement , rate , [ [ par ] [ , [ basis ] ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценным бумагам, процент по которым уплачивается при наступлении срока погашения"},"AMORDEGRC":{"n":"АМОРУМ","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества по каждому отчетному периоду методом дегрессивной амортизации"},"AMORLINC":{"n":"АМОРУВ","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества по каждому отчетному периоду методом линейной амортизации"},"COUPDAYBS":{"n":"ДНЕЙКУПОНДО","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества дней от начала действия купона до даты покупки ценной бумаги"},"COUPDAYS":{"n":"ДНЕЙКУПОН","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества дней в периоде купона, содержащем дату покупки ценной бумаги"},"COUPDAYSNC":{"n":"ДНЕЙКУПОНПОСЛЕ","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества дней от даты покупки ценной бумаги до следующей выплаты по купону"},"COUPNCD":{"n":"ДАТАКУПОНПОСЛЕ","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления даты следующей выплаты по купону после даты покупки ценной бумаги"},"COUPNUM":{"n":"ЧИСЛКУПОН","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества выплат процентов между датой покупки ценной бумаги и датой погашения"},"COUPPCD":{"n":"ДАТАКУПОНДО","a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления даты выплаты процентов, предшествующей дате покупки ценной бумаги"},"CUMIPMT":{"n":"ОБЩПЛАТ","a":"( rate , nper , pv , start-period , end-period , type )","d":"Финансовая функция, используется для вычисления общего размера процентых выплат по инвестиции между двумя периодами времени исходя из указанной процентной ставки и постоянной периодичности платежей"},"CUMPRINC":{"n":"ОБЩДОХОД","a":"( rate , nper , pv , start-period , end-period , type )","d":"Финансовая функция, используется для вычисления общей суммы, выплачиваемой в погашение основного долга по инвестиции между двумя периодами времени исходя из указанной процентной ставки и постоянной периодичности платежей"},"DB":{"n":"ФУО","a":"( cost , salvage , life , period [ , [ month ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период методом фиксированного убывающего остатка"},"DDB":{"n":"ДДОБ","a":"( cost , salvage , life , period [ , factor ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период методом двойного убывающего остатка"},"DISC":{"n":"СКИДКА","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления ставки дисконтирования по ценной бумаге"},"DOLLARDE":{"n":"РУБЛЬ.ДЕС","a":"( fractional-dollar , fraction )","d":"Финансовая функция, преобразует цену в долларах, представленную в виде дроби, в цену в долларах, выраженную десятичным числом"},"DOLLARFR":{"n":"РУБЛЬ.ДРОБЬ","a":"( decimal-dollar , fraction )","d":"Финансовая функция, преобразует цену в долларах, представленную десятичным числом, в цену в долларах, выраженную в виде дроби"},"DURATION":{"n":"ДЛИТ","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления продолжительности Маколея (взвешенного среднего срока погашения) для ценной бумаги с предполагаемой номинальной стоимостью 100 рублей"},"EFFECT":{"n":"ЭФФЕКТ","a":"( nominal-rate , npery )","d":"Финансовая функция, используется для вычисления эффективной (фактической) годовой процентной ставки по ценной бумаге исходя из указанной номинальной годовой процентной ставки и количества периодов в году, за которые начисляются сложные проценты"},"FV":{"n":"БС","a":"( rate , nper , pmt [ , [ pv ] [ ,[ type ] ] ] )","d":"Финансовая функция, вычисляет будущую стоимость инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"FVSCHEDULE":{"n":"БЗРАСПИС","a":"( principal , schedule )","d":"Финансовая функция, используется для вычисления будущей стоимости инвестиций на основании ряда непостоянных процентных ставок"},"INTRATE":{"n":"ИНОРМА","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления ставки доходности по полностью обеспеченной ценной бумаге, проценты по которой уплачиваются только при наступлении срока погашения"},"IPMT":{"n":"ПРПЛТ","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Финансовая функция, используется для вычисления суммы платежей по процентам для инвестиции исходя из указанной процентной ставки и постоянной периодичности платежей"},"IRR":{"n":"ВСД","a":"( values [ , [ guess ] ] )","d":"Финансовая функция, используется для вычисления внутренней ставки доходности по ряду периодических потоков денежных средств"},"ISPMT":{"n":"ПРОЦПЛАТ","a":"( rate , per , nper , pv )","d":"Финансовая функция, используется для вычисления процентов, выплачиваемых за определенный инвестиционный период, исходя из постоянной периодичности платежей"},"MDURATION":{"n":"МДЛИТ","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления модифицированной продолжительности Маколея (взвешенного среднего срока погашения) для ценной бумаги с предполагаемой номинальной стоимостью 100 рублей"},"MIRR":{"n":"МВСД","a":"( values , finance-rate , reinvest-rate )","d":"Финансовая функция, используется для вычисления модифицированной внутренней ставки доходности по ряду периодических денежных потоков"},"NOMINAL":{"n":"НОМИНАЛ","a":"( effect-rate , npery )","d":"Финансовая функция, используется для вычисления номинальной годовой процентной ставки по ценной бумаге исходя из указанной эффективной (фактической) годовой процентной ставки и количества периодов в году, за которые начисляются сложные проценты"},"NPER":{"n":"КПЕР","a":"( rate , pmt , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Финансовая функция, вычисляет количество периодов выплаты для инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"NPV":{"n":"ЧПС","a":"( rate , argument-list )","d":"Финансовая функция, вычисляет величину чистой приведенной стоимости инвестиции на основе заданной ставки дисконтирования"},"ODDFPRICE":{"n":"ЦЕНАПЕРВНЕРЕГ","a":"( settlement , maturity , issue , first-coupon , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги с периодической выплатой процентов в случае нерегулярной продолжительности первого периода выплаты процентов (больше или меньше остальных периодов)"},"ODDFYIELD":{"n":"ДОХОДПЕРВНЕРЕГ","a":"( settlement , maturity , issue , first-coupon , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценной бумаге с периодической выплатой процентов в случае нерегулярной продолжительности первого периода выплаты процентов (больше или меньше остальных периодов)"},"ODDLPRICE":{"n":"ЦЕНАПОСЛНЕРЕГ","a":"( settlement , maturity , last-interest , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги с периодической выплатой процентов в случае нерегулярной продолжительности последнего периода выплаты процентов (больше или меньше остальных периодов)"},"ODDLYIELD":{"n":"ДОХОДПОСЛНЕРЕГ","a":"( settlement , maturity , last-interest , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценной бумаге с периодической выплатой процентов в случае нерегулярной продолжительности последнего периода выплаты процентов (больше или меньше остальных периодов)"},"PMT":{"n":"ПЛТ","a":"( rate , nper , pv [ , [ fv ] [ ,[ type ] ] ] )","d":"Финансовая функция, вычисляет размер периодического платежа по ссуде исходя из заданной процентной ставки и постоянной периодичности платежей"},"PPMT":{"n":"ОСПЛТ","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Финансовая функция, используется для вычисления размера платежа в счет погашения основного долга по инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"PRICE":{"n":"ЦЕНА","a":"( settlement , maturity , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги с периодической выплатой процентов"},"PRICEDISC":{"n":"ЦЕНАСКИДКА","a":"( settlement , maturity , discount , redemption [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги, на которую сделана скидка"},"PRICEMAT":{"n":"ЦЕНАПОГАШ","a":"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги, процент по которой уплачивается при наступлении срока погашения"},"PV":{"n":"ПС","a":"( rate , nper , pmt [ , [ fv ] [ ,[ type ] ] ] )","d":"Финансовая функция, вычисляет текущую стоимость инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"RATE":{"n":"СТАВКА","a":"( nper , pmt , pv [ , [ [ fv ] [ , [ [ type ] [ , [ guess ] ] ] ] ] ] )","d":"Финансовая функция, используется для вычисления размера процентной ставки по инвестиции исходя из постоянной периодичности платежей"},"RECEIVED":{"n":"ПОЛУЧЕНО","a":"( settlement , maturity , investment , discount [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления суммы, полученной за полностью обеспеченную ценную бумагу при наступлении срока погашения"},"SLN":{"n":"АПЛ","a":"( cost , salvage , life )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за один отчетный период линейным методом амортизационных отчислений"},"SYD":{"n":"АСЧ","a":"( cost , salvage , life , per )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период методом \"суммы годовых цифр\""},"TBILLEQ":{"n":"РАВНОКЧЕК","a":"( settlement , maturity , discount )","d":"Финансовая функция, используется для вычисления эквивалентной доходности по казначейскому векселю"},"TBILLPRICE":{"n":"ЦЕНАКЧЕК","a":"( settlement , maturity , discount )","d":"Финансовая функция, используется для вычисления цены на 100 рублей номинальной стоимости для казначейского векселя"},"TBILLYIELD":{"n":"ДОХОДКЧЕК","a":"( settlement , maturity , pr )","d":"Финансовая функция, используется для вычисления доходности по казначейскому векселю"},"VDB":{"n":"ПУО","a":"( cost , salvage , life , start-period , end-period [ , [ [ factor ] [ , [ no-switch-flag ] ] ] ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период или его часть методом двойного уменьшения остатка или иным указанным методом"},"XIRR":{"n":"ЧИСТВНДОХ","a":"( values , dates [ , [ guess ] ] )","d":"Финансовая функция, используется для вычисления внутренней ставки доходности по ряду нерегулярных денежных потоков"},"XNPV":{"n":"ЧИСТНЗ","a":"( rate , values , dates )","d":"Финансовая функция, используется для вычисления чистой приведенной стоимости инвестиции исходя из указанной процентной ставки и нерегулярных выплат"},"YIELD":{"n":"ДОХОД","a":"( settlement , maturity , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления доходности по ценной бумаге с периодической выплатой процентов"},"YIELDDISC":{"n":"ДОХОДСКИДКА","a":"( settlement , maturity , pr , redemption , [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления годовой доходности по ценной бумаге, на которую дается скидка"},"YIELDMAT":{"n":"ДОХОДПОГАШ","a":"( settlement , maturity , issue , rate , pr [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления годовой доходности по ценным бумагам, процент по которым уплачивается при наступлении срока погашения"},"ABS":{"n":"ABS","a":"( x )","d":"Математическая и тригонометрическая функция, используется для нахождения модуля (абсолютной величины) числа"},"ACOS":{"n":"ACOS","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает арккосинус числа"},"ACOSH":{"n":"ACOSH","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический арккосинус числа"},"ASIN":{"n":"ASIN","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает арксинус числа"},"ASINH":{"n":"ASINH","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический арксинус числа"},"ATAN":{"n":"ATAN","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает арктангенс числа"},"ATAN2":{"n":"ATAN2","a":"( x, y )","d":"Математическая и тригонометрическая функция, возвращает арктангенс координат x и y"},"ATANH":{"n":"ATANH","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический арктангенс числа"},"CEILING":{"n":"ОКРВВЕРХ","a":"( x, significance )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число в большую сторону до ближайшего числа, кратного заданной значимости"},"COMBIN":{"n":"ЧИСЛКОМБ","a":"( number , number-chosen )","d":"Математическая и тригонометрическая функция, возвращает количество комбинаций для заданного числа элементов"},"COS":{"n":"COS","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает косинус угла"},"COSH":{"n":"COSH","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический косинус числа"},"DEGREES":{"n":"ГРАДУСЫ","a":"( angle )","d":"Математическая и тригонометрическая функция, преобразует радианы в градусы"},"EVEN":{"n":"ЧЁТН","a":"( x )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число до ближайшего четного целого числа"},"EXP":{"n":"EXP","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает значение константы e, возведенной в заданную степень. Константа e равна 2,71828182845904"},"FACT":{"n":"ФАКТР","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает факториал числа"},"FACTDOUBLE":{"n":"ДВФАКТР","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает двойной факториал числа"},"FLOOR":{"n":"ОКРВНИЗ","a":"( x, significance )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число в меньшую сторону до ближайшего числа, кратного заданной значимости"},"GCD":{"n":"НОД","a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает наибольший общий делитель для двух и более чисел"},"INT":{"n":"ЦЕЛОЕ","a":"( x )","d":"Математическая и тригонометрическая функция, анализирует и возвращает целую часть заданного числа"},"LCM":{"n":"НОК","a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает наименьшее общее кратное для одного или более чисел"},"LN":{"n":"LN","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает натуральный логарифм числа"},"LOG":{"n":"LOG","a":"( x [ , base ] )","d":"Математическая и тригонометрическая функция, возвращает логарифм числа по заданному основанию"},"LOG10":{"n":"LOG10","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает логарифм числа по основанию 10"},"MDETERM":{"n":"МОПРЕД","a":"( array )","d":"Математическая и тригонометрическая функция, возвращает определитель матрицы (матрица хранится в массиве)"},"MINVERSE":{"n":"МОБР","a":"( array )","d":"Математическая и тригонометрическая функция, возвращает обратную матрицу для заданной матрицы и отображает первое значение возвращаемого массива чисел"},"MMULT":{"n":"МУМНОЖ","a":"( array1, array2 )","d":"Математическая и тригонометрическая функция, возвращает матричное произведение двух массивов и отображает первое значение из возвращаемого массива чисел"},"MOD":{"n":"ОСТАТ","a":"( x, y )","d":"Математическая и тригонометрическая функция, возвращает остаток от деления числа на заданный делитель"},"MROUND":{"n":"ОКРУГЛТ","a":"( x, multiple )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число до кратного заданной значимости"},"MULTINOMIAL":{"n":"МУЛЬТИНОМ","a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает отношение факториала суммы значений к произведению факториалов"},"ODD":{"n":"НЕЧЁТ","a":"( x )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число до ближайшего нечетного целого числа"},"PI":{"n":"ПИ","a":"()","d":"Математическая и тригонометрическая функция, возвращает математическую константу пи, равную 3.14159265358979. Функция не требует аргумента"},"POWER":{"n":"СТЕПЕНЬ","a":"( x, y )","d":"Математическая и тригонометрическая функция, возвращает результат возведения числа в заданную степень"},"PRODUCT":{"n":"ПРОИЗВЕД","a":"( argument-list )","d":"Математическая и тригонометрическая функция, перемножает все числа в заданном диапазоне ячеек и возвращает произведение"},"QUOTIENT":{"n":"ЧАСТНОЕ","a":"( dividend , divisor )","d":"Математическая и тригонометрическая функция, возвращает целую часть результата деления с остатком"},"RADIANS":{"n":"РАДИАНЫ","a":"( angle )","d":"Математическая и тригонометрическая функция, преобразует градусы в радианы"},"RAND":{"n":"СЛЧИС","a":"()","d":"Математическая и тригонометрическая функция, возвращает случайное число, которое больше или равно 0 и меньше 1. Функция не требует аргумента"},"RANDBETWEEN":{"n":"СЛУЧМЕЖДУ","a":"( lower-bound , upper-bound )","d":"Математическая и тригонометрическая функция, возвращает случайное число, большее или равное значению аргумента lower-bound (нижняя граница) и меньшее или равное значению аргумента upper-bound (верхняя граница)"},"ROMAN":{"n":"РИМСКОЕ","a":"( number, form )","d":"Математическая и тригонометрическая функция, преобразует число в римское"},"ROUND":{"n":"ОКРУГЛ","a":"( x , number-digits )","d":"Математическая и тригонометрическая функция, округляет число до заданного количества десятичных разрядов"},"ROUNDDOWN":{"n":"ОКРУГЛВНИЗ","a":"( x , number-digits )","d":"Математическая и тригонометрическая функция, округляет число в меньшую сторону до заданного количества десятичных разрядов"},"ROUNDUP":{"n":"ОКРУГЛВВЕРХ","a":"( x , number-digits )","d":"Математическая и тригонометрическая функция, округляет число в большую сторону до заданного количества десятичных разрядов"},"SERIESSUM":{"n":"РЯД.СУММ","a":"( input-value , initial-power , step , coefficients )","d":"Математическая и тригонометрическая функция, возвращает сумму степенного ряда"},"SIGN":{"n":"ЗНАК","a":"( x )","d":"Математическая и тригонометрическая функция, определяет знак числа. Если число положительное, функция возвращает значение 1. Если число отрицательное, функция возвращает значение -1. Если число равно 0, функция возвращает значение 0"},"SIN":{"n":"SIN","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает синус угла"},"SINH":{"n":"SINH","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический синус числа"},"SQRT":{"n":"КОРЕНЬ","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает квадратный корень числа"},"SQRTPI":{"n":"КОРЕНЬПИ","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает квадратный корень от результата умножения константы пи (3.14159265358979) на заданное число"},"SUM":{"n":"СУММ","a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает результат сложения всех чисел в выбранном диапазоне ячеек"},"SUMIF":{"n":"СУММЕСЛИ","a":"( cell-range, selection-criteria [ , sum-range ] )","d":"Математическая и тригонометрическая функция, суммирует все числа в выбранном диапазоне ячеек в соответствии с заданным условием и возвращает результат"},"SUMPRODUCT":{"n":"СУММПРОИЗВ","a":"( argument-list )","d":"Математическая и тригонометрическая функция, перемножает соответствующие элементы заданных диапазонов ячеек или массивов и возвращает сумму произведений"},"SUMSQ":{"n":"СУММКВ","a":"( argument-list )","d":"Математическая и тригонометрическая функция, вычисляет сумму квадратов чисел и возвращает результат"},"SUMX2MY2":{"n":"СУММРАЗНКВ","a":"( array-1 , array-2 )","d":"Математическая и тригонометрическая функция, вычисляет сумму разностей квадратов соответствующих элементов в двух массивах"},"SUMX2PY2":{"n":"СУММСУММКВ","a":"( array-1 , array-2 )","d":"Математическая и тригонометрическая функция, вычисляет суммы квадратов соответствующих элементов в двух массивах и возвращает сумму полученных результатов"},"SUMXMY2":{"n":"СУММКВРАЗН","a":"( array-1 , array-2 )","d":"Математическая и тригонометрическая функция, возвращает сумму квадратов разностей соответствующих элементов в двух массивах"},"TAN":{"n":"TAN","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает тангенс угла"},"TANH":{"n":"TANH","a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический тангенс числа"},"TRUNC":{"n":"ОТБР","a":"( x [ , number-digits ] )","d":"Математическая и тригонометрическая функция, возвращает число, усеченное до заданного количества десятичных разрядов"},"ADDRESS":{"n":"АДРЕС","a":"( row-number , col-number [ , [ ref-type ] [ , [ A1-ref-style-flag ] [ , sheet-name ] ] ] )","d":"Поисковая функция, возвращает адрес ячейки, представленный в виде текста"},"CHOOSE":{"n":"ВЫБОР","a":"( index , argument-list )","d":"Поисковая функция, возвращает значение из списка значений по заданному индексу (позиции)"},"COLUMN":{"n":"СТОЛБЕЦ","a":"( [ reference ] )","d":"Поисковая функция, возвращает номер столбца ячейки"},"COLUMNS":{"n":"ЧИСЛСТОЛБ","a":"( array )","d":"Поисковая функция, возвращает количество столбцов в ссылке на ячейки"},"HLOOKUP":{"n":"ГПР","a":"( lookup-value , table-array , row-index-num [ , [ range-lookup-flag ] ] )","d":"Поисковая функция, используется для выполнения горизонтального поиска значения в верхней строке таблицы или массива и возвращает значение, которое находится в том же самом столбце в строке с заданным номером"},"INDEX":{"n":"ИНДЕКС","a":"( array , [ row-number ] [ , [ column-number ] ] ) INDEX( reference , [ row-number ] [ , [ column-number ] [ , [ area-number ] ] ] )","d":"Поисковая функция, возвращает значение в диапазоне ячеек на основании заданных номера строки и номера столбца. Существуют две формы функции INDEX"},"INDIRECT":{"n":"ДВССЫЛ","a":"( ref-text [ , [ A1-ref-style-flag ] ] )","d":"Поисковая функция, возвращает ссылку на ячейку, указанную с помощью текстовой строки"},"LOOKUP":{"n":"ПРОСМОТР","a":"( lookup-value , lookup-vector , result-vector )","d":"Поисковая функция, возвращает значение из выбранного диапазона (строки или столбца с данными, отсортированными в порядке возрастания)"},"MATCH":{"n":"ПОИСКПОЗ","a":"( lookup-value , lookup-array [ , [ match-type ]] )","d":"Поисковая функция, возвращает относительное положение заданного элемента в диапазоне ячеек"},"OFFSET":{"n":"СМЕЩ","a":"( reference , rows , cols [ , [ height ] [ , [ width ] ] ] )","d":"Поисковая функция, возвращает ссылку на ячейку, отстоящую от заданной ячейки (или верхней левой ячейки в диапазоне ячеек) на определенное число строк и столбцов"},"ROW":{"n":"СТРОКА","a":"( [ reference ] )","d":"Поисковая функция, возвращает номер строки для ссылки на ячейку"},"ROWS":{"n":"ЧСТРОК","a":"( array )","d":"Поисковая функция, возвращает количество строк в ссылке на ячейки"},"TRANSPOSE":{"n":"ТРАНСП","a":"( array )","d":"Поисковая функция, возвращает первый элемент массива"},"VLOOKUP":{"n":"ВПР","a":"( lookup-value , table-array , col-index-num [ , [ range-lookup-flag ] ] )","d":"Поисковая функция, используется для выполнения вертикального поиска значения в крайнем левом столбце таблицы или массива и возвращает значение, которое находится в той же самой строке в столбце с заданным номером"},"ERROR.TYPE":{"n":"ТИП.ОШИБКИ","a":"(value)","d":"Информационная функция, возвращает числовое представление одной из существующих ошибок"},"ISBLANK":{"n":"ЕПУСТО","a":"(value)","d":"Информационная функция, проверяет, является ли ячейка пустой. Если ячейка пуста, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISERR":{"n":"ЕОШ","a":"(value)","d":"Информационная функция, используется для проверки на наличие значения ошибки. Если ячейка содержит значение ошибки (кроме #N/A), функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISERROR":{"n":"ЕОШИБКА","a":"(value)","d":"Информационная функция, используется для проверки на наличие значения ошибки. Если ячейка содержит одно из следующих значений ошибки: #N/A, #VALUE!, #REF!, #DIV/0!, #NUM!, #NAME? или #NULL, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISEVEN":{"n":"ЕЧЁТН","a":"(number)","d":"Информационная функция, используется для проверки на наличие четного числа. Если ячейка содержит четное число, функция возвращает значение TRUE. Если число является нечетным, она возвращает значение FALSE"},"ISLOGICAL":{"n":"ЕЛОГИЧ","a":"(value)","d":"Информационная функция, используется для проверки на наличие логического значения (TRUE (ИСТИНА) или FALSE (ЛОЖЬ)). Если ячейка содержит логическое значение, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISNA":{"n":"ЕНД","a":"(value)","d":"Информационная функция, используется для проверки на наличие ошибки #N/A. Если ячейка содержит значение ошибки #N/A, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISNONTEXT":{"n":"ЕНЕТЕКСТ","a":"(value)","d":"Информационная функция, используется для проверки на наличие значения, которое не является текстом. Если ячейка не содержит текстового значения, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISNUMBER":{"n":"ЕЧИСЛО","a":"(value)","d":"Информационная функция, используется для проверки на наличие числового значения. Если ячейка содержит числовое значение, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISODD":{"n":"ЕНЕЧЁТ","a":"(number)","d":"Информационная функция, используется для проверки на наличие нечетного числа. Если ячейка содержит нечетное число, функция возвращает значение TRUE. Если число является четным, она возвращает значение FALSE"},"ISREF":{"n":"ЕССЫЛКА","a":"(value)","d":"Информационная функция, используется для проверки, является ли значение допустимой ссылкой на другую ячейку"},"ISTEXT":{"n":"ЕТЕКСТ","a":"(value)","d":"Информационная функция, используется для проверки на наличие текстового значения. Если ячейка содержит текстовое значение, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"N":{"n":"Ч","a":"(value)","d":"Информационная функция, преобразует значение в число"},"NA":{"n":"НД","a":"()","d":"Информационная функция, возвращает значение ошибки #N/A. Эта функция не требует аргумента"},"TYPE":{"n":"ТИП","a":"(value)","d":"Информационная функция, используется для определения типа результирующего или отображаемого значения"},"AND":{"n":"И","a":"(logical1, logical2, ...)","d":"Логическая функция, используется для проверки, является ли введенное логическое значение TRUE (истинным) или FALSE (ложным). Функция возвращает значение TRUE (ИСТИНА), если все аргументы имеют значение TRUE (ИСТИНА)"},"FALSE":{"n":"ЛОЖЬ","a":"()","d":"Логическая функция, возвращает значение FALSE (ЛОЖЬ) и не требует аргумента"},"IF":{"n":"ЕСЛИ","a":"(logical_test, value_if_true, value_if_false)","d":"Логическая функция, используется для проверки логического выражения и возвращает одно значение, если проверяемое условие имеет значение TRUE (ИСТИНА), и другое, если оно имеет значение FALSE (ЛОЖЬ)"},"IFERROR":{"n":"ЕСЛИОШИБКА","a":"(value, value_if_error)","d":"Логическая функция, используется для проверки формулы на наличие ошибок в первом аргументе. Функция возвращает результат формулы, если ошибки нет, или определенное значение, если она есть"},"NOT":{"n":"НЕ","a":"(logical)","d":"Логическая функция, используется для проверки, является ли введенное логическое значение TRUE (истинным) или FALSE (ложным). Функция возвращает значение TRUE (ИСТИНА), если аргумент имеет значение FALSE (ЛОЖЬ), и FALSE (ЛОЖЬ), если аргумент имеет значение TRUE (ИСТИНА)"},"OR":{"n":"ИЛИ","a":"(logical1, logical2, ...)","d":"Логическая функция, используется для проверки, является ли введенное логическое значение TRUE (истинным) или FALSE (ложным). Функция возвращает значение FALSE (ЛОЖЬ), если все аргументы имеют значение FALSE (ЛОЖЬ)"},"TRUE":{"n":"ИСТИНА","a":"()","d":"Логическая функция, возвращает значение TRUE (ИСТИНА) и не требует аргумента"},"LocalFormulaOperands":{"StructureTables":{"h": "Заголовки","d": "Данные","a": "Все","tr": "Эта строка","t": "Итоги"},"CONST_TRUE_FALSE":{"t":"ИСТИНА","f":"ЛОЖЬ"}}} \ No newline at end of file +{"DATE":"ДАТА","DATEDIF":"РАЗНДАТ","DATEVALUE":"ДАТАЗНАЧ","DAY":"ДЕНЬ","DAYS360":"ДНЕЙ360","EDATE":"ДАТАМЕС","EOMONTH":"КОНМЕСЯЦА","HOUR":"ЧАС","MINUTE":"МИНУТЫ","MONTH":"МЕСЯЦ","NETWORKDAYS":"ЧИСТРАБДНИ","NOW":"ТДАТА","SECOND":"СЕКУНДЫ","TIME":"ВРЕМЯ","TIMEVALUE":"ВРЕМЗНАЧ","TODAY":"СЕГОДНЯ","WEEKDAY":"ДЕНЬНЕД","WEEKNUM":"НОМНЕДЕЛИ","WORKDAY":"РАБДЕНЬ","YEAR":"ГОД","YEARFRAC":"ДОЛЯГОДА","BIN2DEC":"ДВ.В.ДЕС","BIN2HEX":"ДВ.В.ШЕСТН","BIN2OCT":"ДВ.В.ВОСЬМ","COMPLEX":"КОМПЛЕКСН","DEC2BIN":"ДЕС.В.ДВ","DEC2HEX":"ДЕС.В.ШЕСТН","DEC2OCT":"ДЕС.В.ВОСЬМ","DELTA":"ДЕЛЬТА","ERF":"ФОШ","ERFC":"ДФОШ","GESTEP":"ПОРОГ","HEX2BIN":"ШЕСТН.В.ДВ","HEX2DEC":"ШЕСТН.В.ДЕС","HEX2OCT":"ШЕСТН.В.ВОСЬМ","IMABS":"МНИМ.ABS","IMAGINARY":"МНИМ.ЧАСТЬ","IMARGUMENT":"МНИМ.АРГУМЕНТ","IMCONJUGATE":"МНИМ.СОПРЯЖ","IMCOS":"МНИМ.COS","IMDIV":"МНИМ.ДЕЛ","IMEXP":"МНИМ.EXP","IMLN":"МНИМ.LN","IMLOG10":"МНИМ.LOG10","IMLOG2":"МНИМ.LOG2","IMPOWER":"МНИМ.СТЕПЕНЬ","IMPRODUCT":"МНИМ.ПРОИЗВЕД","IMREAL":"МНИМ.ВЕЩ","IMSIN":"МНИМ.SIN","IMSQRT":"МНИМ.КОРЕНЬ","IMSUB":"МНИМ.РАЗН","IMSUM":"МНИМ.СУММ","OCT2BIN":"ВОСЬМ.В.ДВ","OCT2DEC":"ВОСЬМ.В.ДЕС","OCT2HEX":"ВОСЬМ.В.ШЕСТН","CHAR":"СИМВОЛ","CLEAN":"ПЕЧСИМВ","CODE":"КОДСИМВ","CONCATENATE":"СЦЕПИТЬ","DOLLAR":"РУБЛЬ","EXACT":"СОВПАД","FIND":"НАЙТИ","FINDB":"НАЙТИБ","FIXED":"ФИКСИРОВАННЫЙ","LEFT":"ЛЕВСИМВ","LEFTB":"ЛЕВБ","LEN":"ДЛСТР","LENB":"ДЛИНБ","LOWER":"СТРОЧН","MID":"ПСТР","MIDB":"ПСТРБ","PROPER":"ПРОПНАЧ","REPLACE":"ЗАМЕНИТЬ","REPLACEB":"ЗАМЕНИТЬБ","REPT":"ПОВТОР","RIGHT":"ПРАВСИМВ","RIGHTB":"ПРАВБ","SEARCH":"ПОИСК","SEARCHB":"ПОИСКБ","SUBSTITUTE":"ПОДСТАВИТЬ","T":"Т","TEXT":"ТЕКСТ","TRIM":"СЖПРОБЕЛЫ","UPPER":"ПРОПИСН","VALUE":"ЗНАЧЕН","AVEDEV":"СРОТКЛ","AVERAGE":"СРЗНАЧ","AVERAGEA":"СРЗНАЧА","AVERAGEIF":"СРЗНАЧЕСЛИ","BINOMDIST":"БИНОМРАСП","CONFIDENCE":"ДОВЕРИТ","CORREL":"КОРРЕЛ","COUNT":"СЧЁТ","COUNTA":"СЧЁТЗ","COUNTBLANK":"СЧИТАТЬПУСТОТЫ","COUNTIF":"СЧЁТЕСЛИ","COVAR":"КОВАР","CRITBINOM":"КРИТБИНОМ","DEVSQ":"КВАДРОТКЛ","EXPONDIST":"ЭКСПРАСП","FISHER":"ФИШЕР","FISHERINV":"ФИШЕРОБР","FORECAST":"ПРОГНОЗ","FREQUENCY":"ЧАСТОТА","GAMMALN":"ГАММАНЛОГ","GEOMEAN":"СРГЕОМ","HARMEAN":"СРГАРМ","HYPGEOMDIST":"ГИПЕРГЕОМЕТ","INTERCEPT":"ОТРЕЗОК","KURT":"ЭКСЦЕСС","LARGE":"НАИБОЛЬШИЙ","LOGINV":"ЛОГНОРМОБР","LOGNORMDIST":"ЛОГНОРМРАСП","MAX":"МАКС","MAXA":"МАКСА","MEDIAN":"МЕДИАНА","MIN":"МИН","MINA":"МИНА","MODE":"МОДА","NEGBINOMDIST":"ОТРБИНОМРАСП","NORMDIST":"НОРМРАСП","NORMINV":"НОРМОБР","NORMSDIST":"НОРМСТРАСП","NORMSINV":"НОРМСТОБР","PEARSON":"ПИРСОН","PERCENTILE":"ПЕРСЕНТИЛЬ","PERCENTRANK":"ПРОЦЕНТРАНГ","PERMUT":"ПЕРЕСТ","POISSON":"ПУАССОН","PROB":"ВЕРОЯТНОСТЬ","QUARTILE":"КВАРТИЛЬ","RSQ":"КВПИРСОН","SKEW":"СКОС","SLOPE":"НАКЛОН","SMALL":"НАИМЕНЬШИЙ","STANDARDIZE":"НОРМАЛИЗАЦИЯ","STDEV":"СТАНДОТКЛОН","STDEVA":"СТАНДОТКЛОНА","STDEVP":"СТАНДОТКЛОНП","STDEVPA":"СТАНДОТКЛОНПА","STEYX":"СТОШYX","VAR":"ДИСП","VARA":"ДИСПА","VARP":"ДИСПР","VARPA":"ДИСПРА","ACCRINT":"НАКОПДОХОД","ACCRINTM":"НАКОПДОХОДПОГАШ","AMORDEGRC":"АМОРУМ","AMORLINC":"АМОРУВ","COUPDAYBS":"ДНЕЙКУПОНДО","COUPDAYS":"ДНЕЙКУПОН","COUPDAYSNC":"ДНЕЙКУПОНПОСЛЕ","COUPNCD":"ДАТАКУПОНПОСЛЕ","COUPNUM":"ЧИСЛКУПОН","COUPPCD":"ДАТАКУПОНДО","CUMIPMT":"ОБЩПЛАТ","CUMPRINC":"ОБЩДОХОД","DB":"ФУО","DDB":"ДДОБ","DISC":"СКИДКА","DOLLARDE":"РУБЛЬ.ДЕС","DOLLARFR":"РУБЛЬ.ДРОБЬ","DURATION":"ДЛИТ","EFFECT":"ЭФФЕКТ","FV":"БС","FVSCHEDULE":"БЗРАСПИС","INTRATE":"ИНОРМА","IPMT":"ПРПЛТ","IRR":"ВСД","ISPMT":"ПРОЦПЛАТ","MDURATION":"МДЛИТ","MIRR":"МВСД","NOMINAL":"НОМИНАЛ","NPER":"КПЕР","NPV":"ЧПС","ODDFPRICE":"ЦЕНАПЕРВНЕРЕГ","ODDFYIELD":"ДОХОДПЕРВНЕРЕГ","ODDLPRICE":"ЦЕНАПОСЛНЕРЕГ","ODDLYIELD":"ДОХОДПОСЛНЕРЕГ","PMT":"ПЛТ","PPMT":"ОСПЛТ","PRICE":"ЦЕНА","PRICEDISC":"ЦЕНАСКИДКА","PRICEMAT":"ЦЕНАПОГАШ","PV":"ПС","RATE":"СТАВКА","RECEIVED":"ПОЛУЧЕНО","SLN":"АПЛ","SYD":"АСЧ","TBILLEQ":"РАВНОКЧЕК","TBILLPRICE":"ЦЕНАКЧЕК","TBILLYIELD":"ДОХОДКЧЕК","VDB":"ПУО","XIRR":"ЧИСТВНДОХ","XNPV":"ЧИСТНЗ","YIELD":"ДОХОД","YIELDDISC":"ДОХОДСКИДКА","YIELDMAT":"ДОХОДПОГАШ","ABS":"ABS","ACOS":"ACOS","ACOSH":"ACOSH","ASIN":"ASIN","ASINH":"ASINH","ATAN":"ATAN","ATAN2":"ATAN2","ATANH":"ATANH","CEILING":"ОКРВВЕРХ","COMBIN":"ЧИСЛКОМБ","COS":"COS","COSH":"COSH","DEGREES":"ГРАДУСЫ","EVEN":"ЧЁТН","EXP":"EXP","FACT":"ФАКТР","FACTDOUBLE":"ДВФАКТР","FLOOR":"ОКРВНИЗ","GCD":"НОД","INT":"ЦЕЛОЕ","LCM":"НОК","LN":"LN","LOG":"LOG","LOG10":"LOG10","MDETERM":"МОПРЕД","MINVERSE":"МОБР","MMULT":"МУМНОЖ","MOD":"ОСТАТ","MROUND":"ОКРУГЛТ","MULTINOMIAL":"МУЛЬТИНОМ","ODD":"НЕЧЁТ","PI":"ПИ","POWER":"СТЕПЕНЬ","PRODUCT":"ПРОИЗВЕД","QUOTIENT":"ЧАСТНОЕ","RADIANS":"РАДИАНЫ","RAND":"СЛЧИС","RANDBETWEEN":"СЛУЧМЕЖДУ","ROMAN":"РИМСКОЕ","ROUND":"ОКРУГЛ","ROUNDDOWN":"ОКРУГЛВНИЗ","ROUNDUP":"ОКРУГЛВВЕРХ","SERIESSUM":"РЯД.СУММ","SIGN":"ЗНАК","SIN":"SIN","SINH":"SINH","SQRT":"КОРЕНЬ","SQRTPI":"КОРЕНЬПИ","SUBTOTAL":"ПРОМЕЖУТОЧНЫЕ.ИТОГИ","SUM":"СУММ","SUMIF":"СУММЕСЛИ","SUMPRODUCT":"СУММПРОИЗВ","SUMSQ":"СУММКВ","SUMX2MY2":"СУММРАЗНКВ","SUMX2PY2":"СУММСУММКВ","SUMXMY2":"СУММКВРАЗН","TAN":"TAN","TANH":"TANH","TRUNC":"ОТБР","ADDRESS":"АДРЕС","CHOOSE":"ВЫБОР","COLUMN":"СТОЛБЕЦ","COLUMNS":"ЧИСЛСТОЛБ","HLOOKUP":"ГПР","INDEX":"ИНДЕКС","INDIRECT":"ДВССЫЛ","LOOKUP":"ПРОСМОТР","MATCH":"ПОИСКПОЗ","OFFSET":"СМЕЩ","ROW":"СТРОКА","ROWS":"ЧСТРОК","TRANSPOSE":"ТРАНСП","VLOOKUP":"ВПР","ERROR.TYPE":"ТИП.ОШИБКИ","ISBLANK":"ЕПУСТО","ISERR":"ЕОШ","ISERROR":"ЕОШИБКА","ISEVEN":"ЕЧЁТН","ISLOGICAL":"ЕЛОГИЧ","ISNA":"ЕНД","ISNONTEXT":"ЕНЕТЕКСТ","ISNUMBER":"ЕЧИСЛО","ISODD":"ЕНЕЧЁТ","ISREF":"ЕССЫЛКА","ISTEXT":"ЕТЕКСТ","N":"Ч","NA":"НД","TYPE":"ТИП","AND":"И","FALSE":"ЛОЖЬ","IF":"ЕСЛИ","IFERROR":"ЕСЛИОШИБКА","NOT":"НЕ","OR":"ИЛИ","TRUE":"ИСТИНА","LocalFormulaOperands":{"StructureTables":{"h": "Заголовки","d": "Данные","a": "Все","tr": "Эта строка","t": "Итоги"},"CONST_TRUE_FALSE":{"t":"ИСТИНА","f":"ЛОЖЬ"},"CONST_ERROR":{"nil":"#ПУСТО!","div":"#ДЕЛ\/0!","value":"#ЗНАЧ!","ref":"#ССЫЛКА!","name":"#ИМЯ\\?","num":"#ЧИСЛО!","na":"#Н\/Д","getdata":"#GETTING_DATA","uf":"#UNSUPPORTED_FUNCTION!"}}} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/formula-lang/ru_desc.json b/apps/spreadsheeteditor/main/resources/formula-lang/ru_desc.json new file mode 100644 index 000000000..aa2d14fd8 --- /dev/null +++ b/apps/spreadsheeteditor/main/resources/formula-lang/ru_desc.json @@ -0,0 +1 @@ +{"DATE":{"a":"( year, month, day )","d":"Функция даты и времени, используется для добавления дат в стандартном формате ММ/дд/гггг"},"DATEDIF":{"a":"( start-date , end-date , unit )","d":"Функция даты и времени, возвращает разницу между двумя датами (начальной и конечной) согласно заданному интервалу (единице)"},"DATEVALUE":{"a":"( date-time-string )","d":"Функция даты и времени, возвращает порядковый номер заданной даты"},"DAY":{"a":"( date-value )","d":"Функция даты и времени, возвращает день (число от 1 до 31), соответствующий дате, заданной в числовом формате (MM/дд/гггг по умолчанию)"},"DAYS360":{"a":"( start-date , end-date [ , method-flag ] )","d":"Функция даты и времени, возвращает количество дней между двумя датами (начальной и конечной) на основе 360-дневного года с использованием одного из методов вычислений (американского или европейского)"},"EDATE":{"a":"( start-date , month-offset )","d":"Функция даты и времени, возвращает порядковый номер даты, которая идет на заданное число месяцев (month-offset) до или после заданной даты (start-date)"},"EOMONTH":{"a":"( start-date , month-offset )","d":"Функция даты и времени, возвращает порядковый номер последнего дня месяца, который идет на заданное число месяцев до или после заданной начальной даты"},"HOUR":{"a":"( time-value )","d":"Функция даты и времени, возвращает количество часов (число от 0 до 23), соответствующее заданному значению времени"},"MINUTE":{"a":"( time-value )","d":"Функция даты и времени, возвращает количество минут (число от 0 до 59), соответствующее заданному значению времени"},"MONTH":{"a":"( date-value )","d":"Функция даты и времени, возвращает месяц (число от 1 до 12), соответствующий дате, заданной в числовом формате (MM/дд/гггг по умолчанию)"},"NETWORKDAYS":{"a":"( start-date , end-date [ , holidays ] )","d":"Функция даты и времени, возвращает количество рабочих дней между двумя датами (начальной и конечной). Выходные и праздничные дни в это число не включаются"},"NOW":{"a":"()","d":"Функция даты и времени, используется для добавления в электронную таблицу текущей даты и времени в следующем формате: MM/дд/гг чч:мм. Данная функция не требует аргумента"},"SECOND":{"a":"( time-value )","d":"Функция даты и времени, возвращает количество секунд (число от 0 до 59), соответствующее заданному значению времени"},"TIME":{"a":"( hour, minute, second )","d":"Функция даты и времени, используется для добавления определенного времени в выбранном формате (по умолчанию чч:мм tt (указатель половины дня a.m./p.m.))"},"TIMEVALUE":{"a":"( date-time-string )","d":"Функция даты и времени, возвращает порядковый номер, соответствующий заданному времени"},"TODAY":{"a":"()","d":"Функция даты и времени, используется для добавления текущей даты в следующем формате: MM/дд/гг. Данная функция не требует аргумента"},"WEEKDAY":{"a":"( serial-value [ , weekday-start-flag ] )","d":"Функция даты и времени, определяет, какой день недели соответствует заданной дате"},"WEEKNUM":{"a":"( serial-value [ , weekday-start-flag ] )","d":"Функция даты и времени, возвращает порядковый номер той недели в течение года, на которую приходится заданная дата"},"WORKDAY":{"a":"( start-date , day-offset [ , holidays ] )","d":"Функция даты и времени, возвращает дату, которая идет на заданное число дней (day-offset) до или после заданной начальной даты, без учета выходных и праздничных дней"},"YEAR":{"a":"( date-value )","d":"Функция даты и времени, возвращает год (число от 1900 до 9999), соответствующий дате, заданной в числовом формате (MM/дд/гггг по умолчанию)"},"YEARFRAC":{"a":"( start-date , end-date [ , basis ] )","d":"Функция даты и времени, возвращает долю года, представленную числом целых дней между начальной и конечной датами, вычисляемую заданным способом"},"BIN2DEC":{"a":"( number )","d":"Инженерная функция, преобразует двоичное число в десятичное"},"BIN2HEX":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует двоичное число в шестнадцатеричное"},"BIN2OCT":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует двоичное число в восьмеричное"},"COMPLEX":{"a":"( real-number , imaginary-number [ , suffix ] )","d":"Инженерная функция, используется для преобразования действительной и мнимой части в комплексное число, выраженное в формате a + bi или a + bj"},"DEC2BIN":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует десятичное число в двоичное"},"DEC2HEX":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует десятичное число в шестнадцатеричное"},"DEC2OCT":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует десятичное число в восьмеричное"},"DELTA":{"a":"( number-1 [ , number-2 ] )","d":"Инженерная функция, используется для проверки равенства двух чисел. Функция возвращает 1, если числа равны, в противном случае возвращает 0"},"ERF":{"a":"( lower-bound [ , upper-bound ] )","d":"Инженерная функция, используется для расчета значения функции ошибки, проинтегрированного в интервале от заданного нижнего до заданного верхнего предела"},"ERFC":{"a":"( lower-bound )","d":"Инженерная функция, используется для расчета значения дополнительной функции ошибки, проинтегрированного в интервале от заданного нижнего предела до бесконечности"},"GESTEP":{"a":"( number [ , step ] )","d":"Инженерная функция, используется для проверки того, превышает ли какое-то число пороговое значение. Функция возвращает 1, если число больше или равно пороговому значению, в противном случае возвращает 0"},"HEX2BIN":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует шестнадцатеричное число в двоичное"},"HEX2DEC":{"a":"( number )","d":"Инженерная функция, преобразует шестнадцатеричное число в десятичное"},"HEX2OCT":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует шестнадцатеричное число в восьмеричное"},"IMABS":{"a":"( complex-number )","d":"Инженерная функция, возвращает абсолютное значение комплексного числа"},"IMAGINARY":{"a":"( complex-number )","d":"Инженерная функция, возвращает мнимую часть заданного комплексного числа"},"IMARGUMENT":{"a":"( complex-number )","d":"Инженерная функция, возвращает значение аргумента Тета, то есть угол в радианах"},"IMCONJUGATE":{"a":"( complex-number )","d":"Инженерная функция, возвращает комплексно-сопряженное значение комплексного числа"},"IMCOS":{"a":"( complex-number )","d":"Инженерная функция, возвращает косинус комплексного числа"},"IMDIV":{"a":"( complex-number-1 , complex-number-2 )","d":"Инженерная функция, возвращает частное от деления двух комплексных чисел, представленных в формате a + bi или a + bj"},"IMEXP":{"a":"( complex-number )","d":"Инженерная функция, возвращает экспоненту комплексного числа (значение константы e, возведенной в степень, заданную комплексным числом). Константа e равна 2,71828182845904"},"IMLN":{"a":"( complex-number )","d":"Инженерная функция, возвращает натуральный логарифм комплексного числа"},"IMLOG10":{"a":"( complex-number )","d":"Инженерная функция, возвращает двоичный логарифм комплексного числа"},"IMLOG2":{"a":"( complex-number )","d":"Инженерная функция, возвращает десятичный логарифм комплексного числа"},"IMPOWER":{"a":"( complex-number, power )","d":"Инженерная функция, возвращает комплексное число, возведенное в заданную степень"},"IMPRODUCT":{"a":"( argument-list )","d":"Инженерная функция, возвращает произведение указанных комплексных чисел"},"IMREAL":{"a":"( complex-number )","d":"Инженерная функция, возвращает действительную часть комплексного числа"},"IMSIN":{"a":"( complex-number )","d":"Инженерная функция, возвращает синус комплексного числа"},"IMSQRT":{"a":"( complex-number )","d":"Инженерная функция, возвращает значение квадратного корня из комплексного числа"},"IMSUB":{"a":"( complex-number-1 , complex-number-2 )","d":"Инженерная функция, возвращает разность двух комплексных чисел, представленных в формате a + bi или a + bj"},"IMSUM":{"a":"( argument-list )","d":"Инженерная функция, возвращает сумму двух комплексных чисел, представленных в формате a + bi или a + bj"},"OCT2BIN":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует восьмеричное число в двоичное"},"OCT2DEC":{"a":"( number )","d":"Инженерная функция, преобразует восьмеричное число в десятичное"},"OCT2HEX":{"a":"( number [ , num-hex-digits ] )","d":"Инженерная функция, преобразует восьмеричное число в шестнадцатеричное"},"CHAR":{"a":"( number )","d":"Функция для работы с текстом и данными, возвращает символ ASCII, соответствующий заданному числовому коду"},"CLEAN":{"a":"( string )","d":"Функция для работы с текстом и данными, используется для удаления всех непечатаемых символов из выбранной строки"},"CODE":{"a":"( string )","d":"Функция для работы с текстом и данными, возвращает числовой код ASCII, соответствующий заданному символу или первому символу в ячейке"},"CONCATENATE":{"a":"(text1, text2, ...)","d":"Функция для работы с текстом и данными, используется для объединения данных из двух или более ячеек в одну"},"DOLLAR":{"a":"( number [ , num-decimal ] )","d":"Функция для работы с текстом и данными, преобразует число в текст, используя денежный формат $#.##"},"EXACT":{"a":"(text1, text2)","d":"Функция для работы с текстом и данными, используется для сравнения данных в двух ячейках. Функция возвращает значение TRUE (ИСТИНА), если данные совпадают, и FALSE (ЛОЖЬ), если нет"},"FIND":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, используется для поиска заданной подстроки (string-1) внутри строки (string-2), предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"FINDB":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, используется для поиска заданной подстроки (string-1) внутри строки (string-2), предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"FIXED":{"a":"( number [ , [ num-decimal ] [ , suppress-commas-flag ] ] )","d":"Функция для работы с текстом и данными, возвращает текстовое представление числа, округленного до заданного количества десятичных знаков"},"LEFT":{"a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с левого символа, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"LEFTB":{"a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с левого символа, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"LEN":{"a":"( string )","d":"Функция для работы с текстом и данными, анализирует заданную строку и возвращает количество символов, которые она содержит, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"LENB":{"a":"( string )","d":"Функция для работы с текстом и данными, анализирует заданную строку и возвращает количество символов, которые она содержит, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"LOWER":{"a":"(text)","d":"Функция для работы с текстом и данными, используется для преобразования букв в выбранной ячейке из верхнего регистра в нижний"},"MID":{"a":"( string , start-pos , number-chars )","d":"Функция для работы с текстом и данными, извлекает символы из заданной строки, начиная с любого места, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"MIDB":{"a":"( string , start-pos , number-chars )","d":"Функция для работы с текстом и данными, извлекает символы из заданной строки, начиная с любого места, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"PROPER":{"a":"( string )","d":"Функция для работы с текстом и данными, преобразует первую букву каждого слова в прописную (верхний регистр), а все остальные буквы - в строчные (нижний регистр)"},"REPLACE":{"a":"( string-1, start-pos, number-chars, string-2 )","d":"Функция для работы с текстом и данными, заменяет ряд символов на новый, с учетом заданного количества символов и начальной позиции, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"REPLACEB":{"a":"( string-1, start-pos, number-chars, string-2 )","d":"Функция для работы с текстом и данными, заменяет ряд символов на новый, с учетом заданного количества символов и начальной позиции, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"REPT":{"a":"(text, number_of_times)","d":"Функция для работы с текстом и данными, используется для повторения данных в выбранной ячейке заданное количество раз"},"RIGHT":{"a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с крайнего правого символа, согласно заданному количеству символов, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"RIGHTB":{"a":"( string [ , number-chars ] )","d":"Функция для работы с текстом и данными, извлекает подстроку из заданной строки, начиная с крайнего правого символа, согласно заданному количеству символов, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"SEARCH":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, возвращает местоположение заданной подстроки в строке, предназначена для языков, использующих однобайтовую кодировку (SBCS)"},"SEARCHB":{"a":"( string-1 , string-2 [ , start-pos ] )","d":"Функция для работы с текстом и данными, возвращает местоположение заданной подстроки в строке, предназначена для языков, использующих двухбайтовую кодировку (DBCS), таких как японский, китайский, корейский и т.д."},"SUBSTITUTE":{"a":"( string , old-string , new-string [ , occurence ] )","d":"Функция для работы с текстом и данными, заменяет ряд символов на новый"},"T":{"a":"( value )","d":"Функция для работы с текстом и данными, используется для проверки, является ли значение в ячейке (или используемое как аргумент) текстом или нет. Если это не текст, функция возвращает пустой результат. Если значение/аргумент является текстом, функция возвращает это же текстовое значение"},"TEXT":{"a":"( value , format )","d":"Функция для работы с текстом и данными, преобразует числовое значение в текст в заданном формате"},"TRIM":{"a":"( string )","d":"Функция для работы с текстом и данными, удаляет пробелы из начала и конца строки"},"UPPER":{"a":"(text)","d":"Функция для работы с текстом и данными, используется для преобразования букв в выбранной ячейке из нижнего регистра в верхний"},"VALUE":{"a":"( string )","d":"Функция для работы с текстом и данными, преобразует текстовое значение, представляющее число, в числовое значение. Если преобразуемый текст не является числом, функция возвращает ошибку #VALUE!"},"AVEDEV":{"a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает среднее абсолютных значений отклонений чисел от их среднего значения"},"AVERAGE":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и вычисляет среднее значение"},"AVERAGEA":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных, включая текстовые и логические значения, и вычисляет среднее значение. Функция AVERAGEA интерпретирует текст и логическое значение FALSE (ЛОЖЬ) как числовое значение 0, а логическое значение TRUE (ИСТИНА) как числовое значение 1"},"AVERAGEIF":{"a":"( cell-range, selection-criteria [ , average-range ] )","d":"Статистическая функция, анализирует диапазон данных и вычисляет среднее значение всех чисел в диапазоне ячеек, которые соответствуют заданному условию"},"BINOMDIST":{"a":"( number-successes , number-trials , success-probability , cumulative-flag )","d":"Статистическая функция, возвращает отдельное значение вероятности биномиального распределения"},"CONFIDENCE":{"a":"( alpha , standard-dev , size )","d":"Статистическая функция, возвращает доверительный интервал"},"CORREL":{"a":"( array-1 , array-2 )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает коэффициент корреляции между двумя диапазонами ячеек"},"COUNT":{"a":"( argument-list )","d":"Статистическая функция, используется для подсчета количества ячеек в выбранном диапазоне, содержащих числа, без учета пустых или содержащих текст ячеек"},"COUNTA":{"a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона ячеек и подсчета количества непустых ячеек"},"COUNTBLANK":{"a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона ячеек и возвращает количество пустых ячеек"},"COUNTIF":{"a":"( cell-range, selection-criteria )","d":"Статистическая функция, используется для подсчета количества ячеек выделенного диапазона, соответствующих заданному условию"},"COVAR":{"a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает ковариацию в двух диапазонах данных"},"CRITBINOM":{"a":"( number-trials , success-probability , alpha )","d":"Статистическая функция, возвращает наименьшее значение, для которого интегральное биномиальное распределение больше или равно заданному условию"},"DEVSQ":{"a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона ячеек и возвращает сумму квадратов отклонений чисел от их среднего значения"},"EXPONDIST":{"a":"( x , lambda , cumulative-flag )","d":"Статистическая функция, возвращает экспоненциальное распределение"},"FISHER":{"a":"( number )","d":"Статистическая функция, возвращает преобразование Фишера для числа"},"FISHERINV":{"a":"( number )","d":"Статистическая функция, выполняет обратное преобразование Фишера"},"FORECAST":{"a":"( x , array-1 , array-2 )","d":"Статистическая функция, предсказывает будущее значение на основе существующих значений"},"FREQUENCY":{"a":"( data-array , bins-array )","d":"Статистическая функция, вычисляет частоту появления значений в выбранном диапазоне ячеек и отображает первое значение возвращаемого вертикального массива чисел"},"GAMMALN":{"a":"(number)","d":"Статистическая функция, возвращает натуральный логарифм гамма-функции"},"GEOMEAN":{"a":"( argument-list )","d":"Статистическая функция, вычисляет среднее геометрическое для списка значений"},"HARMEAN":{"a":"( argument-list )","d":"Статистическая функция, вычисляет среднее гармоническое для списка значений"},"HYPGEOMDIST":{"a":"( sample-successes , number-sample , population-successes , number-population )","d":"Статистическая функция, возвращает гипергеометрическое распределение, вероятность заданного количества успехов в выборке, если заданы размер выборки, количество успехов в генеральной совокупности и размер генеральной совокупности"},"INTERCEPT":{"a":"( array-1 , array-2 )","d":"Статистическая функция, анализирует значения первого и второго массивов для вычисления точки пересечения"},"KURT":{"a":"( argument-list )","d":"Статистическая функция, возвращает эксцесс списка значений"},"LARGE":{"a":"( array , k )","d":"Статистическая функция, анализирует диапазон ячеек и возвращает n-ое по величине значение"},"LOGINV":{"a":"( x , mean , standard-deviation )","d":"Статистическая функция, возвращает обратное логарифмическое нормальное распределение для заданного значения x с указанными параметрами"},"LOGNORMDIST":{"a":"( x , mean , standard-deviation )","d":"Статистическая функция, анализирует логарифмически преобразованные данные и возвращает логарифмическое нормальное распределение для заданного значения x с указанными параметрами"},"MAX":{"a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наибольшего числа"},"MAXA":{"a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наибольшего значения"},"MEDIAN":{"a":"( argument-list )","d":"Статистическая функция, вычисляет медиану для списка значений"},"MIN":{"a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наименьшего числа"},"MINA":{"a":"(number1, number2, ...)","d":"Статистическая функция, используется для анализа диапазона данных и поиска наименьшего значения"},"MODE":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает наиболее часто встречающееся значение"},"NEGBINOMDIST":{"a":"( number-failures , number-successes , success-probability )","d":"Статистическая функция, возвращает отрицательное биномиальное распределение"},"NORMDIST":{"a":"( x , mean , standard-deviation , cumulative-flag )","d":"Статистическая функция, возвращает нормальную функцию распределения для указанного среднего значения и стандартного отклонения"},"NORMINV":{"a":"( x , mean , standard-deviation )","d":"Статистическая функция, возвращает обратное нормальное распределение для указанного среднего значения и стандартного отклонения"},"NORMSDIST":{"a":"(number)","d":"Статистическая функция, возвращает стандартное нормальное интегральное распределение"},"NORMSINV":{"a":"( probability )","d":"Статистическая функция, возвращает обратное значение стандартного нормального распределения"},"PEARSON":{"a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает коэффициент корреляции Пирсона"},"PERCENTILE":{"a":"( array , k )","d":"Статистическая функция, анализирует диапазон данных и возвращает n-ый процентиль"},"PERCENTRANK":{"a":"( array , x [ , significance ] )","d":"Статистическая функция, возвращает категорию значения в наборе данных как процентное содержание в наборе данных"},"PERMUT":{"a":"( number , number-chosen )","d":"Статистическая функция, возвращает количество перестановок для заданного числа элементов"},"POISSON":{"a":"( x , mean , cumulative-flag )","d":"Статистическая функция, возвращает распределение Пуассона"},"PROB":{"a":"( x-range , probability-range , lower-limit [ , upper-limit ] )","d":"Статистическая функция, возвращает вероятность того, что значения из интервала находятся внутри нижнего и верхнего пределов"},"QUARTILE":{"a":"( array , result-category )","d":"Статистическая функция, анализирует диапазон данных и возвращает квартиль"},"RSQ":{"a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает квадрат коэффициента корреляции Пирсона"},"SKEW":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает асимметрию распределения для списка значений"},"SLOPE":{"a":"( array-1 , array-2 )","d":"Статистическая функция, возвращает наклон линии линейной регрессии для данных в двух массивах"},"SMALL":{"a":"( array , k )","d":"Статистическая функция, анализирует диапазон данных и находит n-ое наименьшее значение"},"STANDARDIZE":{"a":"( x , mean , standard-deviation )","d":"Статистическая функция, возвращает нормализованное значение для распределения, характеризуемого заданными параметрами"},"STDEV":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает стандартное отклонение по выборке, содержащей числа"},"STDEVA":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает стандартное отклонение по выборке, содержащей числа, текст и логические значения (TRUE или FALSE). Текст и логические значения FALSE (ЛОЖЬ) интерпретируются как 0, а логические значения TRUE (ИСТИНА) - как 1"},"STDEVP":{"a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает стандартное отклонение по всей совокупности значений"},"STDEVPA":{"a":"( argument-list )","d":"Статистическая функция, используется для анализа диапазона данных и возвращает стандартное отклонение по всей совокупности значений"},"STEYX":{"a":"( known-ys , known-xs )","d":"Статистическая функция, возвращает стандартную ошибку предсказанных значений Y для каждого значения X по регрессивной шкале"},"VAR":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по выборке, содержащей числа"},"VARA":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по выборке"},"VARP":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по всей совокупности значений"},"VARPA":{"a":"( argument-list )","d":"Статистическая функция, анализирует диапазон данных и возвращает дисперсию по всей совокупности значений"},"ACCRINT":{"a":"( issue , first-interest , settlement , rate , [ par ] , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценным бумагам с периодической выплатой процентов"},"ACCRINTM":{"a":"( issue , settlement , rate , [ [ par ] [ , [ basis ] ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценным бумагам, процент по которым уплачивается при наступлении срока погашения"},"AMORDEGRC":{"a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества по каждому отчетному периоду методом дегрессивной амортизации"},"AMORLINC":{"a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества по каждому отчетному периоду методом линейной амортизации"},"COUPDAYBS":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества дней от начала действия купона до даты покупки ценной бумаги"},"COUPDAYS":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества дней в периоде купона, содержащем дату покупки ценной бумаги"},"COUPDAYSNC":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества дней от даты покупки ценной бумаги до следующей выплаты по купону"},"COUPNCD":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления даты следующей выплаты по купону после даты покупки ценной бумаги"},"COUPNUM":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления количества выплат процентов между датой покупки ценной бумаги и датой погашения"},"COUPPCD":{"a":"( settlement , maturity , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления даты выплаты процентов, предшествующей дате покупки ценной бумаги"},"CUMIPMT":{"a":"( rate , nper , pv , start-period , end-period , type )","d":"Финансовая функция, используется для вычисления общего размера процентых выплат по инвестиции между двумя периодами времени исходя из указанной процентной ставки и постоянной периодичности платежей"},"CUMPRINC":{"a":"( rate , nper , pv , start-period , end-period , type )","d":"Финансовая функция, используется для вычисления общей суммы, выплачиваемой в погашение основного долга по инвестиции между двумя периодами времени исходя из указанной процентной ставки и постоянной периодичности платежей"},"DB":{"a":"( cost , salvage , life , period [ , [ month ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период методом фиксированного убывающего остатка"},"DDB":{"a":"( cost , salvage , life , period [ , factor ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период методом двойного убывающего остатка"},"DISC":{"a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления ставки дисконтирования по ценной бумаге"},"DOLLARDE":{"a":"( fractional-dollar , fraction )","d":"Финансовая функция, преобразует цену в долларах, представленную в виде дроби, в цену в долларах, выраженную десятичным числом"},"DOLLARFR":{"a":"( decimal-dollar , fraction )","d":"Финансовая функция, преобразует цену в долларах, представленную десятичным числом, в цену в долларах, выраженную в виде дроби"},"DURATION":{"a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления продолжительности Маколея (взвешенного среднего срока погашения) для ценной бумаги с предполагаемой номинальной стоимостью 100 рублей"},"EFFECT":{"a":"( nominal-rate , npery )","d":"Финансовая функция, используется для вычисления эффективной (фактической) годовой процентной ставки по ценной бумаге исходя из указанной номинальной годовой процентной ставки и количества периодов в году, за которые начисляются сложные проценты"},"FV":{"a":"( rate , nper , pmt [ , [ pv ] [ ,[ type ] ] ] )","d":"Финансовая функция, вычисляет будущую стоимость инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"FVSCHEDULE":{"a":"( principal , schedule )","d":"Финансовая функция, используется для вычисления будущей стоимости инвестиций на основании ряда непостоянных процентных ставок"},"INTRATE":{"a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления ставки доходности по полностью обеспеченной ценной бумаге, проценты по которой уплачиваются только при наступлении срока погашения"},"IPMT":{"a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Финансовая функция, используется для вычисления суммы платежей по процентам для инвестиции исходя из указанной процентной ставки и постоянной периодичности платежей"},"IRR":{"a":"( values [ , [ guess ] ] )","d":"Финансовая функция, используется для вычисления внутренней ставки доходности по ряду периодических потоков денежных средств"},"ISPMT":{"a":"( rate , per , nper , pv )","d":"Финансовая функция, используется для вычисления процентов, выплачиваемых за определенный инвестиционный период, исходя из постоянной периодичности платежей"},"MDURATION":{"a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления модифицированной продолжительности Маколея (взвешенного среднего срока погашения) для ценной бумаги с предполагаемой номинальной стоимостью 100 рублей"},"MIRR":{"a":"( values , finance-rate , reinvest-rate )","d":"Финансовая функция, используется для вычисления модифицированной внутренней ставки доходности по ряду периодических денежных потоков"},"NOMINAL":{"a":"( effect-rate , npery )","d":"Финансовая функция, используется для вычисления номинальной годовой процентной ставки по ценной бумаге исходя из указанной эффективной (фактической) годовой процентной ставки и количества периодов в году, за которые начисляются сложные проценты"},"NPER":{"a":"( rate , pmt , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Финансовая функция, вычисляет количество периодов выплаты для инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"NPV":{"a":"( rate , argument-list )","d":"Финансовая функция, вычисляет величину чистой приведенной стоимости инвестиции на основе заданной ставки дисконтирования"},"ODDFPRICE":{"a":"( settlement , maturity , issue , first-coupon , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги с периодической выплатой процентов в случае нерегулярной продолжительности первого периода выплаты процентов (больше или меньше остальных периодов)"},"ODDFYIELD":{"a":"( settlement , maturity , issue , first-coupon , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценной бумаге с периодической выплатой процентов в случае нерегулярной продолжительности первого периода выплаты процентов (больше или меньше остальных периодов)"},"ODDLPRICE":{"a":"( settlement , maturity , last-interest , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги с периодической выплатой процентов в случае нерегулярной продолжительности последнего периода выплаты процентов (больше или меньше остальных периодов)"},"ODDLYIELD":{"a":"( settlement , maturity , last-interest , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления дохода по ценной бумаге с периодической выплатой процентов в случае нерегулярной продолжительности последнего периода выплаты процентов (больше или меньше остальных периодов)"},"PMT":{"a":"( rate , nper , pv [ , [ fv ] [ ,[ type ] ] ] )","d":"Финансовая функция, вычисляет размер периодического платежа по ссуде исходя из заданной процентной ставки и постоянной периодичности платежей"},"PPMT":{"a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )","d":"Финансовая функция, используется для вычисления размера платежа в счет погашения основного долга по инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"PRICE":{"a":"( settlement , maturity , rate , yld , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги с периодической выплатой процентов"},"PRICEDISC":{"a":"( settlement , maturity , discount , redemption [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги, на которую сделана скидка"},"PRICEMAT":{"a":"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления цены за 100 рублей номинальной стоимости ценной бумаги, процент по которой уплачивается при наступлении срока погашения"},"PV":{"a":"( rate , nper , pmt [ , [ fv ] [ ,[ type ] ] ] )","d":"Финансовая функция, вычисляет текущую стоимость инвестиции исходя из заданной процентной ставки и постоянной периодичности платежей"},"RATE":{"a":"( nper , pmt , pv [ , [ [ fv ] [ , [ [ type ] [ , [ guess ] ] ] ] ] ] )","d":"Финансовая функция, используется для вычисления размера процентной ставки по инвестиции исходя из постоянной периодичности платежей"},"RECEIVED":{"a":"( settlement , maturity , investment , discount [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления суммы, полученной за полностью обеспеченную ценную бумагу при наступлении срока погашения"},"SLN":{"a":"( cost , salvage , life )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за один отчетный период линейным методом амортизационных отчислений"},"SYD":{"a":"( cost , salvage , life , per )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период методом \"суммы годовых цифр\""},"TBILLEQ":{"a":"( settlement , maturity , discount )","d":"Финансовая функция, используется для вычисления эквивалентной доходности по казначейскому векселю"},"TBILLPRICE":{"a":"( settlement , maturity , discount )","d":"Финансовая функция, используется для вычисления цены на 100 рублей номинальной стоимости для казначейского векселя"},"TBILLYIELD":{"a":"( settlement , maturity , pr )","d":"Финансовая функция, используется для вычисления доходности по казначейскому векселю"},"VDB":{"a":"( cost , salvage , life , start-period , end-period [ , [ [ factor ] [ , [ no-switch-flag ] ] ] ] ] )","d":"Финансовая функция, используется для вычисления величины амортизации имущества за указанный отчетный период или его часть методом двойного уменьшения остатка или иным указанным методом"},"XIRR":{"a":"( values , dates [ , [ guess ] ] )","d":"Финансовая функция, используется для вычисления внутренней ставки доходности по ряду нерегулярных денежных потоков"},"XNPV":{"a":"( rate , values , dates )","d":"Финансовая функция, используется для вычисления чистой приведенной стоимости инвестиции исходя из указанной процентной ставки и нерегулярных выплат"},"YIELD":{"a":"( settlement , maturity , rate , pr , redemption , frequency [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления доходности по ценной бумаге с периодической выплатой процентов"},"YIELDDISC":{"a":"( settlement , maturity , pr , redemption , [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления годовой доходности по ценной бумаге, на которую дается скидка"},"YIELDMAT":{"a":"( settlement , maturity , issue , rate , pr [ , [ basis ] ] )","d":"Финансовая функция, используется для вычисления годовой доходности по ценным бумагам, процент по которым уплачивается при наступлении срока погашения"},"ABS":{"a":"( x )","d":"Математическая и тригонометрическая функция, используется для нахождения модуля (абсолютной величины) числа"},"ACOS":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает арккосинус числа"},"ACOSH":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический арккосинус числа"},"ASIN":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает арксинус числа"},"ASINH":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический арксинус числа"},"ATAN":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает арктангенс числа"},"ATAN2":{"a":"( x, y )","d":"Математическая и тригонометрическая функция, возвращает арктангенс координат x и y"},"ATANH":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический арктангенс числа"},"CEILING":{"a":"( x, significance )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число в большую сторону до ближайшего числа, кратного заданной значимости"},"COMBIN":{"a":"( number , number-chosen )","d":"Математическая и тригонометрическая функция, возвращает количество комбинаций для заданного числа элементов"},"COS":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает косинус угла"},"COSH":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический косинус числа"},"DEGREES":{"a":"( angle )","d":"Математическая и тригонометрическая функция, преобразует радианы в градусы"},"EVEN":{"a":"( x )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число до ближайшего четного целого числа"},"EXP":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает значение константы e, возведенной в заданную степень. Константа e равна 2,71828182845904"},"FACT":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает факториал числа"},"FACTDOUBLE":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает двойной факториал числа"},"FLOOR":{"a":"( x, significance )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число в меньшую сторону до ближайшего числа, кратного заданной значимости"},"GCD":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает наибольший общий делитель для двух и более чисел"},"INT":{"a":"( x )","d":"Математическая и тригонометрическая функция, анализирует и возвращает целую часть заданного числа"},"LCM":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает наименьшее общее кратное для одного или более чисел"},"LN":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает натуральный логарифм числа"},"LOG":{"a":"( x [ , base ] )","d":"Математическая и тригонометрическая функция, возвращает логарифм числа по заданному основанию"},"LOG10":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает логарифм числа по основанию 10"},"MDETERM":{"a":"( array )","d":"Математическая и тригонометрическая функция, возвращает определитель матрицы (матрица хранится в массиве)"},"MINVERSE":{"a":"( array )","d":"Математическая и тригонометрическая функция, возвращает обратную матрицу для заданной матрицы и отображает первое значение возвращаемого массива чисел"},"MMULT":{"a":"( array1, array2 )","d":"Математическая и тригонометрическая функция, возвращает матричное произведение двух массивов и отображает первое значение из возвращаемого массива чисел"},"MOD":{"a":"( x, y )","d":"Математическая и тригонометрическая функция, возвращает остаток от деления числа на заданный делитель"},"MROUND":{"a":"( x, multiple )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число до кратного заданной значимости"},"MULTINOMIAL":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает отношение факториала суммы значений к произведению факториалов"},"ODD":{"a":"( x )","d":"Математическая и тригонометрическая функция, используется, чтобы округлить число до ближайшего нечетного целого числа"},"PI":{"a":"()","d":"Математическая и тригонометрическая функция, возвращает математическую константу пи, равную 3.14159265358979. Функция не требует аргумента"},"POWER":{"a":"( x, y )","d":"Математическая и тригонометрическая функция, возвращает результат возведения числа в заданную степень"},"PRODUCT":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, перемножает все числа в заданном диапазоне ячеек и возвращает произведение"},"QUOTIENT":{"a":"( dividend , divisor )","d":"Математическая и тригонометрическая функция, возвращает целую часть результата деления с остатком"},"RADIANS":{"a":"( angle )","d":"Математическая и тригонометрическая функция, преобразует градусы в радианы"},"RAND":{"a":"()","d":"Математическая и тригонометрическая функция, возвращает случайное число, которое больше или равно 0 и меньше 1. Функция не требует аргумента"},"RANDBETWEEN":{"a":"( lower-bound , upper-bound )","d":"Математическая и тригонометрическая функция, возвращает случайное число, большее или равное значению аргумента lower-bound (нижняя граница) и меньшее или равное значению аргумента upper-bound (верхняя граница)"},"ROMAN":{"a":"( number, form )","d":"Математическая и тригонометрическая функция, преобразует число в римское"},"ROUND":{"a":"( x , number-digits )","d":"Математическая и тригонометрическая функция, округляет число до заданного количества десятичных разрядов"},"ROUNDDOWN":{"a":"( x , number-digits )","d":"Математическая и тригонометрическая функция, округляет число в меньшую сторону до заданного количества десятичных разрядов"},"ROUNDUP":{"a":"( x , number-digits )","d":"Математическая и тригонометрическая функция, округляет число в большую сторону до заданного количества десятичных разрядов"},"SERIESSUM":{"a":"( input-value , initial-power , step , coefficients )","d":"Математическая и тригонометрическая функция, возвращает сумму степенного ряда"},"SIGN":{"a":"( x )","d":"Математическая и тригонометрическая функция, определяет знак числа. Если число положительное, функция возвращает значение 1. Если число отрицательное, функция возвращает значение -1. Если число равно 0, функция возвращает значение 0"},"SIN":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает синус угла"},"SINH":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический синус числа"},"SQRT":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает квадратный корень числа"},"SQRTPI":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает квадратный корень от результата умножения константы пи (3.14159265358979) на заданное число"},"SUBTOTAL":{"a":"( function-number , argument-list )","d":"Возвращает промежуточный итог в список или базу данных"},"SUM":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, возвращает результат сложения всех чисел в выбранном диапазоне ячеек"},"SUMIF":{"a":"( cell-range, selection-criteria [ , sum-range ] )","d":"Математическая и тригонометрическая функция, суммирует все числа в выбранном диапазоне ячеек в соответствии с заданным условием и возвращает результат"},"SUMPRODUCT":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, перемножает соответствующие элементы заданных диапазонов ячеек или массивов и возвращает сумму произведений"},"SUMSQ":{"a":"( argument-list )","d":"Математическая и тригонометрическая функция, вычисляет сумму квадратов чисел и возвращает результат"},"SUMX2MY2":{"a":"( array-1 , array-2 )","d":"Математическая и тригонометрическая функция, вычисляет сумму разностей квадратов соответствующих элементов в двух массивах"},"SUMX2PY2":{"a":"( array-1 , array-2 )","d":"Математическая и тригонометрическая функция, вычисляет суммы квадратов соответствующих элементов в двух массивах и возвращает сумму полученных результатов"},"SUMXMY2":{"a":"( array-1 , array-2 )","d":"Математическая и тригонометрическая функция, возвращает сумму квадратов разностей соответствующих элементов в двух массивах"},"TAN":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает тангенс угла"},"TANH":{"a":"( x )","d":"Математическая и тригонометрическая функция, возвращает гиперболический тангенс числа"},"TRUNC":{"a":"( x [ , number-digits ] )","d":"Математическая и тригонометрическая функция, возвращает число, усеченное до заданного количества десятичных разрядов"},"ADDRESS":{"a":"( row-number , col-number [ , [ ref-type ] [ , [ A1-ref-style-flag ] [ , sheet-name ] ] ] )","d":"Поисковая функция, возвращает адрес ячейки, представленный в виде текста"},"CHOOSE":{"a":"( index , argument-list )","d":"Поисковая функция, возвращает значение из списка значений по заданному индексу (позиции)"},"COLUMN":{"a":"( [ reference ] )","d":"Поисковая функция, возвращает номер столбца ячейки"},"COLUMNS":{"a":"( array )","d":"Поисковая функция, возвращает количество столбцов в ссылке на ячейки"},"HLOOKUP":{"a":"( lookup-value , table-array , row-index-num [ , [ range-lookup-flag ] ] )","d":"Поисковая функция, используется для выполнения горизонтального поиска значения в верхней строке таблицы или массива и возвращает значение, которое находится в том же самом столбце в строке с заданным номером"},"INDEX":{"a":"( array , [ row-number ] [ , [ column-number ] ] ) INDEX( reference , [ row-number ] [ , [ column-number ] [ , [ area-number ] ] ] )","d":"Поисковая функция, возвращает значение в диапазоне ячеек на основании заданных номера строки и номера столбца. Существуют две формы функции INDEX"},"INDIRECT":{"a":"( ref-text [ , [ A1-ref-style-flag ] ] )","d":"Поисковая функция, возвращает ссылку на ячейку, указанную с помощью текстовой строки"},"LOOKUP":{"a":"( lookup-value , lookup-vector , result-vector )","d":"Поисковая функция, возвращает значение из выбранного диапазона (строки или столбца с данными, отсортированными в порядке возрастания)"},"MATCH":{"a":"( lookup-value , lookup-array [ , [ match-type ]] )","d":"Поисковая функция, возвращает относительное положение заданного элемента в диапазоне ячеек"},"OFFSET":{"a":"( reference , rows , cols [ , [ height ] [ , [ width ] ] ] )","d":"Поисковая функция, возвращает ссылку на ячейку, отстоящую от заданной ячейки (или верхней левой ячейки в диапазоне ячеек) на определенное число строк и столбцов"},"ROW":{"a":"( [ reference ] )","d":"Поисковая функция, возвращает номер строки для ссылки на ячейку"},"ROWS":{"a":"( array )","d":"Поисковая функция, возвращает количество строк в ссылке на ячейки"},"TRANSPOSE":{"a":"( array )","d":"Поисковая функция, возвращает первый элемент массива"},"VLOOKUP":{"a":"( lookup-value , table-array , col-index-num [ , [ range-lookup-flag ] ] )","d":"Поисковая функция, используется для выполнения вертикального поиска значения в крайнем левом столбце таблицы или массива и возвращает значение, которое находится в той же самой строке в столбце с заданным номером"},"ERROR.TYPE":{"a":"(value)","d":"Информационная функция, возвращает числовое представление одной из существующих ошибок"},"ISBLANK":{"a":"(value)","d":"Информационная функция, проверяет, является ли ячейка пустой. Если ячейка пуста, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISERR":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие значения ошибки. Если ячейка содержит значение ошибки (кроме #N/A), функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISERROR":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие значения ошибки. Если ячейка содержит одно из следующих значений ошибки: #N/A, #VALUE!, #REF!, #DIV/0!, #NUM!, #NAME? или #NULL, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISEVEN":{"a":"(number)","d":"Информационная функция, используется для проверки на наличие четного числа. Если ячейка содержит четное число, функция возвращает значение TRUE. Если число является нечетным, она возвращает значение FALSE"},"ISLOGICAL":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие логического значения (TRUE (ИСТИНА) или FALSE (ЛОЖЬ)). Если ячейка содержит логическое значение, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISNA":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие ошибки #N/A. Если ячейка содержит значение ошибки #N/A, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISNONTEXT":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие значения, которое не является текстом. Если ячейка не содержит текстового значения, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISNUMBER":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие числового значения. Если ячейка содержит числовое значение, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"ISODD":{"a":"(number)","d":"Информационная функция, используется для проверки на наличие нечетного числа. Если ячейка содержит нечетное число, функция возвращает значение TRUE. Если число является четным, она возвращает значение FALSE"},"ISREF":{"a":"(value)","d":"Информационная функция, используется для проверки, является ли значение допустимой ссылкой на другую ячейку"},"ISTEXT":{"a":"(value)","d":"Информационная функция, используется для проверки на наличие текстового значения. Если ячейка содержит текстовое значение, функция возвращает значение TRUE (ИСТИНА), в противном случае функция возвращает значение FALSE (ЛОЖЬ)"},"N":{"a":"(value)","d":"Информационная функция, преобразует значение в число"},"NA":{"a":"()","d":"Информационная функция, возвращает значение ошибки #N/A. Эта функция не требует аргумента"},"TYPE":{"a":"(value)","d":"Информационная функция, используется для определения типа результирующего или отображаемого значения"},"AND":{"a":"(logical1, logical2, ...)","d":"Логическая функция, используется для проверки, является ли введенное логическое значение TRUE (истинным) или FALSE (ложным). Функция возвращает значение TRUE (ИСТИНА), если все аргументы имеют значение TRUE (ИСТИНА)"},"FALSE":{"a":"()","d":"Логическая функция, возвращает значение FALSE (ЛОЖЬ) и не требует аргумента"},"IF":{"a":"(logical_test, value_if_true, value_if_false)","d":"Логическая функция, используется для проверки логического выражения и возвращает одно значение, если проверяемое условие имеет значение TRUE (ИСТИНА), и другое, если оно имеет значение FALSE (ЛОЖЬ)"},"IFERROR":{"a":"(value, value_if_error)","d":"Логическая функция, используется для проверки формулы на наличие ошибок в первом аргументе. Функция возвращает результат формулы, если ошибки нет, или определенное значение, если она есть"},"NOT":{"a":"(logical)","d":"Логическая функция, используется для проверки, является ли введенное логическое значение TRUE (истинным) или FALSE (ложным). Функция возвращает значение TRUE (ИСТИНА), если аргумент имеет значение FALSE (ЛОЖЬ), и FALSE (ЛОЖЬ), если аргумент имеет значение TRUE (ИСТИНА)"},"OR":{"a":"(logical1, logical2, ...)","d":"Логическая функция, используется для проверки, является ли введенное логическое значение TRUE (истинным) или FALSE (ложным). Функция возвращает значение FALSE (ЛОЖЬ), если все аргументы имеют значение FALSE (ЛОЖЬ)"},"TRUE":{"a":"()","d":"Логическая функция, возвращает значение TRUE (ИСТИНА) и не требует аргумента"}} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/help/de/callback.js b/apps/spreadsheeteditor/main/resources/help/de/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/spreadsheeteditor/main/resources/help/de/callback.js +++ b/apps/spreadsheeteditor/main/resources/help/de/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/spreadsheeteditor/main/resources/help/de/images/GreenCircle.png b/apps/spreadsheeteditor/main/resources/help/de/images/greencircle.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/de/images/GreenCircle.png rename to apps/spreadsheeteditor/main/resources/help/de/images/greencircle.png diff --git a/apps/spreadsheeteditor/main/resources/help/de/images/SearchDownButton.png b/apps/spreadsheeteditor/main/resources/help/de/images/searchdownbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/de/images/SearchDownButton.png rename to apps/spreadsheeteditor/main/resources/help/de/images/searchdownbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/de/images/SearchUpButton.png b/apps/spreadsheeteditor/main/resources/help/de/images/searchupbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/de/images/SearchUpButton.png rename to apps/spreadsheeteditor/main/resources/help/de/images/searchupbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/de/images/TextSettingsTab.png b/apps/spreadsheeteditor/main/resources/help/de/images/textsettingstab.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/de/images/TextSettingsTab.png rename to apps/spreadsheeteditor/main/resources/help/de/images/textsettingstab.png diff --git a/apps/spreadsheeteditor/main/resources/help/de/images/ViewSettingsIcon.png b/apps/spreadsheeteditor/main/resources/help/de/images/viewsettingsicon.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/de/images/ViewSettingsIcon.png rename to apps/spreadsheeteditor/main/resources/help/de/images/viewsettingsicon.png diff --git a/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm b/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm index 7ef59f093..630a84696 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm b/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm index 08c262769..0374fafc9 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm index 45bfea533..291be6b5b 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm @@ -68,8 +68,8 @@ Specify the Vertical Axis Title orientation selecting the necessary option from the drop-down list:
    • None to not display a vertical axis title,
      • -
    • Rotated to display the title from top to bottom to the left of the vertical axis,
      • -
    • Horizontal to display the title from bottom to top to the left of the vertical axis.
      • +
    • Rotated to display the title from bottom to top to the left of the vertical axis,
      • +
    • Horizontal to display the title horizontally to the left of the vertical axis.
    diff --git a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm index ffa147ae5..c73e120df 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm @@ -45,12 +45,16 @@
  • Align the text vertically within the text box using the corresponding icons situated at the top toolbar. You can also right-click the text, select the Vertical Alignment option and then choose one of the available options: Align Top, Align Center or Align Bottom.
  • Rotate the text within the text box. To do that, right-click the text, select the Text Direction option and then choose one of the available options: Horizontal (is selected by default), Rotate at 90° (sets a vertical direction, from top to bottom) or Rotate at 270° (sets a vertical direction, from bottom to top).
  • Insert a hyperlink.
    • -
  • Set line spacing for the multi-line text within the text box using the Text Settings tab of the right sidebar that opens if you click the Text Settings Text Settings icon icon. Here you can set the line height for the text lines within the paragraph as well as the margins between the current and the preceding or the subsequent paragraph. -

    Text Settings tab

    +
  • Set line and paragraph spacing for the multi-line text within the text box using the Text Settings tab of the right sidebar that opens if you click the Text Settings Text Settings icon icon. Here you can set the line height for the text lines within the paragraph as well as the margins between the current and the preceding or the subsequent paragraph. +

    Text Settings tab

      -
    • Line Spacing - set the line height for the text lines within the paragraph. You can select among three options: at least (sets the minimum line spacing that is needed to fit the largest font or graphic on the line), multiple (sets line spacing that can be expressed in numbers greater than 1), exactly (sets fixed line spacing). In the At field you can specify the necessary value.
      • -
    • Before - set the amount of space before the paragraph.
      • -
    • After - set the amount of space after the paragraph.
      • +
    • Line Spacing - set the line height for the text lines within the paragraph. You can select among three options: at least (sets the minimum line spacing that is needed to fit the largest font or graphic on the line), multiple (sets line spacing that can be expressed in numbers greater than 1), exactly (sets fixed line spacing). You can specify the necessary value in the field on the right.
      • +
    • Paragraph Spacing - set the amount of space between paragraphs. +
        +
      • Before - set the amount of space before the paragraph.
        • +
      • After - set the amount of space after the paragraph.
        • +
      +
  • Change the advanced settings of the paragraph (you can adjust paragraph indents and tab stops for the multi-line text within the text box and apply some font formatting settings). Put the cursor within the paragraph you need - the Text Settings tab will be activated at the right sidebar. Click the Show advanced settings link. The paragraph properties window will be opened: diff --git a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/SortData.htm b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/SortData.htm index fce690b69..1bfdd6cf2 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/SortData.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/SortData.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/UseNamedRanges.htm b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/UseNamedRanges.htm index 4e13e7502..f09cb81ba 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/UseNamedRanges.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/UseNamedRanges.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/en/callback.js b/apps/spreadsheeteditor/main/resources/help/en/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/callback.js +++ b/apps/spreadsheeteditor/main/resources/help/en/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/TextSettingsTab.png b/apps/spreadsheeteditor/main/resources/help/en/images/TextSettingsTab.png deleted file mode 100644 index 29d95de4f..000000000 Binary files a/apps/spreadsheeteditor/main/resources/help/en/images/TextSettingsTab.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/GreenCircle.png b/apps/spreadsheeteditor/main/resources/help/en/images/greencircle.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/en/images/GreenCircle.png rename to apps/spreadsheeteditor/main/resources/help/en/images/greencircle.png diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/SearchDownButton.png b/apps/spreadsheeteditor/main/resources/help/en/images/searchdownbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/en/images/SearchDownButton.png rename to apps/spreadsheeteditor/main/resources/help/en/images/searchdownbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/SearchUpButton.png b/apps/spreadsheeteditor/main/resources/help/en/images/searchupbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/en/images/SearchUpButton.png rename to apps/spreadsheeteditor/main/resources/help/en/images/searchupbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/textsettingstab.png b/apps/spreadsheeteditor/main/resources/help/en/images/textsettingstab.png new file mode 100644 index 000000000..5536d8c98 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/help/en/images/textsettingstab.png differ diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/ViewSettingsIcon.png b/apps/spreadsheeteditor/main/resources/help/en/images/viewsettingsicon.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/en/images/ViewSettingsIcon.png rename to apps/spreadsheeteditor/main/resources/help/en/images/viewsettingsicon.png diff --git a/apps/spreadsheeteditor/main/resources/help/es/callback.js b/apps/spreadsheeteditor/main/resources/help/es/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/spreadsheeteditor/main/resources/help/es/callback.js +++ b/apps/spreadsheeteditor/main/resources/help/es/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/spreadsheeteditor/main/resources/help/es/images/GreenCircle.png b/apps/spreadsheeteditor/main/resources/help/es/images/greencircle.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/es/images/GreenCircle.png rename to apps/spreadsheeteditor/main/resources/help/es/images/greencircle.png diff --git a/apps/spreadsheeteditor/main/resources/help/es/images/SearchDownButton.png b/apps/spreadsheeteditor/main/resources/help/es/images/searchdownbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/es/images/SearchDownButton.png rename to apps/spreadsheeteditor/main/resources/help/es/images/searchdownbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/es/images/SearchUpButton.png b/apps/spreadsheeteditor/main/resources/help/es/images/searchupbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/es/images/SearchUpButton.png rename to apps/spreadsheeteditor/main/resources/help/es/images/searchupbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/es/images/TextSettingsTab.png b/apps/spreadsheeteditor/main/resources/help/es/images/textsettingstab.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/es/images/TextSettingsTab.png rename to apps/spreadsheeteditor/main/resources/help/es/images/textsettingstab.png diff --git a/apps/spreadsheeteditor/main/resources/help/fr/callback.js b/apps/spreadsheeteditor/main/resources/help/fr/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/spreadsheeteditor/main/resources/help/fr/callback.js +++ b/apps/spreadsheeteditor/main/resources/help/fr/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/spreadsheeteditor/main/resources/help/fr/images/GreenCircle.png b/apps/spreadsheeteditor/main/resources/help/fr/images/greencircle.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/fr/images/GreenCircle.png rename to apps/spreadsheeteditor/main/resources/help/fr/images/greencircle.png diff --git a/apps/spreadsheeteditor/main/resources/help/fr/images/SearchDownButton.png b/apps/spreadsheeteditor/main/resources/help/fr/images/searchdownbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/fr/images/SearchDownButton.png rename to apps/spreadsheeteditor/main/resources/help/fr/images/searchdownbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/fr/images/SearchUpButton.png b/apps/spreadsheeteditor/main/resources/help/fr/images/searchupbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/fr/images/SearchUpButton.png rename to apps/spreadsheeteditor/main/resources/help/fr/images/searchupbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/fr/images/TextSettingsTab.png b/apps/spreadsheeteditor/main/resources/help/fr/images/textsettingstab.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/fr/images/TextSettingsTab.png rename to apps/spreadsheeteditor/main/resources/help/fr/images/textsettingstab.png diff --git a/apps/spreadsheeteditor/main/resources/help/fr/images/ViewSettingsIcon.png b/apps/spreadsheeteditor/main/resources/help/fr/images/viewsettingsicon.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/fr/images/ViewSettingsIcon.png rename to apps/spreadsheeteditor/main/resources/help/fr/images/viewsettingsicon.png diff --git a/apps/spreadsheeteditor/main/resources/help/it/callback.js b/apps/spreadsheeteditor/main/resources/help/it/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/spreadsheeteditor/main/resources/help/it/callback.js +++ b/apps/spreadsheeteditor/main/resources/help/it/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/spreadsheeteditor/main/resources/help/it/images/GreenCircle.png b/apps/spreadsheeteditor/main/resources/help/it/images/greencircle.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/it/images/GreenCircle.png rename to apps/spreadsheeteditor/main/resources/help/it/images/greencircle.png diff --git a/apps/spreadsheeteditor/main/resources/help/it/images/SearchDownButton.png b/apps/spreadsheeteditor/main/resources/help/it/images/searchdownbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/it/images/SearchDownButton.png rename to apps/spreadsheeteditor/main/resources/help/it/images/searchdownbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/it/images/SearchUpButton.png b/apps/spreadsheeteditor/main/resources/help/it/images/searchupbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/it/images/SearchUpButton.png rename to apps/spreadsheeteditor/main/resources/help/it/images/searchupbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/it/images/TextSettingsTab.png b/apps/spreadsheeteditor/main/resources/help/it/images/textsettingstab.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/it/images/TextSettingsTab.png rename to apps/spreadsheeteditor/main/resources/help/it/images/textsettingstab.png diff --git a/apps/spreadsheeteditor/main/resources/help/it/images/ViewSettingsIcon.png b/apps/spreadsheeteditor/main/resources/help/it/images/viewsettingsicon.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/it/images/ViewSettingsIcon.png rename to apps/spreadsheeteditor/main/resources/help/it/images/viewsettingsicon.png diff --git a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/advancedsettings.htm b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/AdvancedSettings.htm similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/advancedsettings.htm rename to apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/AdvancedSettings.htm diff --git a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm index 6a10c656b..b48858385 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/CollaborativeEditing.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm index 802a5ee0e..977b3e461 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertChart.htm b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertChart.htm index 1ad8f3372..84953862d 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertChart.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertChart.htm @@ -87,8 +87,8 @@ Укажите ориентацию Названия вертикальной оси, выбрав нужную опцию из выпадающего списка:
    • Нет, чтобы название вертикальной оси не отображалось,
      • -
    • Повернутое, чтобы показать название сверху вниз слева от вертикальной оси,
      • -
    • По горизонтали, чтобы показать название снизу вверх слева от вертикальной оси.
      • +
    • Повернутое, чтобы показать название снизу вверх слева от вертикальной оси,
      • +
    • По горизонтали, чтобы показать название по горизонтали слева от вертикальной оси.
    • diff --git a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm index 076bd6feb..cbc3832ab 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertTextObjects.htm @@ -5,6 +5,7 @@ +
    @@ -45,12 +46,16 @@
  • Выровняйте текст внутри текстового поля по вертикали с помощью соответствующих значков на верхней панели инструментов. Можно также щелкнуть по тексту правой кнопкой мыши, выбрать опцию Вертикальное выравнивание, а затем - один из доступных вариантов: По верхнему краю, По центру или По нижнему краю.
  • Поверните текст внутри текстового поля. Для этого щелкните по тексту правой кнопкой мыши, выберите опцию Направление текста, а затем выберите один из доступных вариантов: Горизонтальное (выбран по умолчанию), Поворот на 90° (задает вертикальное направление, сверху вниз) или Поворот на 270° (задает вертикальное направление, снизу вверх).
  • Вставьте гиперссылку.
    • -
  • Задайте междустрочный интервал для многострочного текста внутри текстового поля с помощью вкладки Параметры текста на правой боковой панели. Чтобы ее открыть, щелкните по значку Параметры текста Значок Параметры текста. Здесь можно задать высоту строки для строк текста в абзаце, а также поля между текущим и предыдущим или последующим абзацем. -

    Вкладка Параметры текста

    +
  • Задайте междустрочный интервал и интервал между абзацами для многострочного текста внутри текстового поля с помощью вкладки Параметры текста на правой боковой панели. Чтобы ее открыть, щелкните по значку Параметры текста Значок Параметры текста. Здесь можно задать высоту строки для строк текста в абзаце, а также поля между текущим и предыдущим или последующим абзацем. +

    Вкладка Параметры текста

      -
    • Междустрочный - задайте высоту строки для строк текста в абзаце. Вы можете выбрать одну из трех опций: минимум (устанавливает минимальный междустрочный интервал, который требуется, чтобы соответствовать самому крупному шрифту или графическому элементу на строке), множитель (устанавливает междустрочный интервал, который может быть выражен в числах больше 1), точно (устанавливает фиксированный междустрочный интервал). В поле Значение вы можете указать необходимое значение.
      • -
    • Перед - задайте величину свободного места перед абзацем.
      • -
    • После - задайте величину свободного места после абзаца.
      • +
    • Междустрочный интервал - задайте высоту строки для строк текста в абзаце. Вы можете выбрать одну из трех опций: минимум (устанавливает минимальный междустрочный интервал, который требуется, чтобы соответствовать самому крупному шрифту или графическому элементу на строке), множитель (устанавливает междустрочный интервал, который может быть выражен в числах больше 1), точно (устанавливает фиксированный междустрочный интервал). Необходимое значение можно указать в поле справа.
      • +
    • Интервал между абзацами - задайте величину свободного пространства между абзацами. +
        +
      • Перед - задайте величину свободного пространства перед абзацем.
        • +
      • После - задайте величину свободного пространства после абзаца.
        • +
      +
  • Измените дополнительные параметры абзаца (можно настроить отступы абзаца и позиции табуляции для многострочного текста внутри текстового поля и применить некоторые параметры форматирования шрифта). Установите курсор в пределах нужного абзаца - на правой боковой панели будет активирована вкладка Параметры текста. Нажмите на ссылку Дополнительные параметры. Откроется окно свойств абзаца: diff --git a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/SortData.htm b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/SortData.htm index 39b8acb43..d3475a048 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/SortData.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/SortData.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/UseNamedRanges.htm b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/UseNamedRanges.htm index 3d344a88c..0ca040da7 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/UseNamedRanges.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/UseNamedRanges.htm @@ -5,6 +5,7 @@ +
    diff --git a/apps/spreadsheeteditor/main/resources/help/ru/callback.js b/apps/spreadsheeteditor/main/resources/help/ru/callback.js index 1404be6a2..4541229d1 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/callback.js +++ b/apps/spreadsheeteditor/main/resources/help/ru/callback.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ function onhyperlinkclick(element) { function _postMessage(msg) { if (window.parent && window.JSON) { diff --git a/apps/spreadsheeteditor/main/resources/help/ru/images/GreenCircle.png b/apps/spreadsheeteditor/main/resources/help/ru/images/greencircle.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/ru/images/GreenCircle.png rename to apps/spreadsheeteditor/main/resources/help/ru/images/greencircle.png diff --git a/apps/spreadsheeteditor/main/resources/help/ru/images/SearchDownButton.png b/apps/spreadsheeteditor/main/resources/help/ru/images/searchdownbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/ru/images/SearchDownButton.png rename to apps/spreadsheeteditor/main/resources/help/ru/images/searchdownbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/ru/images/SearchUpButton.png b/apps/spreadsheeteditor/main/resources/help/ru/images/searchupbutton.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/ru/images/SearchUpButton.png rename to apps/spreadsheeteditor/main/resources/help/ru/images/searchupbutton.png diff --git a/apps/spreadsheeteditor/main/resources/help/ru/images/TextSettingsTab.png b/apps/spreadsheeteditor/main/resources/help/ru/images/textsettingstab.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/ru/images/TextSettingsTab.png rename to apps/spreadsheeteditor/main/resources/help/ru/images/textsettingstab.png diff --git a/apps/spreadsheeteditor/main/resources/help/ru/images/ViewSettingsIcon.png b/apps/spreadsheeteditor/main/resources/help/ru/images/viewsettingsicon.png similarity index 100% rename from apps/spreadsheeteditor/main/resources/help/ru/images/ViewSettingsIcon.png rename to apps/spreadsheeteditor/main/resources/help/ru/images/viewsettingsicon.png diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png index 40248efca..e6edab1d3 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png and b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png index a5f0b698e..06d5f5f4e 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png and b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png differ diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less index 58d5a690f..3c57f8f12 100644 --- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less +++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less @@ -2,7 +2,7 @@ .combo-values { width: 100%; - height: 265px; + height: 162px; overflow: hidden; .list-item { @@ -53,6 +53,16 @@ } } + #menu-container-filters > .dropdown-menu { + position: inherit !important; + left: 0 !important; + top: 0 !important; + width: 100%; + display: inline-block; + .box-shadow(none); + border: none; + } + .btn-placeholder { // background-color: red; display: inline-block; diff --git a/apps/spreadsheeteditor/main/resources/less/formuladialog.less b/apps/spreadsheeteditor/main/resources/less/formuladialog.less index e630c30a2..5c7ea4215 100644 --- a/apps/spreadsheeteditor/main/resources/less/formuladialog.less +++ b/apps/spreadsheeteditor/main/resources/less/formuladialog.less @@ -2,7 +2,7 @@ .combo-functions { width: 100%; - height: 242px; + height: 184px; overflow: hidden; } diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 5890449e9..54f59db5d 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -20,6 +20,9 @@ /*menuTextArt*/ .toolbar-btn-icon(btn-menu-textart, 66, @toolbar-icon-size); + + /*menuTable*/ + .toolbar-btn-icon(btn-menu-table, 80, @toolbar-icon-size); } } @@ -79,12 +82,19 @@ } } +.btn-edit-table, .btn-change-shape { .background-ximage('@{app-image-path}/right-panels/rowscols_icon.png', '@{app-image-path}/right-panels/rowscols_icon@2x.png', 84px); margin-right: 2px !important; margin-bottom: 1px !important; } +.btn-edit-table {background-position: 0 0;} +button.over .btn-edit-table {background-position: -28px 0;} +.btn-group.open .btn-edit-table, +button.active .btn-edit-table, +button:active .btn-edit-table {background-position: -56px 0;} + .btn-change-shape {background-position: 0 -16px;} button.over .btn-change-shape {background-position: -28px -16px;} .btn-group.open .btn-change-shape, @@ -283,4 +293,8 @@ button:active .btn-change-shape {background-position: -56px -16px;} .pie-doughnut{ background-position: -200px 0; +} + +#table-combo-template .combo-dataview{ + .combo-template(60px); } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app.js b/apps/spreadsheeteditor/mobile/app.js index 6a3c9ed6a..88e2570bf 100644 --- a/apps/spreadsheeteditor/mobile/app.js +++ b/apps/spreadsheeteditor/mobile/app.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.application({ name: 'SSE', diff --git a/apps/spreadsheeteditor/mobile/app/controller/ApiEvents.js b/apps/spreadsheeteditor/mobile/app/controller/ApiEvents.js index cfd9fb479..6ef6b6081 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/ApiEvents.js +++ b/apps/spreadsheeteditor/mobile/app/controller/ApiEvents.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.ApiEvents', { mixins: { observable: "Ext.mixin.Observable" diff --git a/apps/spreadsheeteditor/mobile/app/controller/Document.js b/apps/spreadsheeteditor/mobile/app/controller/Document.js index 6f12d1157..592627e3f 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Document.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Document.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.Document', { extend: 'Ext.app.Controller', @@ -44,9 +76,9 @@ Ext.define('SSE.controller.Document', { }, _onLongActionEnd: function(type, id) { - if (type === c_oAscAsyncActionType['BlockInteraction']) { + if (type === Asc.c_oAscAsyncActionType['BlockInteraction']) { switch (id) { - case c_oAscAsyncAction['Open']: + case Asc.c_oAscAsyncAction['Open']: var i = this.api.asc_getActiveWorksheetIndex(); this.api.asc_showWorksheet(i); break; diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 6eb974e48..82293b9d9 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.Main', { extend: 'Ext.app.Controller', editMode: false, @@ -32,9 +64,10 @@ Ext.define('SSE.controller.Main', { var app = this.getApplication(); // Initialize api - this.api = new Asc.spreadsheet_api("id-sdkeditor", "", SSE.controller.ApiEvents, {}, {}); - this.api.asc_SetFontsPath("../../../sdk/Fonts/"); - this.api.asc_setMobileVersion(true); + this.api = new Asc.spreadsheet_api({ + 'id-view' : 'id-sdkeditor', + 'mobile' : true + }); this.api.asc_registerCallback('asc_onAdvancedOptions', Ext.bind(this.onAdvancedOptions, this)); this.api.asc_registerCallback('asc_onOpenDocumentProgress', Ext.bind(this.onOpenDocumentProgress, this)); @@ -69,6 +102,7 @@ Ext.define('SSE.controller.Main', { }, loadConfig: function(data) { + this.editorConfig = Ext.merge(this.editorConfig, data.config); this.editorConfig.user = this._fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous); }, @@ -76,13 +110,13 @@ Ext.define('SSE.controller.Main', { if (data.doc) { this.permissions = data.doc.permissions; - var _user = new CUserInfo(); + var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.editorConfig.user.id); _user.put_FirstName(this.editorConfig.user.firstname); _user.put_LastName(this.editorConfig.user.lastname); _user.put_FullName(this.editorConfig.user.fullname); - docInfo = new CDocInfo(); + docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(data.doc.key); docInfo.put_Url(data.doc.url); docInfo.put_Title(data.doc.title); @@ -118,43 +152,43 @@ Ext.define('SSE.controller.Main', { switch (id) { - case c_oAscError.ID.Unknown: + case Asc.c_oAscError.ID.Unknown: config.message = this.unknownErrorText; break; - case c_oAscError.ID.ConvertationTimeout: + case Asc.c_oAscError.ID.ConvertationTimeout: config.message = this.convertationTimeoutText; break; - case c_oAscError.ID.ConvertationError: + case Asc.c_oAscError.ID.ConvertationError: config.message = this.convertationErrorText; break; - case c_oAscError.ID.DownloadError: + case Asc.c_oAscError.ID.DownloadError: config.message = this.downloadErrorText; break; - case c_oAscError.ID.UplImageSize: + case Asc.c_oAscError.ID.UplImageSize: config.message = this.uploadImageSizeMessage; break; - case c_oAscError.ID.UplImageExt: + case Asc.c_oAscError.ID.UplImageExt: config.message = this.uploadImageExtMessage; break; - case c_oAscError.ID.UplImageFileCount: + case Asc.c_oAscError.ID.UplImageFileCount: config.message = this.uploadImageFileCountMessage; break; - case c_oAscError.ID.VKeyEncrypt: + case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorKeyEncrypt; break; - case c_oAscError.ID.KeyExpire: + case Asc.c_oAscError.ID.KeyExpire: config.msg = this.errorKeyExpire; break; - case c_oAscError.ID.UserCountExceed: + case Asc.c_oAscError.ID.UserCountExceed: config.msg = this.errorUsersExceed; break; @@ -165,7 +199,7 @@ Ext.define('SSE.controller.Main', { - if (level == c_oAscError.Level.Critical) { + if (level == Asc.c_oAscError.Level.Critical) { // report only critical errors Common.Gateway.reportError(id, config.message); @@ -211,7 +245,7 @@ Ext.define('SSE.controller.Main', { }, onAdvancedOptions: function(advOptions) { - if (advOptions.asc_getOptionId() == c_oAscAdvancedOptionsID['CSV']){ + if (advOptions.asc_getOptionId() == Asc.c_oAscAdvancedOptionsID['CSV']){ var preloader = Ext.get('loading-mask'), me = this; @@ -255,7 +289,7 @@ Ext.define('SSE.controller.Main', { after : function(){ Ext.Viewport.remove(viewAdvOptionsCsv); if (me.api) { - me.api.asc_setAdvancedOptions(c_oAscAdvancedOptionsID['CSV'], new Asc.asc_CCSVAdvancedOptions(result.encoding, result.delimiter)); + me.api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID['CSV'], new Asc.asc_CCSVAdvancedOptions(result.encoding, result.delimiter)); } } }); @@ -281,9 +315,9 @@ Ext.define('SSE.controller.Main', { }, onLongActionEnd: function(type, id) { - if (type === c_oAscAsyncActionType['BlockInteraction']){ + if (type === Asc.c_oAscAsyncActionType['BlockInteraction']){ switch (id) { - case c_oAscAsyncAction['Open']: + case Asc.c_oAscAsyncAction['Open']: this.onOpenDocument(); break; } @@ -291,7 +325,7 @@ Ext.define('SSE.controller.Main', { }, onDownloadAs: function() { - this.api.asc_DownloadAs(c_oAscFileType.XLSX, true); + this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true); }, _hideLoadSplash: function(){ diff --git a/apps/spreadsheeteditor/mobile/app/controller/Search.js b/apps/spreadsheeteditor/mobile/app/controller/Search.js index 56b35d91c..617cad3bf 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Search.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Search.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.Search', { extend: 'Ext.app.Controller', @@ -30,19 +62,30 @@ Ext.define('SSE.controller.Search', { setApi: function(o) { this.api = o; + this.findOptions = new Asc.asc_CFindOptions(); + this.findOptions.asc_setScanForward(true); + this.findOptions.asc_setIsMatchCase(false); + this.findOptions.asc_setIsWholeCell(false); + this.findOptions.asc_setScanOnOnlySheet(true); + this.findOptions.asc_setScanByRows(true); + this.findOptions.asc_setLookIn(Asc.c_oAscFindLookIn.Formulas); }, onNextResult: function(){ var searchField = this.getSearchField(); if (this.api && searchField){ - this.api.asc_findText(searchField.getValue(), true, true); + this.findOptions.asc_setFindWhat(searchField.getValue()); + this.findOptions.asc_setScanForward(true); + this.api.asc_findText(this.findOptions); } }, onPreviousResult: function(){ var searchField = this.getSearchField(); if (this.api && searchField){ - this.api.asc_findText(searchField.getValue(), true, false); + this.findOptions.asc_setFindWhat(searchField.getValue()); + this.findOptions.asc_setScanForward(false); + this.api.asc_findText(this.findOptions); } }, @@ -51,7 +94,9 @@ Ext.define('SSE.controller.Search', { searchField = this.getSearchField(); if (keyCode == 13 && this.api) { - this.api.asc_findText(searchField.getValue(), true, true); + this.findOptions.asc_setFindWhat(searchField.getValue()); + this.findOptions.asc_setScanForward(true); + this.api.asc_findText(this.findOptions); } this.updateNavigation(); }, diff --git a/apps/spreadsheeteditor/mobile/app/controller/WorksheetList.js b/apps/spreadsheeteditor/mobile/app/controller/WorksheetList.js index 978924bd1..24532a9e6 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/WorksheetList.js +++ b/apps/spreadsheeteditor/mobile/app/controller/WorksheetList.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.WorksheetList', { extend: 'Ext.app.Controller', @@ -64,9 +96,9 @@ Ext.define('SSE.controller.WorksheetList', { }, onLongActionEnd: function(type, id) { - if (type === c_oAscAsyncActionType['BlockInteraction']){ + if (type === Asc.c_oAscAsyncActionType['BlockInteraction']){ switch (id) { - case c_oAscAsyncAction['Open']: + case Asc.c_oAscAsyncAction['Open']: this._loadWorksheets(); break; } diff --git a/apps/spreadsheeteditor/mobile/app/controller/phone/Main.js b/apps/spreadsheeteditor/mobile/app/controller/phone/Main.js index 1b535f0db..31a14ca83 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/phone/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/phone/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.phone.Main', { extend: 'SSE.controller.Main', diff --git a/apps/spreadsheeteditor/mobile/app/controller/tablet/Main.js b/apps/spreadsheeteditor/mobile/app/controller/tablet/Main.js index aef26537f..32495d4d0 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/tablet/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/tablet/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.tablet.Main', { extend: 'SSE.controller.Main', diff --git a/apps/spreadsheeteditor/mobile/app/controller/toolbar/View.js b/apps/spreadsheeteditor/mobile/app/controller/toolbar/View.js index ce5082431..a1b7ed2a9 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/toolbar/View.js +++ b/apps/spreadsheeteditor/mobile/app/controller/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.controller.toolbar.View', { extend: 'Ext.app.Controller', diff --git a/apps/spreadsheeteditor/mobile/app/model/Worksheet.js b/apps/spreadsheeteditor/mobile/app/model/Worksheet.js index f37410b7c..6d4ce9b69 100644 --- a/apps/spreadsheeteditor/mobile/app/model/Worksheet.js +++ b/apps/spreadsheeteditor/mobile/app/model/Worksheet.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.model.Worksheet', { extend: 'Ext.data.Model', config: { diff --git a/apps/spreadsheeteditor/mobile/app/profile/Phone.js b/apps/spreadsheeteditor/mobile/app/profile/Phone.js index 0e3327674..7135714bb 100644 --- a/apps/spreadsheeteditor/mobile/app/profile/Phone.js +++ b/apps/spreadsheeteditor/mobile/app/profile/Phone.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.profile.Phone', { extend: 'Ext.app.Profile', diff --git a/apps/spreadsheeteditor/mobile/app/profile/Tablet.js b/apps/spreadsheeteditor/mobile/app/profile/Tablet.js index e79f8c631..4e7815705 100644 --- a/apps/spreadsheeteditor/mobile/app/profile/Tablet.js +++ b/apps/spreadsheeteditor/mobile/app/profile/Tablet.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.profile.Tablet', { extend: 'Ext.app.Profile', diff --git a/apps/spreadsheeteditor/mobile/app/store/Worksheets.js b/apps/spreadsheeteditor/mobile/app/store/Worksheets.js index 1bf344f33..a9aedf831 100644 --- a/apps/spreadsheeteditor/mobile/app/store/Worksheets.js +++ b/apps/spreadsheeteditor/mobile/app/store/Worksheets.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.store.Worksheets', { extend: 'Ext.data.Store', config: { diff --git a/apps/spreadsheeteditor/mobile/app/view/Main.js b/apps/spreadsheeteditor/mobile/app/view/Main.js index 68ba62eeb..3a50bb09b 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Main.js +++ b/apps/spreadsheeteditor/mobile/app/view/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.Main', { extend: 'Ext.Container', alias: 'widget.semainview', diff --git a/apps/spreadsheeteditor/mobile/app/view/OpenCsvPanel.js b/apps/spreadsheeteditor/mobile/app/view/OpenCsvPanel.js index 05179684b..9cac51f60 100644 --- a/apps/spreadsheeteditor/mobile/app/view/OpenCsvPanel.js +++ b/apps/spreadsheeteditor/mobile/app/view/OpenCsvPanel.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.OpenCsvPanel', { extend: 'Ext.form.Panel', alias: 'widget.seopencsvpanel', diff --git a/apps/spreadsheeteditor/mobile/app/view/WorksheetList.js b/apps/spreadsheeteditor/mobile/app/view/WorksheetList.js index d4732c3c9..b962ab470 100644 --- a/apps/spreadsheeteditor/mobile/app/view/WorksheetList.js +++ b/apps/spreadsheeteditor/mobile/app/view/WorksheetList.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.WorksheetList', { extend: 'Ext.Container', requires: ([ diff --git a/apps/spreadsheeteditor/mobile/app/view/phone/Main.js b/apps/spreadsheeteditor/mobile/app/view/phone/Main.js index 68ffa681f..fd0cf2a95 100644 --- a/apps/spreadsheeteditor/mobile/app/view/phone/Main.js +++ b/apps/spreadsheeteditor/mobile/app/view/phone/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.phone.Main', { extend: 'SSE.view.Main', alias: 'widget.sephonemain', diff --git a/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/Search.js b/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/Search.js index 6e1303450..d9b672c34 100644 --- a/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/Search.js +++ b/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/Search.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.phone.toolbar.Search', { extend: 'Ext.Toolbar', xtype: 'searchtoolbar', diff --git a/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/View.js b/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/View.js index c4def80b9..3ca1622c1 100644 --- a/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/View.js +++ b/apps/spreadsheeteditor/mobile/app/view/phone/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.phone.toolbar.View', { extend: 'Ext.Toolbar', xtype: 'viewtoolbar', diff --git a/apps/spreadsheeteditor/mobile/app/view/tablet/Main.js b/apps/spreadsheeteditor/mobile/app/view/tablet/Main.js index efa1157c1..c95e04da6 100644 --- a/apps/spreadsheeteditor/mobile/app/view/tablet/Main.js +++ b/apps/spreadsheeteditor/mobile/app/view/tablet/Main.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.tablet.Main', { extend: 'SSE.view.Main', alias: 'widget.setabletmain', diff --git a/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/Search.js b/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/Search.js index 073d71a44..484fcf861 100644 --- a/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/Search.js +++ b/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/Search.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.tablet.toolbar.Search', { extend: 'Ext.Toolbar', xtype: 'searchtoolbar', diff --git a/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/View.js b/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/View.js index b0ab22a23..8332739a7 100644 --- a/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/View.js +++ b/apps/spreadsheeteditor/mobile/app/view/tablet/toolbar/View.js @@ -1,3 +1,35 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL 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 + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ Ext.define('SSE.view.tablet.toolbar.View', { extend: 'Ext.Toolbar', xtype: 'viewtoolbar', diff --git a/apps/spreadsheeteditor/mobile/index.html b/apps/spreadsheeteditor/mobile/index.html index eb9b9b04f..060680fd7 100644 --- a/apps/spreadsheeteditor/mobile/index.html +++ b/apps/spreadsheeteditor/mobile/index.html @@ -170,8 +170,8 @@ - - + + @@ -221,8 +221,12 @@ window.g_debug_mode = true; - - + + @@ -184,8 +184,8 @@ - - + + diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js new file mode 100644 index 000000000..ac64f7e0d --- /dev/null +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -0,0 +1,164 @@ +var sdk_dev_scrpipts = [ + "../../../../sdkjs/common/AllFonts.js", + "../../../../sdkjs/common/browser.js", + "../../../../sdkjs/common/commonDefines.js", + "../../../../sdkjs/common/downloaderfiles.js", + "../../../../sdkjs/common/docscoapicommon.js", + "../../../../sdkjs/common/docscoapi.js", + "../../../../sdkjs/common/apiCommon.js", + "../../../../sdkjs/common/SerializeCommonWordExcel.js", + "../../../../sdkjs/common/editorscommon.js", + "../../../../sdkjs/common/NumFormat.js", + "../../../../sdkjs/common/SerializeChart.js", + "../../../../sdkjs/common/AdvancedOptions.js", + "../../../../sdkjs/common/FontsFreeType/font_engine.js", + "../../../../sdkjs/common/FontsFreeType/FontFile.js", + "../../../../sdkjs/common/FontsFreeType/font_map.js", + "../../../../sdkjs/common/FontsFreeType/FontManager.js", + "../../../../sdkjs/common/Drawings/Metafile.js", + "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js", + "../../../../sdkjs/common/Drawings/WorkEvents.js", + "../../../../sdkjs/cell/model/History.js", + "../../../../sdkjs/common/Shapes/EditorSettings.js", + "../../../../sdkjs/common/Shapes/Serialize.js", + "../../../../sdkjs/common/Shapes/SerializeWriter.js", + "../../../../sdkjs/common/Drawings/Hit.js", + "../../../../sdkjs/common/Drawings/ArcTo.js", + "../../../../sdkjs/common/Drawings/ColorArray.js", + "../../../../sdkjs/common/Drawings/Format/Constants.js", + "../../../../sdkjs/common/Drawings/CommonController.js", + "../../../../sdkjs/common/Drawings/States.js", + "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", + "../../../../sdkjs/common/Drawings/Format/Geometry.js", + "../../../../sdkjs/common/Drawings/Format/Format.js", + "../../../../sdkjs/common/Drawings/Format/GraphicObjectBase.js", + "../../../../sdkjs/common/Drawings/Format/Shape.js", + "../../../../sdkjs/common/Drawings/Format/Path.js", + "../../../../sdkjs/common/Drawings/Format/Image.js", + "../../../../sdkjs/common/Drawings/Format/GroupShape.js", + "../../../../sdkjs/common/Drawings/Format/ChartSpace.js", + "../../../../sdkjs/common/Drawings/Format/ChartFormat.js", + "../../../../sdkjs/common/Drawings/Format/TextBody.js", + "../../../../sdkjs/common/Drawings/Format/GraphicFrame.js", + "../../../../sdkjs/common/Charts/charts.js", + "../../../../sdkjs/common/Charts/DrawingArea.js", + "../../../../sdkjs/common/Charts/DrawingObjects.js", + "../../../../sdkjs/common/Charts/3DTransformation.js", + "../../../../sdkjs/common/Charts/ChartsDrawer.js", + "../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js", + "../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/Spline.js", + "../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js", + "../../../../sdkjs/common/Drawings/TextDrawer.js", + "../../../../sdkjs/common/Drawings/Externals.js", + "../../../../sdkjs/common/GlobalLoaders.js", + "../../../../sdkjs/common/CollaborativeEditingBase.js", + "../../../../sdkjs/common/Controls.js", + "../../../../sdkjs/common/Overlay.js", + "../../../../sdkjs/common/Drawings/HatchPattern.js", + "../../../../sdkjs/common/scroll.js", + "../../../../sdkjs/cell/view/iscroll.js", + "../../../../sdkjs/common/wordcopypaste.js", + "../../../../sdkjs/cell/apiDefines.js", + "../../../../sdkjs/cell/document/empty-workbook.js", + "../../../../sdkjs/cell/utils/utils.js", + "../../../../sdkjs/cell/model/UndoRedo.js", + "../../../../sdkjs/cell/model/clipboard.js", + "../../../../sdkjs/cell/model/autofilters.js", + "../../../../sdkjs/cell/graphics/DrawingContext.js", + "../../../../sdkjs/cell/graphics/pdfprinter.js", + "../../../../sdkjs/cell/model/CollaborativeEditing.js", + "../../../../sdkjs/cell/model/ConditionalFormatting.js", + "../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js", + "../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js", + "../../../../sdkjs/cell/model/CellComment.js", + "../../../../sdkjs/cell/model/WorkbookElems.js", + "../../../../sdkjs/cell/model/Workbook.js", + "../../../../sdkjs/cell/model/Serialize.js", + "../../../../sdkjs/cell/model/CellInfo.js", + "../../../../sdkjs/cell/view/mobileTouch.js", + "../../../../sdkjs/cell/view/DrawingObjectsController.js", + "../../../../sdkjs/cell/view/StringRender.js", + "../../../../sdkjs/cell/view/CellTextRender.js", + "../../../../sdkjs/cell/view/CellEditorView.js", + "../../../../sdkjs/cell/view/HandlerList.js", + "../../../../sdkjs/cell/view/EventsController.js", + "../../../../sdkjs/cell/view/WorkbookView.js", + "../../../../sdkjs/cell/view/WorksheetView.js", + "../../../../sdkjs/cell/model/DrawingObjects/Graphics.js", + "../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js", + "../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js", + "../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js", + "../../../../sdkjs/cell/model/DrawingObjects/Format/ShapePrototype.js", + "../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js", + "../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js", + "../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.js", + "../../../../sdkjs/common/apiBase.js", + "../../../../sdkjs/cell/api.js", + "../../../../sdkjs/common/Private/license.js", + "../../../../sdkjs/cell/Private/comments.js", + "../../../../sdkjs/word/Editor/Common.js", + "../../../../sdkjs/word/Editor/Comments.js", + "../../../../sdkjs/word/Editor/Styles.js", + "../../../../sdkjs/word/Editor/ParagraphContent.js", + "../../../../sdkjs/word/Editor/Paragraph.js", + "../../../../sdkjs/word/Editor/DocumentContentBase.js", + "../../../../sdkjs/word/Editor/Document.js", + "../../../../sdkjs/word/Editor/DocumentContent.js", + "../../../../sdkjs/word/Editor/DocumentControllerBase.js", + "../../../../sdkjs/word/Editor/FlowObjects.js", + "../../../../sdkjs/word/Editor/ParagraphContentBase.js", + "../../../../sdkjs/word/Editor/Hyperlink.js", + "../../../../sdkjs/word/Editor/Field.js", + "../../../../sdkjs/word/Editor/Run.js", + "../../../../sdkjs/word/Editor/Math.js", + "../../../../sdkjs/word/Editor/Paragraph_Recalculate.js", + "../../../../sdkjs/word/Editor/Sections.js", + "../../../../sdkjs/word/Editor/Numbering.js", + "../../../../sdkjs/word/Editor/HeaderFooter.js", + "../../../../sdkjs/word/Editor/Table.js", + "../../../../sdkjs/word/Editor/Table/TableRecalculate.js", + "../../../../sdkjs/word/Editor/Table/TableDraw.js", + "../../../../sdkjs/word/Editor/Table/TableRow.js", + "../../../../sdkjs/word/Editor/Table/TableCell.js", + "../../../../sdkjs/word/Editor/Serialize2.js", + "../../../../sdkjs/word/Editor/FontClassification.js", + "../../../../sdkjs/word/Editor/Spelling.js", + "../../../../sdkjs/word/Editor/Footnotes.js", + "../../../../sdkjs/word/Editor/FootEndNote.js", + "../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js", + "../../../../sdkjs/word/Math/mathTypes.js", + "../../../../sdkjs/word/Math/mathText.js", + "../../../../sdkjs/word/Math/mathContent.js", + "../../../../sdkjs/word/Math/base.js", + "../../../../sdkjs/word/Math/fraction.js", + "../../../../sdkjs/word/Math/degree.js", + "../../../../sdkjs/word/Math/matrix.js", + "../../../../sdkjs/word/Math/limit.js", + "../../../../sdkjs/word/Math/nary.js", + "../../../../sdkjs/word/Math/radical.js", + "../../../../sdkjs/word/Math/operators.js", + "../../../../sdkjs/word/Math/accent.js", + "../../../../sdkjs/word/Math/borderBox.js", + "../../../../sdkjs/word/apiCommon.js", + "../../../../sdkjs/common/applyDocumentChanges.js", + "../../../../sdkjs/cell/apiBuilder.js", + "../../../../sdkjs/common/Drawings/Format/OleObject.js", + "../../../../sdkjs/common/clipboard_base.js", + "../../../../sdkjs/common/plugins.js" +]; \ No newline at end of file diff --git a/build/Gruntfile.js b/build/Gruntfile.js index a21240cd6..1f680c020 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -1,9 +1,7 @@ module.exports = function(grunt) { var _ = require('lodash'), defaultConfig, - packageFile, - revisionHash = '@@REVISION', - revisionTimeStamp = '@@REVISIONDATE'; + packageFile; grunt.loadNpmTasks('grunt-contrib-clean'); @@ -55,43 +53,6 @@ module.exports = function(grunt) { }); } - grunt.registerTask('init-config', 'Initialize build script', function() { - var exec = require('child_process').exec, - done = this.async(), - commandsRef = 0; - - function doneTask() { - if (--commandsRef <= 0) { - done(true); - } - } - - function doCommand(command, callback) { - commandsRef++; - exec(command, callback); - } - - doCommand('hg log -r -1 --template "{node|short}"', function(error, stdout, stderr) { - if (error) { - grunt.log.writeln('Error: ' + error); - } else { - revisionHash = stdout; - } - - doneTask(); - }); - - doCommand('hg log -r -1 --template "{date|isodate}"', function(error, stdout, stderr) { - if (error) { - grunt.log.writeln('Error: ' + error); - } else { - revisionTimeStamp = stdout; - } - - doneTask(); - }); - }); - grunt.initConfig({ mocha: { test: { @@ -212,7 +173,7 @@ module.exports = function(grunt) { ' *\n' + ' * <%= pkg.homepage %> \n' + ' *\n' + - ' * Version: <%= pkg.version %> (build:<%= pkg.build %>, rev:' + revisionHash + ', date:' + revisionTimeStamp + ')\n' + + ' * Version: ' + process.env['PRODUCT_VERSION'] + ' (build:' + process.env['BUILD_NUMBER'] + ')\n' + ' */\n' }, dist: { @@ -444,9 +405,9 @@ module.exports = function(grunt) { } }); - grunt.registerTask('deploy-documenteditor', ['init-build-documenteditor', 'init-config', 'deploy-app']); - grunt.registerTask('deploy-spreadsheeteditor', ['init-build-spreadsheeteditor', 'init-config', 'deploy-app']); - grunt.registerTask('deploy-presentationeditor', ['init-build-presentationeditor', 'init-config', 'deploy-app']); + grunt.registerTask('deploy-documenteditor', ['init-build-documenteditor', 'deploy-app']); + grunt.registerTask('deploy-spreadsheeteditor', ['init-build-spreadsheeteditor', 'deploy-app']); + grunt.registerTask('deploy-presentationeditor', ['init-build-presentationeditor', 'deploy-app']); grunt.registerTask('default', ['deploy-documenteditor', 'deploy-spreadsheeteditor', 'deploy-presentationeditor']); }; \ No newline at end of file diff --git a/build/documenteditor.json b/build/documenteditor.json index cecd79718..dda5f5306 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -1,36 +1,30 @@ { "name": "documenteditor", - "version": "3.6.0", - "build": 1046, + "version": "4.6.0", + "build": 1064, "homepage": "http://www.onlyoffice.com", "private": true, "sdk": { "clean": [ - "../deploy/sdk/Common", - "../deploy/sdk/Word" + "../deploy/sdkjs/common", + "../deploy/sdkjs/word" ], "copy": { "script": { "files": [ { "expand": true, - "cwd": "../sdk/Common/", + "cwd": "../../sdkjs/common/", "src": [ - "Images/**", - "Native/**", - "AllFonts.js" + "Images/*.cur", + "Native/*.js" ], - "dest": "../deploy/sdk/Common/" + "dest": "../deploy/sdkjs/common/" }, { "expand": true, - "cwd": "../sdk/Fonts/", - "src": "**/**", - "dest": "../deploy/sdk/Fonts/" - }, - { - "src": "../sdk/Word/sdk-all.js", - "dest": "../deploy/sdk/Word/sdk-all.js" + "src": "../../sdkjs/word/sdk-*.js", + "dest": "../deploy/sdkjs/word/" } ] } @@ -38,26 +32,30 @@ }, "api": { "clean": [ - "../deploy/apps/api" + "../deploy/web-apps/apps/api" ], "copy": { "script": { "expand": true, "cwd": "../apps/api/", - "src": "**", - "dest": "../deploy/apps/api/" + "src": [ + "**", + "!**/*.html", + "!**/*.desktop" + ], + "dest": "../deploy/web-apps/apps/api/" } } }, "main": { "clean": [ - "../deploy/apps/documenteditor/main" + "../deploy/web-apps/apps/documenteditor/main" ], "js": { "requirejs": { "options": { "name": "../apps/documenteditor/main/app.js", - "out": "../deploy/apps/documenteditor/main/app.js", + "out": "../deploy/web-apps/apps/documenteditor/main/app.js", "baseUrl": "../apps/", "inlineText": true, "findNestedDependencies": true, @@ -152,7 +150,7 @@ "embedImages": true, "files": { "src": "../apps/documenteditor/main/resources/less/app.less", - "dest": "../deploy/apps/documenteditor/main/resources/css/app.css" + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/css/app.css" }, "replacements": [ { @@ -173,7 +171,7 @@ "src": [ "**/*.{png,jpg,gif}" ], - "dest": "../deploy/apps/documenteditor/main/resources/img/" + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/" } ], "images-common": [ @@ -183,7 +181,7 @@ "src": [ "**/*.{png,jpg,gif}" ], - "dest": "../deploy/apps/documenteditor/main/resources/img/" + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/" } ] }, @@ -193,7 +191,7 @@ "expand": true, "cwd": "../apps/documenteditor/main/locale/", "src": "*", - "dest": "../deploy/apps/documenteditor/main/locale/" + "dest": "../deploy/web-apps/apps/documenteditor/main/locale/" } ], "help": [ @@ -201,26 +199,26 @@ "expand": true, "cwd": "../apps/documenteditor/main/resources/help/en/", "src": "**", - "dest": "../deploy/apps/documenteditor/main/resources/help/en/" + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/en/" }, { "expand": true, "cwd": "../apps/documenteditor/main/resources/help/ru/", "src": "**", - "dest": "../deploy/apps/documenteditor/main/resources/help/ru/" + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/ru/" } ], "index-page": [ { "src": "../apps/documenteditor/main/index.html.deploy", - "dest": "../deploy/apps/documenteditor/main/index.html" + "dest": "../deploy/web-apps/apps/documenteditor/main/index.html" } ] } }, "mobile": { "clean": [ - "../deploy/apps/documenteditor/mobile" + "../deploy/web-apps/apps/documenteditor/mobile" ], "js": { "src": [ @@ -270,32 +268,32 @@ "../apps/common/locale.js", "../apps/documenteditor/mobile/app.js" ], - "dist": "../deploy/apps/documenteditor/mobile/app-all.js" + "dist": "../deploy/web-apps/apps/documenteditor/mobile/app-all.js" }, "css": { "normal": { "src": [ "../apps/documenteditor/mobile/resources/css/application-normal.css" ], - "dist": "../deploy/apps/documenteditor/mobile/resources/css/application-normal.css" + "dist": "../deploy/web-apps/apps/documenteditor/mobile/resources/css/application-normal.css" }, "retina": { "src": [ "../apps/documenteditor/mobile/resources/css/application-retina.css" ], - "dist": "../deploy/apps/documenteditor/mobile/resources/css/application-retina.css" + "dist": "../deploy/web-apps/apps/documenteditor/mobile/resources/css/application-retina.css" } }, "copy": { "index-page": { - "../deploy/apps/documenteditor/mobile/index.html": "../apps/documenteditor/mobile/index.html.deploy" + "../deploy/web-apps/apps/documenteditor/mobile/index.html": "../apps/documenteditor/mobile/index.html.deploy" }, "localization": [ { "expand": true, "cwd": "../apps/documenteditor/mobile/locale/", "src": "*", - "dest": "../deploy/apps/documenteditor/mobile/locale/" + "dest": "../deploy/web-apps/apps/documenteditor/mobile/locale/" } ], "images-app": [ @@ -303,14 +301,14 @@ "expand": true, "cwd": "../apps/documenteditor/mobile/resources/img/", "src": "**", - "dest": "../deploy/apps/documenteditor/mobile/resources/img/" + "dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/" } ] } }, "embed": { "clean": [ - "../deploy/apps/documenteditor/embed" + "../deploy/web-apps/apps/documenteditor/embed" ], "js": { "src": [ @@ -320,12 +318,12 @@ "../apps/documenteditor/embed/js/ApplicationController.js", "../apps/documenteditor/embed/js/application.js" ], - "dist": "../deploy/apps/documenteditor/embed/app-all.js" + "dist": "../deploy/web-apps/apps/documenteditor/embed/app-all.js" }, "less": { "files": { "src": "../apps/documenteditor/embed/resources/less/application.less", - "dist": "../deploy/apps/documenteditor/embed/resources/css/app-all.css" + "dist": "../deploy/web-apps/apps/documenteditor/embed/resources/css/app-all.css" }, "replacements": [ { @@ -336,64 +334,64 @@ }, "copy": { "index-page": { - "../deploy/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy" + "../deploy/web-apps/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy" }, "images-app": [ { "expand": true, "cwd": "../apps/common/embed/resources/img/", "src": "**", - "dest": "../deploy/apps/documenteditor/embed/resources/img/" + "dest": "../deploy/web-apps/apps/documenteditor/embed/resources/img/" } ] } }, "touch": { "clean": [ - "../deploy/vendor/touch" + "../deploy/web-apps/vendor/touch" ], "copy": { "script": { "src": "../vendor/touch/sencha-touch-all.js", - "dest": "../deploy/vendor/touch/sencha-touch-all.js" + "dest": "../deploy/web-apps/vendor/touch/sencha-touch-all.js" } } }, "bootstrap": { "clean": [ - "../deploy/vendor/bootstrap" + "../deploy/web-apps/vendor/bootstrap" ], "copy": { "script": { "src": "../vendor/bootstrap/dist/js/bootstrap.min.js", - "dest": "../deploy/vendor/bootstrap/dist/js/bootstrap.min.js" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js" }, "font": { "expand": true, "cwd": "../vendor/bootstrap/dist/fonts/", "src": "*", - "dest": "../deploy/vendor/bootstrap/dist/fonts/" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/" }, "css": { "src": "../vendor/bootstrap/dist/css/bootstrap.min.css", - "dest": "../deploy/vendor/bootstrap/dist/css/bootstrap.min.css" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css" } } }, "jquery": { "clean": [ - "../deploy/vendor/jquery" + "../deploy/web-apps/vendor/jquery" ], "copy": { "script": { "files": [ { "src": "../vendor/jquery/jquery.min.js", - "dest": "../deploy/vendor/jquery/jquery.min.js" + "dest": "../deploy/web-apps/vendor/jquery/jquery.min.js" }, { "src": "../vendor/jquery.browser/dist/jquery.browser.min.js", - "dest": "../deploy/vendor/jquery/jquery.browser.min.js" + "dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js" } ] } @@ -401,93 +399,93 @@ }, "megapixel": { "clean": [ - "../deploy/vendor/megapixel" + "../deploy/web-apps/vendor/megapixel" ], "copy": { "script": { "src": "../vendor/megapixel/megapix-image-min.js", - "dest": "../deploy/vendor/megapixel/megapix-image-min.js" + "dest": "../deploy/web-apps/vendor/megapixel/megapix-image-min.js" } } }, "sockjs": { "clean": [ - "../deploy/vendor/sockjs" + "../deploy/web-apps/vendor/sockjs" ], "copy": { "script": { "src": "../vendor/sockjs/sockjs.min.js", - "dest": "../deploy/vendor/sockjs/sockjs.min.js" + "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js" } } }, "xregexp": { "clean": [ - "../deploy/vendor/xregexp" + "../deploy/web-apps/vendor/xregexp" ], "copy": { "script": { "src": "../vendor/xregexp/xregexp-all-min.js", - "dest": "../deploy/vendor/xregexp/xregexp-all-min.js" + "dest": "../deploy/web-apps/vendor/xregexp/xregexp-all-min.js" } } }, "jszip": { "clean": [ - "../deploy/vendor/jszip" + "../deploy/web-apps/vendor/jszip" ], "copy": { "script": { "src": "../vendor/jszip/jszip.min.js", - "dest": "../deploy/vendor/jszip/jszip.min.js" + "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js" } } }, "jsziputils": { "clean": [ - "../deploy/vendor/jszip-utils" + "../deploy/web-apps/vendor/jszip-utils" ], "copy": { "script": { "src": "../vendor/jszip-utils/jszip-utils.min.js", - "dest": "../deploy/vendor/jszip-utils/jszip-utils.min.js" + "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js" } } }, "jsrsasign": { "clean": [ - "../deploy/vendor/jsrsasign" + "../deploy/web-apps/vendor/jsrsasign" ], "copy": { "script": { "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", - "dest": "../deploy/vendor/jsrsasign/jsrsasign-latest-all-min.js" + "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js" } } }, "underscore": { "clean": [ - "../deploy/vendor/underscore" + "../deploy/web-apps/vendor/underscore" ], "copy": { "script": { "src": "../vendor/underscore/underscore-min.js", - "dest": "../deploy/vendor/underscore/underscore-min.js" + "dest": "../deploy/web-apps/vendor/underscore/underscore-min.js" } } }, "requirejs": { "clean": [ - "../deploy/vendor/requirejs" + "../deploy/web-apps/vendor/requirejs" ], "min": { "src": "../vendor/requirejs/require.js", - "dest": "../deploy/vendor/requirejs/require.js" + "dest": "../deploy/web-apps/vendor/requirejs/require.js" } }, "zeroclipboard": { "clean": [ - "../deploy/vendor/ZeroClipboard" + "../deploy/web-apps/vendor/ZeroClipboard" ], "copy": { "script": { @@ -496,33 +494,33 @@ "src": [ "**" ], - "dest": "../deploy/vendor/ZeroClipboard/" + "dest": "../deploy/web-apps/vendor/ZeroClipboard/" } } }, "obf_api": { - "ccvars": "../sdk/Word/variable.map", - "ccprops": "../sdk/Word/property.map", - "api": "../sdk/Word/apiExport.js", + "ccvars": "../../sdkjs/word/variable.map", + "ccprops": "../../sdkjs/word/property.map", + "api": "../../sdkjs/word/apiExport.js", "clientjs": [ - "../deploy/apps/documenteditor/main/app-edit.js", - "../deploy/apps/documenteditor/main/app-view.js", - "../deploy/apps/documenteditor/mobile/app-all.js", - "../deploy/apps/documenteditor/embed/app-all.js", - "../deploy/apps/api/documents/cache-scripts.html" + "../deploy/web-apps/apps/documenteditor/main/app-edit.js", + "../deploy/web-apps/apps/documenteditor/main/app-view.js", + "../deploy/web-apps/apps/documenteditor/mobile/app-all.js", + "../deploy/web-apps/apps/documenteditor/embed/app-all.js", + "../deploy/web-apps/apps/api/documents/cache-scripts.html" ], - "ccres": "../deploy/sdk/Word/sdk-all.js" + "ccres": "../deploy/sdkjs/word/sdk-all.js" }, "obf": { - "api": "../deploy/sdk/Word/sdk-all.js", + "api": "../deploy/sdkjs/word/sdk-all.js", "pat": "asc_\\w+", "keys": "-exp se -use-for-name", "apply": [ - "../deploy/sdk/Word/sdk-all.js", - "../deploy/apps/documenteditor/main/app-edit.js", - "../deploy/apps/documenteditor/main/app-view.js", - "../deploy/apps/documenteditor/mobile/app-all.js", - "../deploy/apps/documenteditor/embed/app-all.js" + "../deploy/sdkjs/word/sdk-all.js", + "../deploy/web-apps/apps/documenteditor/main/app-edit.js", + "../deploy/web-apps/apps/documenteditor/main/app-view.js", + "../deploy/web-apps/apps/documenteditor/mobile/app-all.js", + "../deploy/web-apps/apps/documenteditor/embed/app-all.js" ] }, "tasks": { diff --git a/build/package.json b/build/package.json index b14195330..003fbbd8d 100644 --- a/build/package.json +++ b/build/package.json @@ -4,9 +4,8 @@ "homepage": "http://www.onlyoffice.com", "private": true, "dependencies": { - "lodash": "3.0.0", + "lodash": "^4.0.0", "grunt": "0.4.5", - "grunt-exec": "0.4.5", "grunt-replace": "0.7.3", "grunt-html-minify": "0.3.1", "grunt-text-replace": "0.3.11", diff --git a/build/presentationeditor.json b/build/presentationeditor.json index ce54b1e33..94d5c4661 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -1,42 +1,35 @@ { "name": "presentationeditor", - "version": "3.6.0", - "build": 759, + "version": "4.6.0", + "build": 771, "homepage": "http://www.onlyoffice.com", "sdk": { "clean": [ - "../deploy/sdk/Common", - "../deploy/sdk/PowerPoint", - "../deploy/sdk/Fonts" + "../deploy/sdkjs/common", + "../deploy/sdkjs/slide" ], "copy": { "script": { "files": [ { "expand": true, - "cwd": "../sdk/Common/", + "cwd": "../../sdkjs/common/", "src": [ - "Images/**", - "Native/**", - "AllFonts.js" + "Images/*.cur", + "Native/*.js" ], - "dest": "../deploy/sdk/Common/" + "dest": "../deploy/sdkjs/common/" }, { "expand": true, - "cwd": "../sdk/Fonts/", + "cwd": "../../sdkjs/slide/themes/", "src": "**/**", - "dest": "../deploy/sdk/Fonts/" + "dest": "../deploy/sdkjs/slide/themes/" }, { "expand": true, - "cwd": "../sdk/PowerPoint/themes/", - "src": "**/**", - "dest": "../deploy/sdk/PowerPoint/themes/" - }, - { - "src": "../sdk/PowerPoint/sdk-all.js", - "dest": "../deploy/sdk/PowerPoint/sdk-all.js" + "src": "../../sdkjs/slide/sdk-*.js", + "dest": "../deploy/sdkjs/slide/" } ] } @@ -44,26 +37,29 @@ }, "api": { "clean": [ - "../deploy/apps/api" + "../deploy/web-apps/apps/api" ], "copy": { "script": { "expand": true, "cwd": "../apps/api/", - "src": "**", - "dest": "../deploy/apps/api/" + "src": [ + "**", + "!**/*.desktop" + ], + "dest": "../deploy/web-apps/apps/api/" } } }, "main": { "clean": [ - "../deploy/apps/presentationeditor/main" + "../deploy/web-apps/apps/presentationeditor/main" ], "js": { "requirejs": { "options": { "name": "../apps/presentationeditor/main/app.js", - "out": "../deploy/apps/presentationeditor/main/app.js", + "out": "../deploy/web-apps/apps/presentationeditor/main/app.js", "baseUrl": "../apps/", "inlineText": true, "findNestedDependencies": true, @@ -158,7 +154,7 @@ "embedImages": true, "files": { "src": "../apps/presentationeditor/main/resources/less/app.less", - "dest": "../deploy/apps/presentationeditor/main/resources/css/app.css" + "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/css/app.css" }, "replacements": [ { @@ -179,25 +175,17 @@ "src": [ "**/*.{png,jpg,gif}" ], - "dest": "../deploy/apps/presentationeditor/main/resources/img/" + "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/" } ], "images-common": [ - { - "expand": true, - "cwd": "../sdk/PowerPoint/Images/", - "src": [ - "**/*.cur" - ], - "dest": "../deploy/apps/presentationeditor/main/Images/" - }, { "expand": true, "cwd": "../apps/common/main/resources/img/", "src": [ "**/*.{png,jpg,gif}" ], - "dest": "../deploy/apps/presentationeditor/main/resources/img/" + "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/" } ] }, @@ -207,7 +195,7 @@ "expand": true, "cwd": "../apps/presentationeditor/main/locale/", "src": "*", - "dest": "../deploy/apps/presentationeditor/main/locale/" + "dest": "../deploy/web-apps/apps/presentationeditor/main/locale/" } ], "help": [ @@ -215,26 +203,26 @@ "expand": true, "cwd": "../apps/presentationeditor/main/resources/help/en/", "src": "**", - "dest": "../deploy/apps/presentationeditor/main/resources/help/en/" + "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/en/" }, { "expand": true, "cwd": "../apps/presentationeditor/main/resources/help/ru/", "src": "**", - "dest": "../deploy/apps/presentationeditor/main/resources/help/ru/" + "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/ru/" } ], "index-page": [ { "src": "../apps/presentationeditor/main/index.html.deploy", - "dest": "../deploy/apps/presentationeditor/main/index.html" + "dest": "../deploy/web-apps/apps/presentationeditor/main/index.html" } ] } }, "mobile": { "clean": [ - "../deploy/apps/presentationeditor/mobile" + "../deploy/web-apps/apps/presentationeditor/mobile" ], "js": { "src": [ @@ -256,32 +244,32 @@ "../apps/common/locale.js", "../apps/presentationeditor/mobile/app.js" ], - "dist": "../deploy/apps/presentationeditor/mobile/app-all.js" + "dist": "../deploy/web-apps/apps/presentationeditor/mobile/app-all.js" }, "css": { "normal": { "src": [ "../apps/presentationeditor/mobile/resources/css/application-normal.css" ], - "dist": "../deploy/apps/presentationeditor/mobile/resources/css/application-normal.css" + "dist": "../deploy/web-apps/apps/presentationeditor/mobile/resources/css/application-normal.css" }, "retina": { "src": [ "../apps/presentationeditor/mobile/resources/css/application-retina.css" ], - "dist": "../deploy/apps/presentationeditor/mobile/resources/css/application-retina.css" + "dist": "../deploy/web-apps/apps/presentationeditor/mobile/resources/css/application-retina.css" } }, "copy": { "index-page": { - "../deploy/apps/presentationeditor/mobile/index.html": "../apps/presentationeditor/mobile/index.html.deploy" + "../deploy/web-apps/apps/presentationeditor/mobile/index.html": "../apps/presentationeditor/mobile/index.html.deploy" }, "localization": [ { "expand": true, "cwd": "../apps/presentationeditor/mobile/locale/", "src": "*", - "dest": "../deploy/apps/presentationeditor/mobile/locale/" + "dest": "../deploy/web-apps/apps/presentationeditor/mobile/locale/" } ], "images-app": [ @@ -289,14 +277,14 @@ "expand": true, "cwd": "../apps/presentationeditor/mobile/resources/img/", "src": "**", - "dest": "../deploy/apps/presentationeditor/mobile/resources/img/" + "dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/" } ] } }, "embed": { "clean": [ - "../deploy/apps/presentationeditor/embed" + "../deploy/web-apps/apps/presentationeditor/embed" ], "js": { "src": [ @@ -306,12 +294,12 @@ "../apps/presentationeditor/embed/js/ApplicationController.js", "../apps/presentationeditor/embed/js/application.js" ], - "dist": "../deploy/apps/presentationeditor/embed/app-all.js" + "dist": "../deploy/web-apps/apps/presentationeditor/embed/app-all.js" }, "less": { "files": { "src": "../apps/presentationeditor/embed/resources/less/application.less", - "dist": "../deploy/apps/presentationeditor/embed/resources/css/app-all.css" + "dist": "../deploy/web-apps/apps/presentationeditor/embed/resources/css/app-all.css" }, "replacements": [ { @@ -322,64 +310,64 @@ }, "copy": { "index-page": { - "../deploy/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy" + "../deploy/web-apps/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy" }, "images-app": [ { "expand": true, "cwd": "../apps/common/embed/resources/img/", "src": "**", - "dest": "../deploy/apps/presentationeditor/embed/resources/img/" + "dest": "../deploy/web-apps/apps/presentationeditor/embed/resources/img/" } ] } }, "touch": { "clean": [ - "../deploy/vendor/touch" + "../deploy/web-apps/vendor/touch" ], "copy": { "script": { "src": "../vendor/touch/sencha-touch-all.js", - "dest": "../deploy/vendor/touch/sencha-touch-all.js" + "dest": "../deploy/web-apps/vendor/touch/sencha-touch-all.js" } } }, "bootstrap": { "clean": [ - "../deploy/vendor/bootstrap" + "../deploy/web-apps/vendor/bootstrap" ], "copy": { "script": { "src": "../vendor/bootstrap/dist/js/bootstrap.min.js", - "dest": "../deploy/vendor/bootstrap/dist/js/bootstrap.min.js" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js" }, "font": { "expand": true, "cwd": "../vendor/bootstrap/dist/fonts/", "src": "*", - "dest": "../deploy/vendor/bootstrap/dist/fonts/" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/" }, "css": { "src": "../vendor/bootstrap/dist/css/bootstrap.min.css", - "dest": "../deploy/vendor/bootstrap/dist/css/bootstrap.min.css" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css" } } }, "jquery": { "clean": [ - "../deploy/vendor/jquery" + "../deploy/web-apps/vendor/jquery" ], "copy": { "script": { "files": [ { "src": "../vendor/jquery/jquery.min.js", - "dest": "../deploy/vendor/jquery/jquery.min.js" + "dest": "../deploy/web-apps/vendor/jquery/jquery.min.js" }, { "src": "../vendor/jquery.browser/dist/jquery.browser.min.js", - "dest": "../deploy/vendor/jquery/jquery.browser.min.js" + "dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js" } ] } @@ -387,93 +375,93 @@ }, "megapixel": { "clean": [ - "../deploy/vendor/megapixel" + "../deploy/web-apps/vendor/megapixel" ], "copy": { "script": { "src": "../vendor/megapixel/megapix-image-min.js", - "dest": "../deploy/vendor/megapixel/megapix-image-min.js" + "dest": "../deploy/web-apps/vendor/megapixel/megapix-image-min.js" } } }, "sockjs": { "clean": [ - "../deploy/vendor/sockjs" + "../deploy/web-apps/vendor/sockjs" ], "copy": { "script": { "src": "../vendor/sockjs/sockjs.min.js", - "dest": "../deploy/vendor/sockjs/sockjs.min.js" + "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js" } } }, "xregexp": { "clean": [ - "../deploy/vendor/xregexp" + "../deploy/web-apps/vendor/xregexp" ], "copy": { "script": { "src": "../vendor/xregexp/xregexp-all-min.js", - "dest": "../deploy/vendor/xregexp/xregexp-all-min.js" + "dest": "../deploy/web-apps/vendor/xregexp/xregexp-all-min.js" } } }, "jszip": { "clean": [ - "../deploy/vendor/jszip" + "../deploy/web-apps/vendor/jszip" ], "copy": { "script": { "src": "../vendor/jszip/jszip.min.js", - "dest": "../deploy/vendor/jszip/jszip.min.js" + "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js" } } }, "jsziputils": { "clean": [ - "../deploy/vendor/jszip-utils" + "../deploy/web-apps/vendor/jszip-utils" ], "copy": { "script": { "src": "../vendor/jszip-utils/jszip-utils.min.js", - "dest": "../deploy/vendor/jszip-utils/jszip-utils.min.js" + "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js" } } }, "jsrsasign": { "clean": [ - "../deploy/vendor/jsrsasign" + "../deploy/web-apps/vendor/jsrsasign" ], "copy": { "script": { "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", - "dest": "../deploy/vendor/jsrsasign/jsrsasign-latest-all-min.js" + "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js" } } }, "underscore": { "clean": [ - "../deploy/vendor/underscore" + "../deploy/web-apps/vendor/underscore" ], "copy": { "script": { "src": "../vendor/underscore/underscore-min.js", - "dest": "../deploy/vendor/underscore/underscore-min.js" + "dest": "../deploy/web-apps/vendor/underscore/underscore-min.js" } } }, "requirejs": { "clean": [ - "../deploy/vendor/requirejs" + "../deploy/web-apps/vendor/requirejs" ], "min": { "src": "../vendor/requirejs/require.js", - "dest": "../deploy/vendor/requirejs/require.js" + "dest": "../deploy/web-apps/vendor/requirejs/require.js" } }, "zeroclipboard": { "clean": [ - "../deploy/vendor/ZeroClipboard" + "../deploy/web-apps/vendor/ZeroClipboard" ], "copy": { "script": { @@ -482,32 +470,32 @@ "src": [ "**" ], - "dest": "../deploy/vendor/ZeroClipboard/" + "dest": "../deploy/web-apps/vendor/ZeroClipboard/" } } }, "obf_api": { - "ccvars": "../sdk/PowerPoint/variable.map", - "ccprops": "../sdk/PowerPoint/property.map", - "api": "../sdk/PowerPoint/apiExport.js", + "ccvars": "../../sdkjs/slide/variable.map", + "ccprops": "../../sdkjs/slide/property.map", + "api": "../../sdkjs/slide/apiExport.js", "clientjs": [ - "../deploy/apps/presentationeditor/main/app-edit.js", - "../deploy/apps/presentationeditor/main/app-view.js", - "../deploy/apps/presentationeditor/mobile/app-all.js", - "../deploy/apps/presentationeditor/embed/app-all.js" + "../deploy/web-apps/apps/presentationeditor/main/app-edit.js", + "../deploy/web-apps/apps/presentationeditor/main/app-view.js", + "../deploy/web-apps/apps/presentationeditor/mobile/app-all.js", + "../deploy/web-apps/apps/presentationeditor/embed/app-all.js" ], - "ccres": "../deploy/sdk/PowerPoint/sdk-all.js" + "ccres": "../deploy/sdkjs/slide/sdk-all.js" }, "obf": { - "api": "../deploy/sdk/PowerPoint/sdk-all.js", + "api": "../deploy/sdkjs/slide/sdk-all.js", "pat": "asc_\\w+", "keys": "-exp se -use-for-name", "apply": [ - "../deploy/sdk/PowerPoint/sdk-all.js", - "../deploy/apps/presentationeditor/main/app-edit.js", - "../deploy/apps/presentationeditor/main/app-view.js", - "../deploy/apps/presentationeditor/mobile/app-all.js", - "../deploy/apps/presentationeditor/embed/app-all.js" + "../deploy/sdkjs/slide/sdk-all.js", + "../deploy/web-apps/apps/presentationeditor/main/app-edit.js", + "../deploy/web-apps/apps/presentationeditor/main/app-view.js", + "../deploy/web-apps/apps/presentationeditor/mobile/app-all.js", + "../deploy/web-apps/apps/presentationeditor/embed/app-all.js" ] }, "tasks": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 1080d812a..971496fe4 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -1,49 +1,42 @@ { "name": "spreadsheeteditor", - "version": "3.6.0", - "build": 857, + "version": "4.6.0", + "build": 874, "homepage": "http://www.onlyoffice.com", "private": true, "sdk": { "clean": [ - "../deploy/sdk/Common", - "../deploy/sdk/Excel", - "../deploy/sdk/Fonts" + "../deploy/sdkjs/common", + "../deploy/sdkjs/cell" ], "copy": { "script": { "files": [ { "expand": true, - "cwd": "../sdk/Common/", + "cwd": "../../sdkjs/common/", "src": [ - "Images/**", - "Native/**", - "AllFonts.js" + "Images/*.cur", + "Native/*.js" ], - "dest": "../deploy/sdk/Common/" + "dest": "../deploy/sdkjs/common/" }, { "expand": true, - "cwd": "../sdk/Excel/css/", + "cwd": "../../sdkjs/cell/css/", "src": "*.css", - "dest": "../deploy/sdk/Excel/css/" + "dest": "../deploy/sdkjs/cell/css/" }, { "expand": true, - "cwd": "../sdk/Word/Images/", + "cwd": "../../sdkjs/word/Images/", "src": "*.cur", - "dest": "../deploy/sdk/Word/Images/" + "dest": "../deploy/sdkjs/word/Images/" }, { "expand": true, - "cwd": "../sdk/Fonts/", - "src": "**/**", - "dest": "../deploy/sdk/Fonts/" - }, - { - "src": "../sdk/Excel/sdk-all.js", - "dest": "../deploy/sdk/Excel/sdk-all.js" + "src": "../../sdkjs/cell/sdk-*.js", + "dest": "../deploy/sdkjs/cell/" } ] } @@ -51,26 +44,29 @@ }, "api": { "clean": [ - "../deploy/apps/api" + "../deploy/web-apps/apps/api" ], "copy": { "script": { "expand": true, "cwd": "../apps/api/", - "src": "**", - "dest": "../deploy/apps/api/" + "src": [ + "**", + "!**/*.desktop" + ], + "dest": "../deploy/web-apps/apps/api/" } } }, "main": { "clean": [ - "../deploy/apps/spreadsheeteditor/main" + "../deploy/web-apps/apps/spreadsheeteditor/main" ], "js": { "requirejs": { "options": { "name": "../apps/spreadsheeteditor/main/app.js", - "out": "../deploy/apps/spreadsheeteditor/main/app.js", + "out": "../deploy/web-apps/apps/spreadsheeteditor/main/app.js", "baseUrl": "../apps/", "inlineText": true, "findNestedDependencies": true, @@ -165,7 +161,7 @@ "embedImages": true, "files": { "src": "../apps/spreadsheeteditor/main/resources/less/app.less", - "dest": "../deploy/apps/spreadsheeteditor/main/resources/css/app.css" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/css/app.css" }, "replacements": [ { @@ -186,17 +182,17 @@ "src": [ "**/*.{png,jpg,gif}" ], - "dest": "../deploy/apps/spreadsheeteditor/main/resources/img/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/" } ], "images-common": [ { "expand": true, - "cwd": "../sdk/Word/Images/", + "cwd": "../../sdkjs/word/Images/", "src": [ "**/*.cur" ], - "dest": "../deploy/apps/spreadsheeteditor/main/Images/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/Images/" }, { "expand": true, @@ -204,7 +200,7 @@ "src": [ "**/*.{png,jpg,gif}" ], - "dest": "../deploy/apps/spreadsheeteditor/main/resources/img/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/" } ] }, @@ -214,13 +210,13 @@ "expand": true, "cwd": "../apps/spreadsheeteditor/main/locale/", "src": "*", - "dest": "../deploy/apps/spreadsheeteditor/main/locale/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/locale/" }, { "expand": true, "cwd": "../apps/spreadsheeteditor/main/resources/formula-lang", "src": "*", - "dest": "../deploy/apps/spreadsheeteditor/main/resources/formula-lang" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/formula-lang" } ], "help": [ @@ -228,26 +224,26 @@ "expand": true, "cwd": "../apps/spreadsheeteditor/main/resources/help/en/", "src": "**", - "dest": "../deploy/apps/spreadsheeteditor/main/resources/help/en/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/en/" }, { "expand": true, "cwd": "../apps/spreadsheeteditor/main/resources/help/ru/", "src": "**", - "dest": "../deploy/apps/spreadsheeteditor/main/resources/help/ru/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/ru/" } ], "index-page": [ { "src": "../apps/spreadsheeteditor/main/index.html.deploy", - "dest": "../deploy/apps/spreadsheeteditor/main/index.html" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index.html" } ] } }, "mobile": { "clean": [ - "../deploy/apps/spreadsheeteditor/mobile" + "../deploy/web-apps/apps/spreadsheeteditor/mobile" ], "js": { "src": [ @@ -278,32 +274,32 @@ "../apps/common/locale.js", "../apps/spreadsheeteditor/mobile/app.js" ], - "dist": "../deploy/apps/spreadsheeteditor/mobile/app-all.js" + "dist": "../deploy/web-apps/apps/spreadsheeteditor/mobile/app-all.js" }, "css": { "normal": { "src": [ "../apps/spreadsheeteditor/mobile/resources/css/application-normal.css" ], - "dist": "../deploy/apps/spreadsheeteditor/mobile/resources/css/application-normal.css" + "dist": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/css/application-normal.css" }, "retina": { "src": [ "../apps/spreadsheeteditor/mobile/resources/css/application-retina.css" ], - "dist": "../deploy/apps/spreadsheeteditor/mobile/resources/css/application-retina.css" + "dist": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/css/application-retina.css" } }, "copy": { "index-page": { - "../deploy/apps/spreadsheeteditor/mobile/index.html": "../apps/spreadsheeteditor/mobile/index.html.deploy" + "../deploy/web-apps/apps/spreadsheeteditor/mobile/index.html": "../apps/spreadsheeteditor/mobile/index.html.deploy" }, "localization": [ { "expand": true, "cwd": "../apps/spreadsheeteditor/mobile/locale/", "src": "*", - "dest": "../deploy/apps/spreadsheeteditor/mobile/locale/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/locale/" } ], "images-app": [ @@ -311,14 +307,14 @@ "expand": true, "cwd": "../apps/spreadsheeteditor/mobile/resources/img/", "src": "**", - "dest": "../deploy/apps/spreadsheeteditor/mobile/resources/img/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/" } ] } }, "embed": { "clean": [ - "../deploy/apps/spreadsheeteditor/embed" + "../deploy/web-apps/apps/spreadsheeteditor/embed" ], "js": { "src": [ @@ -328,12 +324,12 @@ "../apps/spreadsheeteditor/embed/js/ApplicationController.js", "../apps/spreadsheeteditor/embed/js/application.js" ], - "dist": "../deploy/apps/spreadsheeteditor/embed/app-all.js" + "dist": "../deploy/web-apps/apps/spreadsheeteditor/embed/app-all.js" }, "less": { "files": { "src": "../apps/spreadsheeteditor/embed/resources/less/application.less", - "dist": "../deploy/apps/spreadsheeteditor/embed/resources/css/app-all.css" + "dist": "../deploy/web-apps/apps/spreadsheeteditor/embed/resources/css/app-all.css" }, "replacements": [ { @@ -344,64 +340,64 @@ }, "copy": { "index-page": { - "../deploy/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy" + "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy" }, "images-app": [ { "expand": true, "cwd": "../apps/common/embed/resources/img/", "src": "**", - "dest": "../deploy/apps/spreadsheeteditor/embed/resources/img/" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/embed/resources/img/" } ] } }, "touch": { "clean": [ - "../deploy/vendor/touch" + "../deploy/web-apps/vendor/touch" ], "copy": { "script": { "src": "../vendor/touch/sencha-touch-all.js", - "dest": "../deploy/vendor/touch/sencha-touch-all.js" + "dest": "../deploy/web-apps/vendor/touch/sencha-touch-all.js" } } }, "bootstrap": { "clean": [ - "../deploy/vendor/bootstrap" + "../deploy/web-apps/vendor/bootstrap" ], "copy": { "script": { "src": "../vendor/bootstrap/dist/js/bootstrap.min.js", - "dest": "../deploy/vendor/bootstrap/dist/js/bootstrap.min.js" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js" }, "font": { "expand": true, "cwd": "../vendor/bootstrap/dist/fonts/", "src": "*", - "dest": "../deploy/vendor/bootstrap/dist/fonts/" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/" }, "css": { "src": "../vendor/bootstrap/dist/css/bootstrap.min.css", - "dest": "../deploy/vendor/bootstrap/dist/css/bootstrap.min.css" + "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css" } } }, "jquery": { "clean": [ - "../deploy/vendor/jquery" + "../deploy/web-apps/vendor/jquery" ], "copy": { "script": { "files": [ { "src": "../vendor/jquery/jquery.min.js", - "dest": "../deploy/vendor/jquery/jquery.min.js" + "dest": "../deploy/web-apps/vendor/jquery/jquery.min.js" }, { "src": "../vendor/jquery.browser/dist/jquery.browser.min.js", - "dest": "../deploy/vendor/jquery/jquery.browser.min.js" + "dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js" } ] } @@ -409,93 +405,93 @@ }, "megapixel": { "clean": [ - "../deploy/vendor/megapixel" + "../deploy/web-apps/vendor/megapixel" ], "copy": { "script": { "src": "../vendor/megapixel/megapix-image-min.js", - "dest": "../deploy/vendor/megapixel/megapix-image-min.js" + "dest": "../deploy/web-apps/vendor/megapixel/megapix-image-min.js" } } }, "sockjs": { "clean": [ - "../deploy/vendor/sockjs" + "../deploy/web-apps/vendor/sockjs" ], "copy": { "script": { "src": "../vendor/sockjs/sockjs.min.js", - "dest": "../deploy/vendor/sockjs/sockjs.min.js" + "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js" } } }, "xregexp": { "clean": [ - "../deploy/vendor/xregexp" + "../deploy/web-apps/vendor/xregexp" ], "copy": { "script": { "src": "../vendor/xregexp/xregexp-all-min.js", - "dest": "../deploy/vendor/xregexp/xregexp-all-min.js" + "dest": "../deploy/web-apps/vendor/xregexp/xregexp-all-min.js" } } }, "jszip": { "clean": [ - "../deploy/vendor/jszip" + "../deploy/web-apps/vendor/jszip" ], "copy": { "script": { "src": "../vendor/jszip/jszip.min.js", - "dest": "../deploy/vendor/jszip/jszip.min.js" + "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js" } } }, "jsziputils": { "clean": [ - "../deploy/vendor/jszip-utils" + "../deploy/web-apps/vendor/jszip-utils" ], "copy": { "script": { "src": "../vendor/jszip-utils/jszip-utils.min.js", - "dest": "../deploy/vendor/jszip-utils/jszip-utils.min.js" + "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js" } } }, "jsrsasign": { "clean": [ - "../deploy/vendor/jsrsasign" + "../deploy/web-apps/vendor/jsrsasign" ], "copy": { "script": { "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", - "dest": "../deploy/vendor/jsrsasign/jsrsasign-latest-all-min.js" + "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js" } } }, "underscore": { "clean": [ - "../deploy/vendor/underscore" + "../deploy/web-apps/vendor/underscore" ], "copy": { "script": { "src": "../vendor/underscore/underscore-min.js", - "dest": "../deploy/vendor/underscore/underscore-min.js" + "dest": "../deploy/web-apps/vendor/underscore/underscore-min.js" } } }, "requirejs": { "clean": [ - "../deploy/vendor/requirejs" + "../deploy/web-apps/vendor/requirejs" ], "min": { "src": "../vendor/requirejs/require.js", - "dest": "../deploy/vendor/requirejs/require.js" + "dest": "../deploy/web-apps/vendor/requirejs/require.js" } }, "zeroclipboard": { "clean": [ - "../deploy/vendor/ZeroClipboard" + "../deploy/web-apps/vendor/ZeroClipboard" ], "copy": { "script": { @@ -504,20 +500,20 @@ "src": [ "**" ], - "dest": "../deploy/vendor/ZeroClipboard/" + "dest": "../deploy/web-apps/vendor/ZeroClipboard/" } } }, "obf": { - "api": "../deploy/sdk/Excel/sdk-all.js", + "api": "../deploy/sdkjs/cell/sdk-all.js", "pat": "asc_\\w+", "keys": "-exp se -use-for-name", "apply": [ - "../deploy/sdk/Excel/sdk-all.js", - "../deploy/apps/spreadsheeteditor/main/app-edit.js", - "../deploy/apps/spreadsheeteditor/main/app-view.js", - "../deploy/apps/spreadsheeteditor/mobile/app-all.js", - "../deploy/apps/spreadsheeteditor/embed/app-all.js" + "../deploy/sdkjs/cell/sdk-all.js", + "../deploy/web-apps/apps/spreadsheeteditor/main/app-edit.js", + "../deploy/web-apps/apps/spreadsheeteditor/main/app-view.js", + "../deploy/web-apps/apps/spreadsheeteditor/mobile/app-all.js", + "../deploy/web-apps/apps/spreadsheeteditor/embed/app-all.js" ] }, "tasks": { diff --git a/vendor/ZeroClipboard/ZeroClipboard.min.js b/vendor/ZeroClipboard/ZeroClipboard.min.js old mode 100644 new mode 100755 diff --git a/vendor/ZeroClipboard/ZeroClipboard.swf b/vendor/ZeroClipboard/ZeroClipboard.swf old mode 100644 new mode 100755 diff --git a/vendor/ZeroClipboard/ZeroClipboard10.swf b/vendor/ZeroClipboard/ZeroClipboard10.swf old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/aller-bold.eot b/vendor/backbone/docs/public/fonts/aller-bold.eot old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/aller-bold.ttf b/vendor/backbone/docs/public/fonts/aller-bold.ttf old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/aller-bold.woff b/vendor/backbone/docs/public/fonts/aller-bold.woff old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/aller-light.eot b/vendor/backbone/docs/public/fonts/aller-light.eot old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/aller-light.ttf b/vendor/backbone/docs/public/fonts/aller-light.ttf old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/aller-light.woff b/vendor/backbone/docs/public/fonts/aller-light.woff old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/fleurons.eot b/vendor/backbone/docs/public/fonts/fleurons.eot old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/fleurons.ttf b/vendor/backbone/docs/public/fonts/fleurons.ttf old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/fleurons.woff b/vendor/backbone/docs/public/fonts/fleurons.woff old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/novecento-bold.eot b/vendor/backbone/docs/public/fonts/novecento-bold.eot old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/novecento-bold.ttf b/vendor/backbone/docs/public/fonts/novecento-bold.ttf old mode 100644 new mode 100755 diff --git a/vendor/backbone/docs/public/fonts/novecento-bold.woff b/vendor/backbone/docs/public/fonts/novecento-bold.woff old mode 100644 new mode 100755 diff --git a/vendor/backbone/test/vendor/qunit.css b/vendor/backbone/test/vendor/qunit.css old mode 100644 new mode 100755 diff --git a/vendor/backbone/test/vendor/qunit.js b/vendor/backbone/test/vendor/qunit.js old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/Gruntfile.js b/vendor/perfect-scrollbar/Gruntfile.js old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/README.md b/vendor/perfect-scrollbar/README.md old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/bower.json b/vendor/perfect-scrollbar/bower.json old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/azusa.jpg b/vendor/perfect-scrollbar/examples/azusa.jpg old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/options-default.html b/vendor/perfect-scrollbar/examples/options-default.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/options-minScrollbarLength.html b/vendor/perfect-scrollbar/examples/options-minScrollbarLength.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/options-suppressScrollAxis.html b/vendor/perfect-scrollbar/examples/options-suppressScrollAxis.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/options-useBothWheelAxes.html b/vendor/perfect-scrollbar/examples/options-useBothWheelAxes.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/options-wheelPropagation.html b/vendor/perfect-scrollbar/examples/options-wheelPropagation.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/options-wheelSpeed.html b/vendor/perfect-scrollbar/examples/options-wheelSpeed.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/reach-the-end-callback.html b/vendor/perfect-scrollbar/examples/reach-the-end-callback.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/examples/text-content.html b/vendor/perfect-scrollbar/examples/text-content.html old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/min/perfect-scrollbar-0.4.9.min.css b/vendor/perfect-scrollbar/min/perfect-scrollbar-0.4.9.min.css old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/min/perfect-scrollbar-0.4.9.min.js b/vendor/perfect-scrollbar/min/perfect-scrollbar-0.4.9.min.js old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/min/perfect-scrollbar-0.4.9.with-mousewheel.min.js b/vendor/perfect-scrollbar/min/perfect-scrollbar-0.4.9.with-mousewheel.min.js old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/package.json b/vendor/perfect-scrollbar/package.json old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/perfect-scrollbar.jquery.json b/vendor/perfect-scrollbar/perfect-scrollbar.jquery.json old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/src/jquery.mousewheel.js b/vendor/perfect-scrollbar/src/jquery.mousewheel.js old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/src/perfect-scrollbar.css b/vendor/perfect-scrollbar/src/perfect-scrollbar.css old mode 100644 new mode 100755 diff --git a/vendor/perfect-scrollbar/src/perfect-scrollbar.js b/vendor/perfect-scrollbar/src/perfect-scrollbar.js old mode 100644 new mode 100755 diff --git a/vendor/requirejs/dist/Markdown.pl b/vendor/requirejs/dist/Markdown.pl old mode 100644 new mode 100755 diff --git a/vendor/requirejs/dist/dist-build.sh b/vendor/requirejs/dist/dist-build.sh old mode 100644 new mode 100755 diff --git a/vendor/requirejs/tests/browsertests/async/async.php b/vendor/requirejs/tests/browsertests/async/async.php old mode 100644 new mode 100755 diff --git a/vendor/requirejs/tests/browsertests/async/one.php b/vendor/requirejs/tests/browsertests/async/one.php old mode 100644 new mode 100755 diff --git a/vendor/requirejs/tests/browsertests/async/two.js b/vendor/requirejs/tests/browsertests/async/two.js old mode 100644 new mode 100755 diff --git a/vendor/requirejs/tests/doh/runner.sh b/vendor/requirejs/tests/doh/runner.sh old mode 100644 new mode 100755 diff --git a/vendor/requirejs/tests/layers/build.sh b/vendor/requirejs/tests/layers/build.sh old mode 100644 new mode 100755 diff --git a/vendor/requirejs/updatesubs.sh b/vendor/requirejs/updatesubs.sh old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/aller-bold.eot b/vendor/underscore/docs/public/fonts/aller-bold.eot old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/aller-bold.ttf b/vendor/underscore/docs/public/fonts/aller-bold.ttf old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/aller-bold.woff b/vendor/underscore/docs/public/fonts/aller-bold.woff old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/aller-light.eot b/vendor/underscore/docs/public/fonts/aller-light.eot old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/aller-light.ttf b/vendor/underscore/docs/public/fonts/aller-light.ttf old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/aller-light.woff b/vendor/underscore/docs/public/fonts/aller-light.woff old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/novecento-bold.eot b/vendor/underscore/docs/public/fonts/novecento-bold.eot old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/novecento-bold.ttf b/vendor/underscore/docs/public/fonts/novecento-bold.ttf old mode 100644 new mode 100755 diff --git a/vendor/underscore/docs/public/fonts/novecento-bold.woff b/vendor/underscore/docs/public/fonts/novecento-bold.woff old mode 100644 new mode 100755