diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 7a2fba2d3..8ea0acf3c 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -116,13 +116,15 @@ rightMenu: true, hideRightMenu: false, // hide or show right panel on first loading toolbar: true, - header: true, statusBar: true, autosave: true, forcesave: false, commentAuthorOnly: false, showReviewChanges: false, - help: true + help: true, + compactHeader: false, + toolbarBreakTabs: false, + toolbarHideFileName: false }, plugins: { autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'], @@ -370,6 +372,7 @@ // _config.editorConfig.canBackToFolder = false; if (!_config.editorConfig.customization) _config.editorConfig.customization = {}; _config.editorConfig.customization.about = false; + _config.editorConfig.customization.compactHeader = false; if ( window.AscDesktopEditor ) window.AscDesktopEditor.execCommand('webapps:events', 'loading'); } diff --git a/apps/common/Analytics.js b/apps/common/Analytics.js index 37a59ab6d..f2985be6c 100644 --- a/apps/common/Analytics.js +++ b/apps/common/Analytics.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index 7d173d612..fe0cc2d50 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/IrregularStack.js b/apps/common/IrregularStack.js index 7a9aa5170..4092f0358 100644 --- a/apps/common/IrregularStack.js +++ b/apps/common/IrregularStack.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/embed/lib/controller/modals.js b/apps/common/embed/lib/controller/modals.js index bdf8ac2d1..82de2063c 100644 --- a/apps/common/embed/lib/controller/modals.js +++ b/apps/common/embed/lib/controller/modals.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/embed/lib/util/utils.js b/apps/common/embed/lib/util/utils.js index 5a4b5db1f..0637a0450 100644 --- a/apps/common/embed/lib/util/utils.js +++ b/apps/common/embed/lib/util/utils.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/embed/lib/view/modals.js b/apps/common/embed/lib/view/modals.js index 32b1be5d3..4c9c02e07 100644 --- a/apps/common/embed/lib/view/modals.js +++ b/apps/common/embed/lib/view/modals.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/locale.js b/apps/common/locale.js index b84aa0c37..556ec30d6 100644 --- a/apps/common/locale.js +++ b/apps/common/locale.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/ChatMessages.js b/apps/common/main/lib/collection/ChatMessages.js index afedde6fb..a8f0ae676 100644 --- a/apps/common/main/lib/collection/ChatMessages.js +++ b/apps/common/main/lib/collection/ChatMessages.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/Comments.js b/apps/common/main/lib/collection/Comments.js index 2f34243d7..892192457 100644 --- a/apps/common/main/lib/collection/Comments.js +++ b/apps/common/main/lib/collection/Comments.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/Fonts.js b/apps/common/main/lib/collection/Fonts.js index de2ddfe9c..8058dc271 100644 --- a/apps/common/main/lib/collection/Fonts.js +++ b/apps/common/main/lib/collection/Fonts.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/HistoryVersions.js b/apps/common/main/lib/collection/HistoryVersions.js index 00c929c7f..06ac75267 100644 --- a/apps/common/main/lib/collection/HistoryVersions.js +++ b/apps/common/main/lib/collection/HistoryVersions.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/Plugins.js b/apps/common/main/lib/collection/Plugins.js index cd943fc31..d8d6706cc 100644 --- a/apps/common/main/lib/collection/Plugins.js +++ b/apps/common/main/lib/collection/Plugins.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/ReviewChanges.js b/apps/common/main/lib/collection/ReviewChanges.js index 9f23da3bd..b45a04cfa 100644 --- a/apps/common/main/lib/collection/ReviewChanges.js +++ b/apps/common/main/lib/collection/ReviewChanges.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/TextArt.js b/apps/common/main/lib/collection/TextArt.js index 16d19784e..75d361af2 100644 --- a/apps/common/main/lib/collection/TextArt.js +++ b/apps/common/main/lib/collection/TextArt.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/collection/Users.js b/apps/common/main/lib/collection/Users.js index e3fa41a23..790d87e21 100644 --- a/apps/common/main/lib/collection/Users.js +++ b/apps/common/main/lib/collection/Users.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/BaseView.js b/apps/common/main/lib/component/BaseView.js index 853631472..bab307eab 100644 --- a/apps/common/main/lib/component/BaseView.js +++ b/apps/common/main/lib/component/BaseView.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 6076f836c..829ec2a76 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js index 2e3849ac0..fa353ba98 100644 --- a/apps/common/main/lib/component/CheckBox.js +++ b/apps/common/main/lib/component/CheckBox.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js index d9d16c840..da3e9cb64 100644 --- a/apps/common/main/lib/component/ColorButton.js +++ b/apps/common/main/lib/component/ColorButton.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ColorPalette.js b/apps/common/main/lib/component/ColorPalette.js index 1c513290a..106cfb761 100644 --- a/apps/common/main/lib/component/ColorPalette.js +++ b/apps/common/main/lib/component/ColorPalette.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js index d8ad4bbaf..98eadf69d 100644 --- a/apps/common/main/lib/component/ColorPaletteExt.js +++ b/apps/common/main/lib/component/ColorPaletteExt.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js index 31c732d9b..3f9cb35f3 100644 --- a/apps/common/main/lib/component/ComboBorderSize.js +++ b/apps/common/main/lib/component/ComboBorderSize.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index c2e4fefa6..a70154c7e 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index c6a132079..a3e471483 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js index 6bf42af17..289b79814 100644 --- a/apps/common/main/lib/component/ComboDataView.js +++ b/apps/common/main/lib/component/ComboDataView.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index d343f62ac..5f8ccbf99 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/DimensionPicker.js b/apps/common/main/lib/component/DimensionPicker.js index b81c95b54..72c4d6b25 100644 --- a/apps/common/main/lib/component/DimensionPicker.js +++ b/apps/common/main/lib/component/DimensionPicker.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/HSBColorPicker.js b/apps/common/main/lib/component/HSBColorPicker.js index c64eb4983..1a17387e1 100644 --- a/apps/common/main/lib/component/HSBColorPicker.js +++ b/apps/common/main/lib/component/HSBColorPicker.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index 24e5e6d40..905cb945b 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/apps/common/main/lib/component/InputField.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Layout.js b/apps/common/main/lib/component/Layout.js index ba2d41cf6..8251aceab 100644 --- a/apps/common/main/lib/component/Layout.js +++ b/apps/common/main/lib/component/Layout.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js index c23f24473..e1a565af6 100644 --- a/apps/common/main/lib/component/ListView.js +++ b/apps/common/main/lib/component/ListView.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/LoadMask.js b/apps/common/main/lib/component/LoadMask.js index 704606354..48b3dcc06 100644 --- a/apps/common/main/lib/component/LoadMask.js +++ b/apps/common/main/lib/component/LoadMask.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/MaskedField.js b/apps/common/main/lib/component/MaskedField.js index b92617c1f..611e80bb9 100644 --- a/apps/common/main/lib/component/MaskedField.js +++ b/apps/common/main/lib/component/MaskedField.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js index fa03b2612..42fafc2e6 100644 --- a/apps/common/main/lib/component/Menu.js +++ b/apps/common/main/lib/component/Menu.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -424,8 +424,21 @@ define([ onAfterShowMenu: function(e) { this.trigger('show:after', this, e); - if (this.options.restoreHeight && this.scroller) - this.scroller.update({minScrollbarLength : 40}); + if (this.scroller) { + if (this.options.restoreHeight) + this.scroller.update(); + + var menuRoot = (this.cmpEl.attr('role') === 'menu') ? this.cmpEl : this.cmpEl.find('[role=menu]'), + $selected = menuRoot.find('> li .checked'); + if ($selected.length) { + var itemTop = $selected.position().top, + itemHeight = $selected.height(), + listHeight = menuRoot.height(); + if (itemTop < 0 || itemTop + itemHeight > listHeight) { + menuRoot.scrollTop(menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2)); + } + } + } if (this.$el.find('> ul > .menu-scroll').length) { var el = this.$el.find('li .checked')[0]; diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js index ffd4c1d69..c0f7c99fd 100644 --- a/apps/common/main/lib/component/MenuItem.js +++ b/apps/common/main/lib/component/MenuItem.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js index 0c011e338..a56e2adea 100644 --- a/apps/common/main/lib/component/MetricSpinner.js +++ b/apps/common/main/lib/component/MetricSpinner.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 1f238f839..16c1d8a8a 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -42,7 +42,8 @@ */ define([ - 'backbone' + 'backbone', + 'common/main/lib/component/BaseView' ], function (Backbone) { 'use strict'; @@ -359,7 +360,7 @@ define([ if ( me._timer_id ) clearTimeout(me._timer_id); function _fc() { - let $active = panel || me.$panels.filter('.active'); + var $active = panel || me.$panels.filter('.active'); if ( $active && $active.length ) { var _maxright = $active.parents('.box-controls').width(); var data = $active.data(), diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index 77a1812cd..8a12bef4b 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js index 9d8e435ee..57348aa19 100644 --- a/apps/common/main/lib/component/RadioBox.js +++ b/apps/common/main/lib/component/RadioBox.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Scroller.js b/apps/common/main/lib/component/Scroller.js index 550e45aeb..05c2ba80e 100644 --- a/apps/common/main/lib/component/Scroller.js +++ b/apps/common/main/lib/component/Scroller.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index 371c119cb..b82ca9372 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Switcher.js b/apps/common/main/lib/component/Switcher.js index db2c2ad2b..e393011d2 100644 --- a/apps/common/main/lib/component/Switcher.js +++ b/apps/common/main/lib/component/Switcher.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index d3cce7eaf..57a203492 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 15ac4a025..29e93b32c 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index e8f7bbcd1..0c6868add 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/TableStyler.js b/apps/common/main/lib/component/TableStyler.js index 7a354e0bd..1f2868e90 100644 --- a/apps/common/main/lib/component/TableStyler.js +++ b/apps/common/main/lib/component/TableStyler.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js index 64a532739..98899fd45 100644 --- a/apps/common/main/lib/component/ThemeColorPalette.js +++ b/apps/common/main/lib/component/ThemeColorPalette.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/ToggleManager.js b/apps/common/main/lib/component/ToggleManager.js index dab80c690..f4536a160 100644 --- a/apps/common/main/lib/component/ToggleManager.js +++ b/apps/common/main/lib/component/ToggleManager.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Tooltip.js b/apps/common/main/lib/component/Tooltip.js index 230cde22b..df02ca406 100644 --- a/apps/common/main/lib/component/Tooltip.js +++ b/apps/common/main/lib/component/Tooltip.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/TreeView.js b/apps/common/main/lib/component/TreeView.js index fb5b001d3..c95bb9878 100644 --- a/apps/common/main/lib/component/TreeView.js +++ b/apps/common/main/lib/component/TreeView.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index b8f76ff2d..cab94d7c4 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/controller/Chat.js b/apps/common/main/lib/controller/Chat.js index 5eed63ff7..2132767a2 100644 --- a/apps/common/main/lib/controller/Chat.js +++ b/apps/common/main/lib/controller/Chat.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 16efe2f64..ed64ddd28 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -1484,6 +1484,11 @@ define([ this.updateComments(true); if (this.getPopover()) this.getPopover().update(true); + }, + + clearCollections: function() { + this.collection.reset(); + this.groupCollection = []; } }, Common.Controllers.Comments || {})); diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 4da882dec..5356ffb5d 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -53,7 +53,21 @@ define([ Common.NotificationCenter.on('app:ready', function (opts) { _.extend(config, opts); !!app && app.execCommand('doc:onready', ''); + + $('.toolbar').addClass('editor-native-color'); }); + + app.on_native_message = function (cmd, param) { + if (/^style:change/.test(cmd)) { + var obj = JSON.parse(param); + + if ( obj.element == 'toolbar' ) { + if ( obj.action == 'off' && obj.style == 'native-color' ) { + $('.toolbar').removeClass('editor-native-color'); + } + } + } + } } }, process: function (opts) { diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js index a1b6c1930..9373a4e2d 100644 --- a/apps/common/main/lib/controller/ExternalDiagramEditor.js +++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/controller/ExternalMergeEditor.js b/apps/common/main/lib/controller/ExternalMergeEditor.js index 6e3cfdfc5..d9ac85562 100644 --- a/apps/common/main/lib/controller/ExternalMergeEditor.js +++ b/apps/common/main/lib/controller/ExternalMergeEditor.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/controller/Fonts.js b/apps/common/main/lib/controller/Fonts.js index 364478fcb..570f000e2 100644 --- a/apps/common/main/lib/controller/Fonts.js +++ b/apps/common/main/lib/controller/Fonts.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 3d68ca4b4..8e8978193 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -152,7 +152,13 @@ define([ this.api.asc_showRevision(hist); var commentsController = this.getApplication().getController('Common.Controllers.Comments'); - if (commentsController) commentsController.onApiHideComment(); + if (commentsController) { + commentsController.onApiHideComment(); + commentsController.clearCollections(); + } + var reviewController = this.getApplication().getController('Common.Controllers.ReviewChanges'); + if (reviewController) + reviewController.onApiShowChange(); } }, @@ -202,7 +208,13 @@ define([ this.api.asc_showRevision(hist); var commentsController = this.getApplication().getController('Common.Controllers.Comments'); - if (commentsController) commentsController.onApiHideComment(); + if (commentsController) { + commentsController.onApiHideComment(); + commentsController.clearCollections(); + } + var reviewController = this.getApplication().getController('Common.Controllers.ReviewChanges'); + if (reviewController) + reviewController.onApiShowChange(); } } }, diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 483c113eb..47d214327 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -156,6 +156,7 @@ define([ variation.set_Icons(itemVar.get('icons')); variation.set_Visual(itemVar.get('isVisual')); variation.set_CustomWindow(itemVar.get('isCustomWindow')); + variation.set_System(itemVar.get('isSystem')); variation.set_Viewer(itemVar.get('isViewer')); variation.set_EditorsSupport(itemVar.get('EditorsSupport')); variation.set_Modal(itemVar.get('isModal')); diff --git a/apps/common/main/lib/controller/Protection.js b/apps/common/main/lib/controller/Protection.js index 60538e1b5..d7a45c1c6 100644 --- a/apps/common/main/lib/controller/Protection.js +++ b/apps/common/main/lib/controller/Protection.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 7cf006f18..6c148092b 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -135,6 +135,19 @@ define([ if (this.dlgChanges) this.dlgChanges.close(); this.view && this.view.SetDisabled(state, this.langs); + this.setPreviewMode(state); + }, + + setPreviewMode: function(mode) { //disable accept/reject in popover + if (this.viewmode === mode) return; + this.viewmode = mode; + if (mode) + this.prevcanReview = this.appConfig.canReview; + this.appConfig.canReview = (mode) ? false : this.prevcanReview; + var me = this; + this.popoverChanges && this.popoverChanges.each(function (model) { + model.set('hint', !me.appConfig.canReview); + }); }, onApiShowChange: function (sdkchange) { @@ -668,21 +681,13 @@ define([ }, onDocLanguage: function() { - var langs = _.map(this.langs, function(item){ - return { - displayValue: item.title, - value: item.tip, - code: item.code - } - }); - var me = this; (new Common.Views.LanguageDialog({ - languages: langs, + languages: me.langs, current: me.api.asc_getDefaultLanguage(), - handler: function(result, tip) { + handler: function(result, value) { if (result=='ok') { - var record = _.findWhere(langs, {'value':tip}); + var record = _.findWhere(me.langs, {'value':value}); record && me.api.asc_setDefaultLanguage(record.code); } } diff --git a/apps/common/main/lib/core/NotificationCenter.js b/apps/common/main/lib/core/NotificationCenter.js index 20d733284..4415acffd 100644 --- a/apps/common/main/lib/core/NotificationCenter.js +++ b/apps/common/main/lib/core/NotificationCenter.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/extend/Bootstrap.js b/apps/common/main/lib/extend/Bootstrap.js index 4ae829c2d..c83f5f5da 100755 --- a/apps/common/main/lib/extend/Bootstrap.js +++ b/apps/common/main/lib/extend/Bootstrap.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/model/ChatMessage.js b/apps/common/main/lib/model/ChatMessage.js index 941947f12..cff5fda7d 100644 --- a/apps/common/main/lib/model/ChatMessage.js +++ b/apps/common/main/lib/model/ChatMessage.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/model/Comment.js b/apps/common/main/lib/model/Comment.js index 6fea9f6e1..54f30d973 100644 --- a/apps/common/main/lib/model/Comment.js +++ b/apps/common/main/lib/model/Comment.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/model/Font.js b/apps/common/main/lib/model/Font.js index 818829ffc..563c406aa 100644 --- a/apps/common/main/lib/model/Font.js +++ b/apps/common/main/lib/model/Font.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/model/HistoryVersion.js b/apps/common/main/lib/model/HistoryVersion.js index f6ef20c46..5c4341806 100644 --- a/apps/common/main/lib/model/HistoryVersion.js +++ b/apps/common/main/lib/model/HistoryVersion.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js index 46b31e418..9de8d7ea8 100644 --- a/apps/common/main/lib/model/Plugin.js +++ b/apps/common/main/lib/model/Plugin.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -55,6 +55,7 @@ define([ url: "", index: 0, icons: undefined, + isSystem: false, isViewer: false, isDisplayedInViewer: true, EditorsSupport: ["word", "cell", "slide"], diff --git a/apps/common/main/lib/model/ReviewChange.js b/apps/common/main/lib/model/ReviewChange.js index 89ff8aef4..89d016cad 100644 --- a/apps/common/main/lib/model/ReviewChange.js +++ b/apps/common/main/lib/model/ReviewChange.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/model/User.js b/apps/common/main/lib/model/User.js index cf7ba46fc..6f71c3de8 100644 --- a/apps/common/main/lib/model/User.js +++ b/apps/common/main/lib/model/User.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js index 6c2917964..893359272 100644 --- a/apps/common/main/lib/util/LanguageInfo.js +++ b/apps/common/main/lib/util/LanguageInfo.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -45,399 +45,399 @@ if (Common === undefined) { Common.util = Common.util||{}; Common.util.LanguageInfo = new(function() { - var localLanguageName = { + var localLanguageName = { // code: [short-name, native-name, english-name] - fill 3 field when need to add language to editor interface 0x0036 : ["af", "Afrikaans"], - 0x0436 : ["af-ZA", "Afrikaans (Suid Afrika)"], + 0x0436 : ["af-ZA", "Afrikaans (Suid Afrika)", "Afrikaans (South Africa)"], 0x001C : ["sq", "Shqipe"], - 0x041C : ["sq-AL", "Shqipe (Shqipëria)"], + 0x041C : ["sq-AL", "Shqipe (Shqipëria)", "Albanian (Albania)"], 0x0084 : ["gsw", "Elsässisch"], - 0x0484 : ["gsw-FR", "Elsässisch (Frànkrisch)"], + 0x0484 : ["gsw-FR", "Elsässisch (Frànkrisch)", "Alsatian (France)"], 0x005E : ["am", "አማርኛ"], - 0x045E : ["am-ET", "አማርኛ (ኢትዮጵያ)"], + 0x045E : ["am-ET", "አማርኛ (ኢትዮጵያ)", "Amharic (Ethiopia)"], 0x0001 : ["ar", "العربية‏"], - 0x1401 : ["ar-DZ", "العربية (الجزائر)‏"], - 0x3C01 : ["ar-BH", "العربية (البحرين)‏"], - 0x0C01 : ["ar-EG", "العربية (مصر)‏"], - 0x0801 : ["ar-IQ", "العربية (العراق)‏"], - 0x2C01 : ["ar-JO", "العربية (الأردن)‏"], - 0x3401 : ["ar-KW", "العربية (الكويت)‏"], - 0x3001 : ["ar-LB", "العربية (لبنان)‏"], - 0x1001 : ["ar-LY", "العربية (ليبيا)‏"], - 0x1801 : ["ar-MA", "العربية (المملكة المغربية)‏"], - 0x2001 : ["ar-OM", "العربية (عمان)‏"], - 0x4001 : ["ar-QA", "العربية (قطر)‏"], - 0x0401 : ["ar-SA", "العربية (المملكة العربية السعودية)‏"], - 0x2801 : ["ar-SY", "العربية (سوريا)‏"], - 0x1C01 : ["ar-TN", "العربية (تونس)‏"], - 0x3801 : ["ar-AE", "العربية (الإمارات العربية المتحدة)‏"], - 0x2401 : ["ar-YE", "العربية (اليمن)‏"], + 0x1401 : ["ar-DZ", "العربية (الجزائر)‏", "Arabic (Algeria)"], + 0x3C01 : ["ar-BH", "العربية (البحرين)‏", "Arabic (Bahrain)"], + 0x0C01 : ["ar-EG", "العربية (مصر)‏", "Arabic (Egypt)"], + 0x0801 : ["ar-IQ", "العربية (العراق)‏", "Arabic (Iraq)"], + 0x2C01 : ["ar-JO", "العربية (الأردن)‏", "Arabic (Jordan)"], + 0x3401 : ["ar-KW", "العربية (الكويت)‏", "Arabic (Kuwait)"], + 0x3001 : ["ar-LB", "العربية (لبنان)‏", "Arabic (Lebanon)"], + 0x1001 : ["ar-LY", "العربية (ليبيا)‏", "Arabic (Libya)"], + 0x1801 : ["ar-MA", "العربية (المملكة المغربية)‏", "Arabic (Morocco)"], + 0x2001 : ["ar-OM", "العربية (عمان)‏", "Arabic (Oman)"], + 0x4001 : ["ar-QA", "العربية (قطر)‏", "Arabic (Qatar)"], + 0x0401 : ["ar-SA", "العربية (المملكة العربية السعودية)‏", "Arabic (Saudi Arabia)"], + 0x2801 : ["ar-SY", "العربية (سوريا)‏", "Arabic (Syria)"], + 0x1C01 : ["ar-TN", "العربية (تونس)‏", "Arabic (Tunisia)"], + 0x3801 : ["ar-AE", "العربية (الإمارات العربية المتحدة)‏", "Arabic (U.A.E.)"], + 0x2401 : ["ar-YE", "العربية (اليمن)‏", "Arabic (Yemen)"], 0x002B : ["hy", "Հայերեն"], - 0x042B : ["hy-AM", "Հայերեն (Հայաստան)"], + 0x042B : ["hy-AM", "Հայերեն (Հայաստան)", "Armenian (Armenia)"], 0x004D : ["as", "অসমীয়া"], - 0x044D : ["as-IN", "অসমীয়া (ভাৰত)"], + 0x044D : ["as-IN", "অসমীয়া (ভাৰত)", "Assamese (India)"], 0x002C : ["az", "Azərbaycan­ılı"], 0x742C : ["az-Cyrl", "Азәрбајҹан дили"], - 0x082C : ["az-Cyrl-AZ", "Азәрбајҹан (Азәрбајҹан)"], + 0x082C : ["az-Cyrl-AZ", "Азәрбајҹан (Азәрбајҹан)", "Azeri (Cyrillic, Azerbaijan)"], 0x782C : ["az-Latn", "Azərbaycan­ılı"], - 0x042C : ["az-Latn-AZ", "Azərbaycan­ılı (Azərbaycan)"], + 0x042C : ["az-Latn-AZ", "Azərbaycan­ılı (Azərbaycan)", "Azeri (Latin, Azerbaijan)"], 0x006D : ["ba", "Башҡорт"], - 0x046D : ["ba-RU", "Башҡорт (Россия)"], + 0x046D : ["ba-RU", "Башҡорт (Россия)", "Bashkir (Russia)"], 0x002D : ["eu", "Euskara"], - 0x042D : ["eu-ES", "Euskara (Euskara)"], + 0x042D : ["eu-ES", "Euskara (Euskara)", "Basque (Basque)"], 0x0023 : ["be", "Беларускі"], - 0x0423 : ["be-BY", "Беларускі (Беларусь)"], + 0x0423 : ["be-BY", "Беларускі (Беларусь)", "Belarusian (Belarus)"], 0x0045 : ["bn", "বাংলা"], - 0x0845 : ["bn-BD", "বাংলা (বাংলাদেশ)"], - 0x0445 : ["bn-IN", "বাংলা (ভারত)"], + 0x0845 : ["bn-BD", "বাংলা (বাংলাদেশ)", "Bengali (Bangladesh)"], + 0x0445 : ["bn-IN", "বাংলা (ভারত)", "Bengali (India)"], 0x781A : ["bs", "bosanski"], 0x641A : ["bs-Cyrl", "Босански (Ћирилица)"], - 0x201A : ["bs-Cyrl-BA", "Босански (Босна и Херцеговина)"], + 0x201A : ["bs-Cyrl-BA", "Босански (Босна и Херцеговина)", "Bosnian (Cyrillic) (Bosnia and Herzegovina)"], 0x681A : ["bs-Latn", "Bosanski (Latinica)"], - 0x141A : ["bs-Latn-BA", "Bosanski (Bosna i Hercegovina)"], + 0x141A : ["bs-Latn-BA", "Bosanski (Bosna i Hercegovina)", "Bosnian (Latin) (Bosnia and Herzegovina)"], 0x007E : ["br", "Brezhoneg"], - 0x047E : ["br-FR", "Brezhoneg (Frañs)"], + 0x047E : ["br-FR", "Brezhoneg (Frañs)", "Breton (France)"], 0x0002 : ["bg", "Български"], - 0x0402 : ["bg-BG", "Български (България)"], + 0x0402 : ["bg-BG", "Български (България)", "Bulgarian (Bulgaria)"], 0x0003 : ["ca", "Català"], - 0x0403 : ["ca-ES", "Català (Català)"], - 0x0803 : ["ca-ES-valencia", "Català (Valencià)"], + 0x0403 : ["ca-ES", "Català (Català)", "Catalan (Catalan)"], + 0x0803 : ["ca-ES-valencia", "Català (Valencià)", "Catalan (Valencia)"], 0x7804 : ["zh", "中文"], - 0x0004 : ["zh-Hans", "中文(简体)"], - 0x0804 : ["zh-CN", "中文(中华人民共和国)"], - 0x1004 : ["zh-SG", "中文(新加坡)"], - 0x7C04 : ["zh-Hant", "中文(繁體)"], - 0x0C04 : ["zh-HK", "中文(香港特別行政區)"], - 0x1404 : ["zh-MO", "中文(澳門特別行政區)"], - 0x0404 : ["zh-TW", "中文(台灣)"], + 0x0004 : ["zh-Hans", "中文(简体)", "Chinese (Simplified)"], + 0x0804 : ["zh-CN", "中文(中华人民共和国)", "Chinese (People's Republic of China)"], + 0x1004 : ["zh-SG", "中文(新加坡)", "Chinese (Simplified, Singapore)"], + 0x7C04 : ["zh-Hant", "中文(繁體)", "Chinese (Traditional)"], + 0x0C04 : ["zh-HK", "中文(香港特別行政區)", "Chinese (Traditional, Hong Kong S.A.R.)"], + 0x1404 : ["zh-MO", "中文(澳門特別行政區)", "Chinese (Traditional, Macao S.A.R.)"], + 0x0404 : ["zh-TW", "中文(台灣)", "Chinese (Traditional, Taiwan)"], 0x0083 : ["co", "Corsu"], - 0x0483 : ["co-FR", "Corsu (France)"], + 0x0483 : ["co-FR", "Corsu (France)", "Corsican (France)"], 0x001A : ["hr", "Hrvatski"], - 0x041A : ["hr-HR", "Hrvatski (Hrvatska)"], - 0x101A : ["hr-BA", "Hrvatski (Bosna i Hercegovina)"], + 0x041A : ["hr-HR", "Hrvatski (Hrvatska)", "Croatian (Croatia)"], + 0x101A : ["hr-BA", "Hrvatski (Bosna i Hercegovina)", "Croatian (Bosnia and Herzegovina)"], 0x0005 : ["cs", "Čeština"], - 0x0405 : ["cs-CZ", "Čeština (Česká republika)"], + 0x0405 : ["cs-CZ", "Čeština (Česká republika)", "Czech (Czech Republic)"], 0x0006 : ["da", "Dansk"], - 0x0406 : ["da-DK", "Dansk (Danmark)"], + 0x0406 : ["da-DK", "Dansk (Danmark)", "Danish (Denmark)"], 0x008C : ["prs", "درى‏"], - 0x048C : ["prs-AF", "درى (افغانستان)‏"], + 0x048C : ["prs-AF", "درى (افغانستان)‏", "Dari (Afghanistan)"], 0x0065 : ["dv", "ދިވެހިބަސް‏"], - 0x0465 : ["dv-MV", "ދިވެހިބަސް (ދިވެހި ރާއްޖެ)‏"], + 0x0465 : ["dv-MV", "ދިވެހިބަސް (ދިވެހި ރާއްޖެ)‏", "Divehi (Maldives)"], 0x0013 : ["nl", "Nederlands"], - 0x0813 : ["nl-BE", "Nederlands (België)"], - 0x0413 : ["nl-NL", "Nederlands (Nederland)"], + 0x0813 : ["nl-BE", "Nederlands (België)", "Dutch (Belgium)"], + 0x0413 : ["nl-NL", "Nederlands (Nederland)", "Dutch (Netherlands)"], 0x0009 : ["en", "English"], - 0x0C09 : ["en-AU", "English (Australia)"], - 0x2809 : ["en-BZ", "English (Belize)"], - 0x1009 : ["en-CA", "English (Canada)"], - 0x2409 : ["en-029", "English (Caribbean)"], - 0x4009 : ["en-IN", "English (India)"], - 0x1809 : ["en-IE", "English (Ireland)"], - 0x2009 : ["en-JM", "English (Jamaica)"], - 0x4409 : ["en-MY", "English (Malaysia)"], - 0x1409 : ["en-NZ", "English (New Zealand)"], - 0x3409 : ["en-PH", "English (Philippines)"], - 0x4809 : ["en-SG", "English (Singapore)"], - 0x1C09 : ["en-ZA", "English (South Africa)"], - 0x2C09 : ["en-TT", "English (Trinidad y Tobago)"], - 0x0809 : ["en-GB", "English (United Kingdom)"], - 0x0409 : ["en-US", "English (United States)"], - 0x3009 : ["en-ZW", "English (Zimbabwe)"], - 0x3c09 : ["en-HK", "English (Hong Kong)"], - 0x3809 : ["en-ID", "English (Indonesia)"], + 0x0C09 : ["en-AU", "English (Australia)", "English (Australia)"], + 0x2809 : ["en-BZ", "English (Belize)", "English (Belize)"], + 0x1009 : ["en-CA", "English (Canada)", "English (Canada)"], + 0x2409 : ["en-029", "English (Caribbean)", "English (Caribbean)"], + 0x4009 : ["en-IN", "English (India)", "English (India)"], + 0x1809 : ["en-IE", "English (Ireland)", "English (Ireland)"], + 0x2009 : ["en-JM", "English (Jamaica)", "English (Jamaica)"], + 0x4409 : ["en-MY", "English (Malaysia)", "English (Malaysia)"], + 0x1409 : ["en-NZ", "English (New Zealand)", "English (New Zealand)"], + 0x3409 : ["en-PH", "English (Philippines)", "English (Philippines)"], + 0x4809 : ["en-SG", "English (Singapore)", "English (Singapore)"], + 0x1C09 : ["en-ZA", "English (South Africa)", "English (South Africa)"], + 0x2C09 : ["en-TT", "English (Trinidad y Tobago)", "English (Trinidad y Tobago)"], + 0x0809 : ["en-GB", "English (United Kingdom)", "English (United Kingdom)"], + 0x0409 : ["en-US", "English (United States)", "English (United States)"], + 0x3009 : ["en-ZW", "English (Zimbabwe)", "English (Zimbabwe)"], + 0x3c09 : ["en-HK", "English (Hong Kong)", "English (Hong Kong)"], + 0x3809 : ["en-ID", "English (Indonesia)", "English (Indonesia)"], 0x0025 : ["et", "Eesti"], - 0x0425 : ["et-EE", "Eesti (Eesti)"], + 0x0425 : ["et-EE", "Eesti (Eesti)", "Estonian (Estonia)"], 0x0038 : ["fo", "Føroyskt"], - 0x0438 : ["fo-FO", "Føroyskt (Føroyar)"], + 0x0438 : ["fo-FO", "Føroyskt (Føroyar)", "Faroese (Faroe Islands)"], 0x0064 : ["fil", "Filipino"], - 0x0464 : ["fil-PH", "Filipino (Pilipinas)"], + 0x0464 : ["fil-PH", "Filipino (Pilipinas)", "Filipino (Philippines)"], 0x000B : ["fi", "Suomi"], - 0x040B : ["fi-FI", "Suomi (Suomi)"], + 0x040B : ["fi-FI", "Suomi (Suomi)", "Finnish (Finland)"], 0x000C : ["fr", "Français"], - 0x080C : ["fr-BE", "Français (Belgique)"], - 0x0C0C : ["fr-CA", "Français (Canada)"], - 0x040C : ["fr-FR", "Français (France)"], - 0x140C : ["fr-LU", "Français (Luxembourg)"], - 0x180C : ["fr-MC", "Français (Principauté de Monaco)"], - 0x100C : ["fr-CH", "Français (Suisse)"], - 0x3c0c : ["fr-HT", "French (Haiti)"], - 0x240c : ["fr-CG", "French (Congo)"], - 0x300c : ["fr-CI", "French (Cote d'Ivoire)"], - 0x2c0c : ["fr-CM", "French (Cameroon)"], - 0x380c : ["fr-MA", "French (Morocco)"], - 0x340c : ["fr-ML", "French (Mali)"], - 0x200c : ["fr-RE", "French (Reunion)"], - 0x280c : ["fr-SN", "French (Senegal)"], + 0x080C : ["fr-BE", "Français (Belgique)", "French (Belgium)"], + 0x0C0C : ["fr-CA", "Français (Canada)", "French (Canada)"], + 0x040C : ["fr-FR", "Français (France)", "French (France)"], + 0x140C : ["fr-LU", "Français (Luxembourg)", "French (Luxembourg)"], + 0x180C : ["fr-MC", "Français (Principauté de Monaco)", "French (Principality of Monaco)"], + 0x100C : ["fr-CH", "Français (Suisse)", "French (Switzerland)"], + 0x3c0c : ["fr-HT", "Français (Haïti)", "French (Haiti)"], + 0x240c : ["fr-CG", "Français (Congo-Brazzaville)", "French (Congo)"], + 0x300c : ["fr-CI", "Français (Côte d’Ivoire)", "French (Cote d'Ivoire)"], + 0x2c0c : ["fr-CM", "Français (Cameroun)", "French (Cameroon)"], + 0x380c : ["fr-MA", "Français (Maroc)", "French (Morocco)"], + 0x340c : ["fr-ML", "Français (Mali)", "French (Mali)"], + 0x200c : ["fr-RE", "Français (La Réunion)", "French (Reunion)"], + 0x280c : ["fr-SN", "Français (Sénégal)", "French (Senegal)"], 0x1c0c : ["fr-West", "French"], 0x0062 : ["fy", "Frysk"], - 0x0462 : ["fy-NL", "Frysk (Nederlân)"], + 0x0462 : ["fy-NL", "Frysk (Nederlân)", "Frisian (Netherlands)"], 0x0056 : ["gl", "Galego"], - 0x0456 : ["gl-ES", "Galego (Galego)"], + 0x0456 : ["gl-ES", "Galego (Galego)", "Galician (Galician)"], 0x0037 : ["ka", "ქართული"], - 0x0437 : ["ka-GE", "ქართული (საქართველო)"], + 0x0437 : ["ka-GE", "ქართული (საქართველო)", "Georgian (Georgia)"], 0x0007 : ["de", "Deutsch"], - 0x0C07 : ["de-AT", "Deutsch (Österreich)"], - 0x0407 : ["de-DE", "Deutsch (Deutschland)"], - 0x1407 : ["de-LI", "Deutsch (Liechtenstein)"], - 0x1007 : ["de-LU", "Deutsch (Luxemburg)"], - 0x0807 : ["de-CH", "Deutsch (Schweiz)"], + 0x0C07 : ["de-AT", "Deutsch (Österreich)", "German (Austria)"], + 0x0407 : ["de-DE", "Deutsch (Deutschland)", "German (Germany)"], + 0x1407 : ["de-LI", "Deutsch (Liechtenstein)", "German (Liechtenstein)"], + 0x1007 : ["de-LU", "Deutsch (Luxemburg)", "German (Luxembourg)"], + 0x0807 : ["de-CH", "Deutsch (Schweiz)", "German (Switzerland)"], 0x0008 : ["el", "Ελληνικά"], - 0x0408 : ["el-GR", "Ελληνικά (Ελλάδα)"], + 0x0408 : ["el-GR", "Ελληνικά (Ελλάδα)", "Greek (Greece)"], 0x006F : ["kl", "Kalaallisut"], - 0x046F : ["kl-GL", "Kalaallisut (Kalaallit Nunaat)"], + 0x046F : ["kl-GL", "Kalaallisut (Kalaallit Nunaat)", "Greenlandic (Greenland)"], 0x0047 : ["gu", "ગુજરાતી"], - 0x0447 : ["gu-IN", "ગુજરાતી (ભારત)"], + 0x0447 : ["gu-IN", "ગુજરાતી (ભારત)", "Gujarati (India)"], 0x0068 : ["ha", "Hausa"], 0x7C68 : ["ha-Latn", "Hausa (Latin)"], - 0x0468 : ["ha-Latn-NG", "Hausa (Nigeria)"], + 0x0468 : ["ha-Latn-NG", "Hausa (Nigeria)", "Hausa (Latin) (Nigeria)"], 0x000D : ["he", "עברית‏"], - 0x040D : ["he-IL", "עברית (ישראל)‏"], + 0x040D : ["he-IL", "עברית (ישראל)‏", "Hebrew (Israel)"], 0x0039 : ["hi", "हिंदी"], - 0x0439 : ["hi-IN", "हिंदी (भारत)"], + 0x0439 : ["hi-IN", "हिंदी (भारत)", "Hindi (India)"], 0x000E : ["hu", "Magyar"], - 0x040E : ["hu-HU", "Magyar (Magyarország)"], + 0x040E : ["hu-HU", "Magyar (Magyarország)", "Hungarian (Hungary)"], 0x000F : ["is", "Íslenska"], - 0x040F : ["is-IS", "Íslenska (Ísland)"], + 0x040F : ["is-IS", "Íslenska (Ísland)", "Icelandic (Iceland)"], 0x0070 : ["ig", "Igbo"], - 0x0470 : ["ig-NG", "Igbo (Nigeria)"], + 0x0470 : ["ig-NG", "Igbo (Nigeria)", "Igbo (Nigeria)"], 0x0021 : ["id", "Bahasa Indonesia"], - 0x0421 : ["id-ID", "Bahasa Indonesia (Indonesia)"], + 0x0421 : ["id-ID", "Bahasa Indonesia (Indonesia)", "Indonesian (Indonesia)"], 0x005D : ["iu", "Inuktitut"], 0x7C5D : ["iu-Latn", "Inuktitut (Qaliujaaqpait)"], - 0x085D : ["iu-Latn-CA", "Inuktitut"], + 0x085D : ["iu-Latn-CA", "Inuktitut (Kanatami) (kanata)", "Inuktitut (Latin) (Canada)"], 0x785D : ["iu-Cans", "ᐃᓄᒃᑎᑐᑦ (ᖃᓂᐅᔮᖅᐸᐃᑦ)"], - 0x045D : ["iu-Cans-CA", "ᐃᓄᒃᑎᑐᑦ (ᑲᓇᑕᒥ)"], + 0x045D : ["iu-Cans-CA", "ᐃᓄᒃᑎᑐᑦ (ᑲᓇᑕᒥ)", "Inuktitut (Canada)"], 0x003C : ["ga", "Gaeilge"], - 0x083C : ["ga-IE", "Gaeilge (Éire)"], + 0x083C : ["ga-IE", "Gaeilge (Éire)", "Irish (Ireland)"], 0x0034 : ["xh", "isiXhosa"], - 0x0434 : ["xh-ZA", "isiXhosa (uMzantsi Afrika)"], + 0x0434 : ["xh-ZA", "isiXhosa (uMzantsi Afrika)", "isiXhosa (South Africa)"], 0x0035 : ["zu", "isiZulu"], - 0x0435 : ["zu-ZA", "isiZulu (iNingizimu Afrika)"], + 0x0435 : ["zu-ZA", "isiZulu (iNingizimu Afrika)", "isiZulu (South Africa)"], 0x0010 : ["it", "Italiano"], - 0x0410 : ["it-IT", "Italiano (Italia)"], - 0x0810 : ["it-CH", "Italiano (Svizzera)"], + 0x0410 : ["it-IT", "Italiano (Italia)", "Italian (Italy)"], + 0x0810 : ["it-CH", "Italiano (Svizzera)", "Italian (Switzerland)"], 0x0011 : ["ja", "日本語"], - 0x0411 : ["ja-JP", "日本語 (日本)"], + 0x0411 : ["ja-JP", "日本語 (日本)", "Japanese (Japan)"], 0x004B : ["kn", "ಕನ್ನಡ"], - 0x044B : ["kn-IN", "ಕನ್ನಡ (ಭಾರತ)"], + 0x044B : ["kn-IN", "ಕನ್ನಡ (ಭಾರತ)", "Kannada (India)"], 0x003F : ["kk", "Қазақ"], - 0x043F : ["kk-KZ", "Қазақ (Қазақстан)"], + 0x043F : ["kk-KZ", "Қазақ (Қазақстан)", "Kazakh (Kazakhstan)"], 0x0053 : ["km", "ខ្មែរ"], - 0x0453 : ["km-KH", "ខ្មែរ (កម្ពុជា)"], + 0x0453 : ["km-KH", "ខ្មែរ (កម្ពុជា)", "Khmer (Cambodia)"], 0x0086 : ["qut", "K'iche"], - 0x0486 : ["qut-GT", "K'iche (Guatemala)"], + 0x0486 : ["qut-GT", "K'iche (Guatemala)", "K'iche (Guatemala)"], 0x0087 : ["rw", "Kinyarwanda"], - 0x0487 : ["rw-RW", "Kinyarwanda (Rwanda)"], + 0x0487 : ["rw-RW", "Kinyarwanda (Rwanda)", "Kinyarwanda (Rwanda)"], 0x0041 : ["sw", "Kiswahili"], - 0x0441 : ["sw-KE", "Kiswahili (Kenya)"], + 0x0441 : ["sw-KE", "Kiswahili (Kenya)", "Kiswahili (Kenya)"], 0x0057 : ["kok", "कोंकणी"], - 0x0457 : ["kok-IN", "कोंकणी (भारत)"], + 0x0457 : ["kok-IN", "कोंकणी (भारत)", "Konkani (India)"], 0x0012 : ["ko", "한국어"], - 0x0412 : ["ko-KR", "한국어 (대한민국)"], + 0x0412 : ["ko-KR", "한국어 (대한민국)", "Korean (Korea)"], 0x0040 : ["ky", "Кыргыз"], - 0x0440 : ["ky-KG", "Кыргыз (Кыргызстан)"], + 0x0440 : ["ky-KG", "Кыргыз (Кыргызстан)", "Kyrgyz (Kyrgyzstan)"], 0x0054 : ["lo", "ລາວ"], - 0x0454 : ["lo-LA", "ລາວ (ສ.ປ.ປ. ລາວ)"], + 0x0454 : ["lo-LA", "ລາວ (ສ.ປ.ປ. ລາວ)", "Lao (Lao P.D.R.)"], 0x0026 : ["lv", "Latviešu"], - 0x0426 : ["lv-LV", "Latviešu (Latvija)"], + 0x0426 : ["lv-LV", "Latviešu (Latvija)", "Latvian (Latvia)"], 0x0027 : ["lt", "Lietuvių"], - 0x0427 : ["lt-LT", "Lietuvių (Lietuva)"], + 0x0427 : ["lt-LT", "Lietuvių (Lietuva)", "Lithuanian (Lithuania)"], 0x7C2E : ["dsb", "Dolnoserbšćina"], - 0x082E : ["dsb-DE", "Dolnoserbšćina (Nimska)"], + 0x082E : ["dsb-DE", "Dolnoserbšćina (Nimska)", "Lower Sorbian (Germany)"], 0x006E : ["lb", "Lëtzebuergesch"], - 0x046E : ["lb-LU", "Lëtzebuergesch (Luxembourg)"], - 0x042F : ["mk-MK", "Македонски јазик (Македонија)"], + 0x046E : ["lb-LU", "Lëtzebuergesch (Luxembourg)", "Luxembourgish (Luxembourg)"], + 0x042F : ["mk-MK", "Македонски јазик (Македонија)", "Macedonian (Former Yugoslav Republic of Macedonia)"], 0x002F : ["mk", "Македонски јазик"], 0x003E : ["ms", "Bahasa Melayu"], - 0x083E : ["ms-BN", "Bahasa Melayu (Brunei Darussalam)"], - 0x043E : ["ms-MY", "Bahasa Melayu (Malaysia)"], + 0x083E : ["ms-BN", "Bahasa Melayu (Brunei Darussalam)", "Malay (Brunei Darussalam)"], + 0x043E : ["ms-MY", "Bahasa Melayu (Malaysia)", "Malay (Malaysia)"], 0x004C : ["ml", "മലയാളം"], - 0x044C : ["ml-IN", "മലയാളം (ഭാരതം)"], + 0x044C : ["ml-IN", "മലയാളം (ഭാരതം)", "Malayalam (India)"], 0x003A : ["mt", "Malti"], - 0x043A : ["mt-MT", "Malti (Malta)"], + 0x043A : ["mt-MT", "Malti (Malta)", "Maltese (Malta)"], 0x0081 : ["mi", "Reo Māori"], - 0x0481 : ["mi-NZ", "Reo Māori (Aotearoa)"], + 0x0481 : ["mi-NZ", "Reo Māori (Aotearoa)", "Maori (New Zealand)"], 0x007A : ["arn", "Mapudungun"], - 0x047A : ["arn-CL", "Mapudungun (Chile)"], + 0x047A : ["arn-CL", "Mapudungun (Chile)", "Mapudungun (Chile)"], 0x004E : ["mr", "मराठी"], - 0x044E : ["mr-IN", "मराठी (भारत)"], + 0x044E : ["mr-IN", "मराठी (भारत)", "Marathi (India)"], 0x007C : ["moh", "Kanien'kéha"], - 0x047C : ["moh-CA", "Kanien'kéha"], + 0x047C : ["moh-CA", "Kanien'kéha (Canada)", "Mohawk (Canada)"], 0x0050 : ["mn", "Монгол хэл"], 0x7850 : ["mn-Cyrl", "Монгол хэл"], - 0x0450 : ["mn-MN", "Монгол хэл (Монгол улс)"], + 0x0450 : ["mn-MN", "Монгол хэл (Монгол улс)", "Mongolian (Cyrillic, Mongolia)"], 0x7C50 : ["mn-Mong", "ᠮᠤᠨᠭᠭᠤᠯ ᠬᠡᠯᠡ"], - 0x0850 : ["mn-Mong-CN", "ᠮᠤᠨᠭᠭᠤᠯ ᠬᠡᠯᠡ (ᠪᠦᠭᠦᠳᠡ ᠨᠠᠢᠷᠠᠮᠳᠠᠬᠤ ᠳᠤᠮᠳᠠᠳᠤ ᠠᠷᠠᠳ ᠣᠯᠣᠰ)"], + 0x0850 : ["mn-Mong-CN", "ᠮᠤᠨᠭᠭᠤᠯ ᠬᠡᠯᠡ (ᠪᠦᠭᠦᠳᠡ ᠨᠠᠢᠷᠠᠮᠳᠠᠬᠤ ᠳᠤᠮᠳᠠᠳᠤ ᠠᠷᠠᠳ ᠣᠯᠣᠰ)", "Mongolian (Traditional Mongolian) (People's Republic of China)"], 0x0061 : ["ne", "नेपाली"], - 0x0461 : ["ne-NP", "नेपाली (नेपाल)"], + 0x0461 : ["ne-NP", "नेपाली (नेपाल)", "Nepali (Nepal)"], + 0x0861 : ["ne-IN", "नेपाली (भारत)", "Nepali (India)"], 0x0014 : ["no", "Norsk"], 0x7C14 : ["nb", "Norsk (bokmål)"], + 0x0414 : ["nb-NO", "Norsk, bokmål (Norge)", "Norwegian, Bokmål (Norway)"], 0x7814 : ["nn", "Norsk (Nynorsk)"], - 0x0414 : ["nb-NO", "Norsk, bokmål (Norge)"], - 0x0814 : ["nn-NO", "Norsk, nynorsk (Noreg)"], + 0x0814 : ["nn-NO", "Norsk, nynorsk (Noreg)", "Norwegian, Nynorsk (Norway)"], 0x0082 : ["oc", "Occitan"], - 0x0482 : ["oc-FR", "Occitan (França)"], + 0x0482 : ["oc-FR", "Occitan (França)", "Occitan (France)"], 0x0048 : ["or", "ଓଡ଼ିଆ"], - 0x0448 : ["or-IN", "ଓଡ଼ିଆ (ଭାରତ)"], + 0x0448 : ["or-IN", "ଓଡ଼ିଆ (ଭାରତ)", "Oriya (India)"], 0x0063 : ["ps", "پښتو‏"], - 0x0463 : ["ps-AF", "پښتو (افغانستان)‏"], + 0x0463 : ["ps-AF", "پښتو (افغانستان)‏", "Pashto (Afghanistan)"], 0x0029 : ["fa", "فارسى‏"], - 0x0429 : ["fa-IR", "فارسى (ایران)‏"], + 0x0429 : ["fa-IR", "فارسى (ایران)‏", "Persian (Iran)"], 0x0015 : ["pl", "Polski"], - 0x0415 : ["pl-PL", "Polski (Polska)"], + 0x0415 : ["pl-PL", "Polski (Polska)", "Polish (Poland)"], 0x0016 : ["pt", "Português"], - 0x0416 : ["pt-BR", "Português (Brasil)"], - 0x0816 : ["pt-PT", "Português (Portugal)"], + 0x0416 : ["pt-BR", "Português (Brasil)", "Portuguese (Brazil)"], + 0x0816 : ["pt-PT", "Português (Portugal)", "Portuguese (Portugal)"], 0x0046 : ["pa", "ਪੰਜਾਬੀ"], - 0x0446 : ["pa-IN", "ਪੰਜਾਬੀ (ਭਾਰਤ)"], + 0x0446 : ["pa-IN", "ਪੰਜਾਬੀ (ਭਾਰਤ)", "Punjabi (India)"], 0x006B : ["quz", "Runasimi"], - 0x046B : ["quz-BO", "Runasimi (Qullasuyu)"], - 0x086B : ["quz-EC", "Runasimi (Ecuador)"], - 0x0C6B : ["quz-PE", "Runasimi (Piruw)"], + 0x046B : ["quz-BO", "Runasimi (Qullasuyu)", "Quechua (Bolivia)"], + 0x086B : ["quz-EC", "Runasimi (Ecuador)", "Quechua (Ecuador)"], + 0x0C6B : ["quz-PE", "Runasimi (Piruw)", "Quechua (Peru)"], 0x0018 : ["ro", "Română"], - 0x0418 : ["ro-RO", "Română (România)"], - 0x0818 : ["ro-MD", "Română (Moldova)"], + 0x0418 : ["ro-RO", "Română (România)", "Romanian (Romania)"], + 0x0818 : ["ro-MD", "Română (Moldova)", "Romanian (Republic of Moldova)"], 0x0017 : ["rm", "Rumantsch"], - 0x0417 : ["rm-CH", "Rumantsch (Svizra)"], + 0x0417 : ["rm-CH", "Rumantsch (Svizra)", "Romansh (Switzerland)"], 0x0019 : ["ru", "Русский"], - 0x0419 : ["ru-RU", "Русский (Россия)"], - 0x0819 : ["ru-MD", "Русский (Молдавия)"], + 0x0419 : ["ru-RU", "Русский (Россия)", "Russian (Russia)"], + 0x0819 : ["ru-MD", "Русский (Молдавия)", "Russian (Republic of Moldova)"], 0x703B : ["smn", "Sämikielâ"], + 0x243B : ["smn-FI", "Sämikielâ (Suomâ)", "Sami (Inari) (Finland)"], 0x7C3B : ["smj", "Julevusámegiella"], + 0x103B : ["smj-NO", "Julevusámegiella (Vuodna)", "Sami (Lule) (Norway)"], + 0x143B : ["smj-SE", "Julevusámegiella (Svierik)", "Sami (Lule) (Sweden)"], 0x003B : ["se", "Davvisámegiella"], + 0x0C3B : ["se-FI", "Davvisámegiella (Suopma)", "Sami (Northern) (Finland)"], + 0x043B : ["se-NO", "Davvisámegiella (Norga)", "Sami (Northern) (Norway)"], + 0x083B : ["se-SE", "Davvisámegiella (Ruoŧŧa)", "Sami (Northern) (Sweden)"], 0x743B : ["sms", "Sääm´ǩiõll"], + 0x203B : ["sms-FI", "Sääm´ǩiõll (Lää´ddjânnam)", "Sami (Skolt) (Finland)"], 0x783B : ["sma", "åarjelsaemiengiele"], - 0x243B : ["smn-FI", "Sämikielâ (Suomâ)"], - 0x103B : ["smj-NO", "Julevusámegiella (Vuodna)"], - 0x143B : ["smj-SE", "Julevusámegiella (Svierik)"], - 0x0C3B : ["se-FI", "Davvisámegiella (Suopma)"], - 0x043B : ["se-NO", "Davvisámegiella (Norga)"], - 0x083B : ["se-SE", "Davvisámegiella (Ruoŧŧa)"], - 0x203B : ["sms-FI", "Sääm´ǩiõll (Lää´ddjânnam)"], - 0x183B : ["sma-NO", "åarjelsaemiengiele (Nöörje)"], - 0x1C3B : ["sma-SE", "åarjelsaemiengiele (Sveerje)"], + 0x183B : ["sma-NO", "åarjelsaemiengiele (Nöörje)", "Sami (Southern) (Norway)"], + 0x1C3B : ["sma-SE", "åarjelsaemiengiele (Sveerje)", "Sami (Southern) (Sweden)"], 0x004F : ["sa", "संस्कृत"], - 0x044F : ["sa-IN", "संस्कृत (भारतम्)"], + 0x044F : ["sa-IN", "संस्कृत (भारतम्)", "Sanskrit (India)"], 0x0091 : ["gd", "Gàidhlig"], - 0x0491 : ["gd-GB", "Gàidhlig (An Rìoghachd Aonaichte)"], + 0x0491 : ["gd-GB", "Gàidhlig (An Rìoghachd Aonaichte)", "Scottish Gaelic (United Kingdom)"], 0x7C1A : ["sr", "Srpski"], 0x6C1A : ["sr-Cyrl", "Српски (Ћирилица)"], - 0x1C1A : ["sr-Cyrl-BA", "Српски (Босна и Херцеговина)"], - 0x301A : ["sr-Cyrl-ME", "Српски (Црна Гора)"], - 0x0C1A : ["sr-Cyrl-CS", "Српски (Србија и Црна Гора (Претходно))"], - 0x281A : ["sr-Cyrl-RS", "Српски (Србија)"], + 0x1C1A : ["sr-Cyrl-BA", "Српски (Босна и Херцеговина)", "Serbian (Cyrillic) (Bosnia and Herzegovina)"], + 0x301A : ["sr-Cyrl-ME", "Српски (Црна Гора)", "Serbian (Cyrillic, Montenegro)"], + 0x0C1A : ["sr-Cyrl-CS", "Српски (Србија и Црна Гора (Претходно))", "Serbian (Cyrillic, Serbia and Montenegro (Former))"], + 0x281A : ["sr-Cyrl-RS", "Српски (Србија)", "Serbian (Cyrillic, Serbia)"], 0x701A : ["sr-Latn", "Srpski (Latinica)"], - 0x181A : ["sr-Latn-BA", "Srpski (Bosna i Hercegovina)"], - 0x2C1A : ["sr-Latn-ME", "Srpski (Crna Gora)"], - 0x081A : ["sr-Latn-CS", "Srpski (Srbija i Crna Gora (Prethodno))"], - 0x241A : ["sr-Latn-RS", "Srpski (Srbija, Latinica)"], + 0x181A : ["sr-Latn-BA", "Srpski (Bosna i Hercegovina)", "Serbian (Latin, Bosnia and Herzegovina)"], + 0x2C1A : ["sr-Latn-ME", "Srpski (Crna Gora)", "Serbian (Latin, Montenegro)"], + 0x081A : ["sr-Latn-CS", "Srpski (Srbija i Crna Gora (Prethodno))", "Serbian (Latin, Serbia and Montenegro (Former))"], + 0x241A : ["sr-Latn-RS", "Srpski (Srbija, Latinica)", "Serbian (Latin, Serbia)"], 0x006C : ["nso", "Sesotho sa Leboa"], - 0x046C : ["nso-ZA", "Sesotho sa Leboa (Afrika Borwa)"], + 0x046C : ["nso-ZA", "Sesotho sa Leboa (Afrika Borwa)", "Sesotho sa Leboa (South Africa)"], 0x0032 : ["tn", "Setswana"], - 0x0432 : ["tn-ZA", "Setswana (Aforika Borwa)"], + 0x0432 : ["tn-ZA", "Setswana (Aforika Borwa)", "Setswana (South Africa)"], 0x005B : ["si", "සිංහ"], - 0x045B : ["si-LK", "සිංහ (ශ්‍රී ලංකා)"], + 0x045B : ["si-LK", "සිංහ (ශ්‍රී ලංකා)", "Sinhala (Sri Lanka)"], 0x001B : ["sk", "Slovenčina"], - 0x041B : ["sk-SK", "Slovenčina (Slovenská republika)"], + 0x041B : ["sk-SK", "Slovenčina (Slovenská republika)", "Slovak (Slovakia)"], 0x0024 : ["sl", "Slovenski"], - 0x0424 : ["sl-SI", "Slovenski (Slovenija)"], + 0x0424 : ["sl-SI", "Slovenski (Slovenija)", "Slovenian (Slovenia)"], 0x000A : ["es", "Español"], - 0x2C0A : ["es-AR", "Español (Argentina)"], - 0x400A : ["es-BO", "Español (Bolivia)"], - 0x340A : ["es-CL", "Español (Chile)"], - 0x240A : ["es-CO", "Español (Colombia)"], - 0x140A : ["es-CR", "Español (Costa Rica)"], - 0x1C0A : ["es-DO", "Español (República Dominicana)"], - 0x300A : ["es-EC", "Español (Ecuador)"], - 0x440A : ["es-SV", "Español (El Salvador)"], - 0x100A : ["es-GT", "Español (Guatemala)"], - 0x480A : ["es-HN", "Español (Honduras)"], - 0x080A : ["es-MX", "Español (México)"], - 0x4C0A : ["es-NI", "Español (Nicaragua)"], - 0x180A : ["es-PA", "Español (Panamá)"], - 0x3C0A : ["es-PY", "Español (Paraguay)"], - 0x280A : ["es-PE", "Español (Perú)"], - 0x500A : ["es-PR", "Español (Puerto Rico)"], - 0x0C0A : ["es-ES", "Español (España, alfabetización internacional)"], - 0x540A : ["es-US", "Español (Estados Unidos)"], - 0x380A : ["es-UY", "Español (Uruguay)"], - 0x200A : ["es-VE", "Español (Republica Bolivariana de Venezuela)"], + 0x2C0A : ["es-AR", "Español (Argentina)", "Spanish (Argentina)"], + 0x400A : ["es-BO", "Español (Bolivia)", "Spanish (Bolivia)"], + 0x340A : ["es-CL", "Español (Chile)", "Spanish (Chile)"], + 0x240A : ["es-CO", "Español (Colombia)", "Spanish (Colombia)"], + 0x140A : ["es-CR", "Español (Costa Rica)", "Spanish (Costa Rica)"], + 0x1C0A : ["es-DO", "Español (República Dominicana)", "Spanish (Dominican Republic)"], + 0x300A : ["es-EC", "Español (Ecuador)", "Spanish (Ecuador)"], + 0x440A : ["es-SV", "Español (El Salvador)", "Spanish (El Salvador)"], + 0x100A : ["es-GT", "Español (Guatemala)", "Spanish (Guatemala)"], + 0x480A : ["es-HN", "Español (Honduras)", "Spanish (Honduras)"], + 0x080A : ["es-MX", "Español (México)", "Spanish (Mexico)"], + 0x4C0A : ["es-NI", "Español (Nicaragua)", "Spanish (Nicaragua)"], + 0x180A : ["es-PA", "Español (Panamá)", "Spanish (Panama)"], + 0x3C0A : ["es-PY", "Español (Paraguay)", "Spanish (Paraguay)"], + 0x280A : ["es-PE", "Español (Perú)", "Spanish (Peru)"], + 0x500A : ["es-PR", "Español (Puerto Rico)", "Spanish (Puerto Rico)"], + 0x0C0A : ["es-ES", "Español (España, alfabetización internacional)", "Spanish (Spain)"], + 0x540A : ["es-US", "Español (Estados Unidos)", "Spanish (United States)"], + 0x380A : ["es-UY", "Español (Uruguay)", "Spanish (Uruguay)"], + 0x200A : ["es-VE", "Español (Republica Bolivariana de Venezuela)", "Spanish (Venezuela)"], 0x040a : ["es-ES_tradnl", "Spanish"], 0x001D : ["sv", "Svenska"], - 0x081D : ["sv-FI", "Svenska (Finland)"], - 0x041D : ["sv-SE", "Svenska (Sverige)"], + 0x081D : ["sv-FI", "Svenska (Finland)", "Swedish (Finland)"], + 0x041D : ["sv-SE", "Svenska (Sverige)", "Swedish (Sweden)"], 0x005A : ["syr", "ܣܘܪܝܝܐ‏"], - 0x045A : ["syr-SY", "ܣܘܪܝܝܐ (سوريا)‏"], + 0x045A : ["syr-SY", "ܣܘܪܝܝܐ (سوريا)‏", "Syriac (Syria)"], 0x0028 : ["tg", "Тоҷикӣ"], 0x7C28 : ["tg-Cyrl", "Тоҷикӣ"], - 0x0428 : ["tg-Cyrl-TJ", "Тоҷикӣ (Тоҷикистон)"], + 0x0428 : ["tg-Cyrl-TJ", "Тоҷикӣ (Тоҷикистон)", "Tajik (Cyrillic) (Tajikistan)"], 0x005F : ["tzm", "Tamazight"], 0x7C5F : ["tzm-Latn", "Tamazight (Latin)"], - 0x085F : ["tzm-Latn-DZ", "Tamazight (Djazaïr)"], + 0x085F : ["tzm-Latn-DZ", "Tamazight (Djazaïr)", "Tamazight (Latin) (Algeria)"], 0x0049 : ["ta", "தமிழ்"], - 0x0449 : ["ta-IN", "தமிழ் (இந்தியா)"], + 0x0449 : ["ta-IN", "தமிழ் (இந்தியா)", "Tamil (India)"], 0x0044 : ["tt", "Татар"], - 0x0444 : ["tt-RU", "Татар (Россия)"], + 0x0444 : ["tt-RU", "Татар (Россия)", "Tatar (Russia)"], 0x004A : ["te", "తెలుగు"], - 0x044A : ["te-IN", "తెలుగు (భారత దేశం)"], + 0x044A : ["te-IN", "తెలుగు (భారత దేశం)", "Telugu (India)"], 0x001E : ["th", "ไทย"], - 0x041E : ["th-TH", "ไทย (ไทย)"], + 0x041E : ["th-TH", "ไทย (ไทย)", "Thai (Thailand)"], 0x0051 : ["bo", "བོད་ཡིག"], - 0x0451 : ["bo-CN", "བོད་ཡིག (ཀྲུང་ཧྭ་མི་དམངས་སྤྱི་མཐུན་རྒྱལ་ཁབ།)"], + 0x0451 : ["bo-CN", "བོད་ཡིག (ཀྲུང་ཧྭ་མི་དམངས་སྤྱི་མཐུན་རྒྱལ་ཁབ།)", "Tibetan (People's Republic of China)"], + 0x0851 : ["bo-BT", "Tibetan (Bhutan)", "Tibetan (Bhutan)"], 0x001F : ["tr", "Türkçe"], - 0x041F : ["tr-TR", "Türkçe (Türkiye)"], + 0x041F : ["tr-TR", "Türkçe (Türkiye)", "Turkish (Turkey)"], 0x0042 : ["tk", "Türkmençe"], - 0x0442 : ["tk-TM", "Türkmençe (Türkmenistan)"], + 0x0442 : ["tk-TM", "Türkmençe (Türkmenistan)", "Turkmen (Turkmenistan)"], 0x0022 : ["uk", "Українська"], - 0x0422 : ["uk-UA", "Українська (Україна)"], + 0x0422 : ["uk-UA", "Українська (Україна)", "Ukrainian (Ukraine)"], 0x002E : ["hsb", "Hornjoserbšćina"], - 0x042E : ["hsb-DE", "Hornjoserbšćina (Němska)"], + 0x042E : ["hsb-DE", "Hornjoserbšćina (Němska)", "Upper Sorbian (Germany)"], 0x0020 : ["ur", "اُردو‏"], - 0x0420 : ["ur-PK", "اُردو (پاکستان)‏"], + 0x0420 : ["ur-PK", "اُردو (پاکستان)‏", "Urdu (Islamic Republic of Pakistan)"], + 0x0820 : ["ur-IN", "اُردو (بھارت)", "Urdu (India)"], 0x0080 : ["ug", "ئۇيغۇر يېزىقى‏"], - 0x0480 : ["ug-CN", "(ئۇيغۇر يېزىقى (جۇڭخۇا خەلق جۇمھۇرىيىتى‏"], + 0x0480 : ["ug-CN", "(ئۇيغۇر يېزىقى (جۇڭخۇا خەلق جۇمھۇرىيىتى‏", "Uighur (People's Republic of China)"], 0x7843 : ["uz-Cyrl", "Ўзбек"], - 0x0843 : ["uz-Cyrl-UZ", "Ўзбек (Ўзбекистон)"], + 0x0843 : ["uz-Cyrl-UZ", "Ўзбек (Ўзбекистон)", "Uzbek (Cyrillic, Uzbekistan)"], 0x0043 : ["uz", "U'zbek"], 0x7C43 : ["uz-Latn", "U'zbek"], - 0x0443 : ["uz-Latn-UZ", "U'zbek (U'zbekiston Respublikasi)"], + 0x0443 : ["uz-Latn-UZ", "U'zbek (U'zbekiston Respublikasi)", "Uzbek (Latin, Uzbekistan)"], 0x002A : ["vi", "Tiếng Việt"], - 0x042A : ["vi-VN", "Tiếng Việt (Việt Nam)"], + 0x042A : ["vi-VN", "Tiếng Việt (Việt Nam)", "Vietnamese (Vietnam)"], 0x0052 : ["cy", "Cymraeg"], - 0x0452 : ["cy-GB", "Cymraeg (y Deyrnas Unedig)"], + 0x0452 : ["cy-GB", "Cymraeg (y Deyrnas Unedig)", "Welsh (United Kingdom)"], 0x0088 : ["wo", "Wolof"], - 0x0488 : ["wo-SN", "Wolof (Sénégal)"], + 0x0488 : ["wo-SN", "Wolof (Sénégal)", "Wolof (Senegal)"], 0x0085 : ["sah", "Саха"], - 0x0485 : ["sah-RU", "Саха (Россия)"], + 0x0485 : ["sah-RU", "Саха (Россия)", "Yakut (Russia)"], 0x0078 : ["ii", "ꆈꌠꁱꂷ"], - 0x0478 : ["ii-CN", "ꆈꌠꁱꂷ (ꍏꉸꏓꂱꇭꉼꇩ)"], + 0x0478 : ["ii-CN", "ꆈꌠꁱꂷ (ꍏꉸꏓꂱꇭꉼꇩ)", "Yi (People's Republic of China)"], 0x006A : ["yo", "Yoruba"], - 0x046A : ["yo-NG", "Yoruba (Nigeria)"], - 0x0851 : ["bo-BT", "Tibetan (Bhutan)"], - 0x0466 : ["bin-NG", "Bini (Nigeria)"], - 0x045c : ["chr-US", "Cherokee (United States)"], - 0x0467 : ["fuv-NG", "Nigerian Fulfulde (Nigeria)"], - 0x0472 : ["gaz-ET", "West Central Oromo (Ethiopia)"], - 0x0474 : ["gn-PY", "Guarani (Paraguay)"], - 0x0475 : ["haw-US", "Hawaiian (United States)"], - 0x0469 : ["ibb-NG", "Ibibio (Nigeria)"], - 0x0471 : ["kr-NG", "Kanuri (Nigeria)"], - 0x0458 : ["mni", "Manipuri"], - 0x0455 : ["my-MM", "Burmese (Myanmar)"], - 0x0861 : ["ne-IN", "Nepali (India)"], - 0x0479 : ["pap-AN", "Papiamento, Netherlands Antilles"], - 0x0846 : ["pa-PK", "Panjabi (Pakistan)"], - 0x048d : ["plt-MG", "Plateau Malagasy (Madagascar)"], - 0x0459 : ["sd-IN", "Sindhi (India)"], - 0x0859 : ["sd-PK", "Sindhi (Pakistan)"], - 0x0477 : ["so-SO", "Somali (Somalia)"], - 0x0430 : ["st-ZA", "Southern Sotho (South Africa)"], - 0x0473 : ["ti-ER", "Tigrinya (Eritrea)"], - 0x0873 : ["ti-ET", "Tigrinya (Ethiopia)"], + 0x046A : ["yo-NG", "Yoruba (Nigeria)", "Yoruba (Nigeria)"], + 0x0466 : ["bin-NG", "Bini (Nigeria)", "Bini (Nigeria)"], + 0x045c : ["chr-US", "ᏣᎳᎩ (ᏌᏊ ᎢᏳᎾᎵᏍᏔᏅ ᏍᎦᏚᎩ)", "Cherokee (United States)"], + 0x0467 : ["fuv-NG", "Nigerian Fulfulde (Nigeria)", "Nigerian Fulfulde (Nigeria)"], + 0x0472 : ["gaz-ET", "West Central Oromo (Ethiopia)", "West Central Oromo (Ethiopia)"], + 0x0474 : ["gn-PY", "Guarani (Paraguay)", "Guarani (Paraguay)"], + 0x0475 : ["haw-US", "ʻŌlelo Hawaiʻi (ʻAmelika Hui Pū ʻIa)", "Hawaiian (United States)"], + 0x0469 : ["ibb-NG", "Ibibio (Nigeria)", "Ibibio (Nigeria)"], + 0x0471 : ["kr-NG", "Kanuri (Nigeria)", "Kanuri (Nigeria)"], + 0x0458 : ["mni", "Manipuri", "Manipuri"], + 0x0455 : ["my-MM", "Burmese (Myanmar)", "Burmese (Myanmar)"], + 0x0479 : ["pap-AN", "Papiamento, Netherlands Antilles", "Papiamento, Netherlands Antilles"], + 0x0846 : ["pa-PK", "Panjabi (Pakistan)", "Panjabi (Pakistan)"], + 0x048d : ["plt-MG", "Plateau Malagasy (Madagascar)", "Plateau Malagasy (Madagascar)"], + 0x0459 : ["sd-IN", "Sindhi (India)", "Sindhi (India)"], + 0x0859 : ["sd-PK", "Sindhi (Pakistan)", "Sindhi (Pakistan)"], + 0x0477 : ["so-SO", "Soomaali (Soomaaliya)", "Somali (Somalia)"], + 0x0430 : ["st-ZA", "Southern Sotho (South Africa)", "Southern Sotho (South Africa)"], + 0x0473 : ["ti-ER", "ትግርኛ (ኤርትራ)", "Tigrinya (Eritrea)"], + 0x0873 : ["ti-ET", "ትግርኛ (ኢትዮጵያ)", "Tigrinya (Ethiopia)"], 0x045f : ["tmz", "Tamanaku"], - 0x0c5f : ["tmz-MA", "Tamanaku (Morocco)"], - 0x0431 : ["ts-ZA", "Tsonga (South Africa)"], - 0x0820 : ["ur-IN", "Urdu (India)"], - 0x0433 : ["ven-ZA", "South Africa"] + 0x0c5f : ["tmz-MA", "Tamaziɣt n laṭlaṣ (Meṛṛuk)", "Tamanaku (Morocco)"], + 0x0431 : ["ts-ZA", "Tsonga (South Africa)", "Tsonga (South Africa)"], + 0x0433 : ["ven-ZA", "South Africa", "South Africa"] }; return { @@ -451,6 +451,10 @@ Common.util.LanguageInfo = new(function() { return code; } return null; + }, + + getLanguages: function() { + return localLanguageName; } } })(); \ No newline at end of file diff --git a/apps/common/main/lib/util/LocalStorage.js b/apps/common/main/lib/util/LocalStorage.js index fba918a1b..764492111 100644 --- a/apps/common/main/lib/util/LocalStorage.js +++ b/apps/common/main/lib/util/LocalStorage.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/util/Shortcuts.js b/apps/common/main/lib/util/Shortcuts.js index 97c1aedfd..430646a83 100644 --- a/apps/common/main/lib/util/Shortcuts.js +++ b/apps/common/main/lib/util/Shortcuts.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/util/Tip.js b/apps/common/main/lib/util/Tip.js index f04507b9a..1ef303d66 100644 --- a/apps/common/main/lib/util/Tip.js +++ b/apps/common/main/lib/util/Tip.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 562df9121..0b04adfec 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index dd8d04051..8c16413c2 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js index aa3441540..38ad2b36c 100644 --- a/apps/common/main/lib/view/About.js +++ b/apps/common/main/lib/view/About.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 14fe6c10b..c794ebdee 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js index af9f423cb..19ab599fb 100644 --- a/apps/common/main/lib/view/Chat.js +++ b/apps/common/main/lib/view/Chat.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index be9d648ae..5d4619ee0 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js index 427949e05..1b5d6009c 100644 --- a/apps/common/main/lib/view/CopyWarningDialog.js +++ b/apps/common/main/lib/view/CopyWarningDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/DocumentAccessDialog.js b/apps/common/main/lib/view/DocumentAccessDialog.js index 0826a0824..ecdfa56c1 100644 --- a/apps/common/main/lib/view/DocumentAccessDialog.js +++ b/apps/common/main/lib/view/DocumentAccessDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/ExtendedColorDialog.js b/apps/common/main/lib/view/ExtendedColorDialog.js index 541124f4d..e7ac52a48 100644 --- a/apps/common/main/lib/view/ExtendedColorDialog.js +++ b/apps/common/main/lib/view/ExtendedColorDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js index 2056186e9..6ad1e7317 100644 --- a/apps/common/main/lib/view/ExternalDiagramEditor.js +++ b/apps/common/main/lib/view/ExternalDiagramEditor.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/ExternalMergeEditor.js b/apps/common/main/lib/view/ExternalMergeEditor.js index f4917af17..795956662 100644 --- a/apps/common/main/lib/view/ExternalMergeEditor.js +++ b/apps/common/main/lib/view/ExternalMergeEditor.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 8c2ee5cc9..7d594374a 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/History.js b/apps/common/main/lib/view/History.js index ff43e8dc5..aabc4aa31 100644 --- a/apps/common/main/lib/view/History.js +++ b/apps/common/main/lib/view/History.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/ImageFromUrlDialog.js b/apps/common/main/lib/view/ImageFromUrlDialog.js index 8cfb3d3d9..63b0ea685 100644 --- a/apps/common/main/lib/view/ImageFromUrlDialog.js +++ b/apps/common/main/lib/view/ImageFromUrlDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js index 08ededc93..c37c4890b 100644 --- a/apps/common/main/lib/view/InsertTableDialog.js +++ b/apps/common/main/lib/view/InsertTableDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js index 4973dae04..ceef1ed51 100644 --- a/apps/common/main/lib/view/LanguageDialog.js +++ b/apps/common/main/lib/view/LanguageDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -89,19 +89,19 @@ define([ editable: false, template: _.template([ '', - '', - '', - '', - '', + '', + '', + '', + '', '' ].join('')), data: this.options.languages @@ -130,11 +130,8 @@ define([ }, onLangSelect: function(cmb, rec, e) { - var icon = cmb.$el.find('.input-icon'), - plang = icon.attr('lang'); - - if (plang) icon.removeClass(plang); - rec && icon.addClass(rec.value).attr('lang',rec.value); + cmb.$el.find('.input-icon').toggleClass('spellcheck-lang', rec.spellcheck); + cmb._input.css('padding-left', rec.spellcheck ? 25 : 3); }, onPrimary: function() { diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index ea99166f3..e03d2a2e0 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js index cc2302195..a1a26ac4e 100644 --- a/apps/common/main/lib/view/PasswordDialog.js +++ b/apps/common/main/lib/view/PasswordDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 6a98e3200..36c163b9b 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/Protection.js b/apps/common/main/lib/view/Protection.js index 2caaf9c02..6bcf79d6d 100644 --- a/apps/common/main/lib/view/Protection.js +++ b/apps/common/main/lib/view/Protection.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/RenameDialog.js b/apps/common/main/lib/view/RenameDialog.js index 02feecc2f..39c550523 100644 --- a/apps/common/main/lib/view/RenameDialog.js +++ b/apps/common/main/lib/view/RenameDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index d74d143ef..498d8ded1 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -99,14 +99,6 @@ define([ var me = this; if ( me.appConfig.canReview ) { - this.btnPrev.on('click', function (e) { - me.fireEvent('reviewchange:preview', [me.btnPrev, 'prev']); - }); - - this.btnNext.on('click', function (e) { - me.fireEvent('reviewchange:preview', [me.btnNext, 'next']); - }); - this.btnAccept.on('click', function (e) { me.fireEvent('reviewchange:accept', [me.btnAccept, 'current']); }); @@ -127,10 +119,19 @@ define([ button.on('click', _click_turnpreview.bind(me)); }); } - if (this.appConfig.canViewReview) + if (this.appConfig.canViewReview) { + this.btnPrev.on('click', function (e) { + me.fireEvent('reviewchange:preview', [me.btnPrev, 'prev']); + }); + + this.btnNext.on('click', function (e) { + me.fireEvent('reviewchange:preview', [me.btnNext, 'next']); + }); + this.btnReviewView.menu.on('item:click', function (menu, item, e) { me.fireEvent('reviewchanges:view', [menu, item]); }); + } this.btnsSpelling.forEach(function(button) { button.on('click', function (b, e) { @@ -173,18 +174,6 @@ define([ this.appConfig = options.mode; if ( this.appConfig.canReview ) { - this.btnPrev = new Common.UI.Button({ - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'review-prev', - caption: this.txtPrev - }); - - this.btnNext = new Common.UI.Button({ - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'review-next', - caption: this.txtNext - }); - this.btnAccept = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtAccept, @@ -208,6 +197,18 @@ define([ this.btnsTurnReview = [this.btnTurnOn]; } if (this.appConfig.canViewReview) { + this.btnPrev = new Common.UI.Button({ + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'review-prev', + caption: this.txtPrev + }); + + this.btnNext = new Common.UI.Button({ + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'review-next', + caption: this.txtNext + }); + this.btnReviewView = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-ic-reviewview', @@ -276,8 +277,6 @@ define([ '<% } %>'); if ( config.canReview ) { - me.btnPrev.updateHint(me.hintPrev); - me.btnNext.updateHint(me.hintNext); me.btnTurnOn.updateHint(me.tipReview); me.btnAccept.setMenu( @@ -316,6 +315,9 @@ define([ me.btnReject.setDisabled(config.isReviewOnly); } if (me.appConfig.canViewReview) { + me.btnPrev.updateHint(me.hintPrev); + me.btnNext.updateHint(me.hintNext); + me.btnReviewView.setMenu( new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -431,12 +433,12 @@ define([ this.$el = $(_.template(template)( {} )); if ( this.appConfig.canReview ) { - this.btnPrev.render(this.$el.find('#btn-change-prev')); - this.btnNext.render(this.$el.find('#btn-change-next')); this.btnAccept.render(this.$el.find('#btn-change-accept')); this.btnReject.render(this.$el.find('#btn-change-reject')); this.btnTurnOn.render(this.$el.find('#btn-review-on')); } + this.btnPrev && this.btnPrev.render(this.$el.find('#btn-change-prev')); + this.btnNext && this.btnNext.render(this.$el.find('#btn-change-next')); this.btnReviewView && this.btnReviewView.render(this.$el.find('#btn-review-view')); this.btnSharing && this.btnSharing.render(this.$el.find('#slot-btn-sharing')); diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 067cef0a6..dec7a7c30 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/SaveAsDlg.js b/apps/common/main/lib/view/SaveAsDlg.js index 82fa60380..43afd5d2a 100644 --- a/apps/common/main/lib/view/SaveAsDlg.js +++ b/apps/common/main/lib/view/SaveAsDlg.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js index 375841dd5..5b9e90b91 100644 --- a/apps/common/main/lib/view/SearchDialog.js +++ b/apps/common/main/lib/view/SearchDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/SelectFileDlg.js b/apps/common/main/lib/view/SelectFileDlg.js index 9d2bf2be5..89613f610 100644 --- a/apps/common/main/lib/view/SelectFileDlg.js +++ b/apps/common/main/lib/view/SelectFileDlg.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js index 158389f8f..9452df47f 100644 --- a/apps/common/main/lib/view/SignDialog.js +++ b/apps/common/main/lib/view/SignDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -179,7 +179,8 @@ define([ { value: 28, displayValue: "28" }, { value: 36, displayValue: "36" }, { value: 48, displayValue: "48" }, - { value: 72, displayValue: "72" } + { value: 72, displayValue: "72" }, + { value: 96, displayValue: "96" } ] }).on('selected', function(combo, record) { if (me.signObject) { diff --git a/apps/common/main/lib/view/SignSettingsDialog.js b/apps/common/main/lib/view/SignSettingsDialog.js index 59a1c25c3..ef425720c 100644 --- a/apps/common/main/lib/view/SignSettingsDialog.js +++ b/apps/common/main/lib/view/SignSettingsDialog.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/main/resources/img/header/dark-logo.png b/apps/common/main/resources/img/header/dark-logo.png new file mode 100644 index 000000000..857f2c82e Binary files /dev/null and b/apps/common/main/resources/img/header/dark-logo.png differ diff --git a/apps/common/main/resources/img/header/dark-logo@2x.png b/apps/common/main/resources/img/header/dark-logo@2x.png new file mode 100644 index 000000000..d427eb3f7 Binary files /dev/null and b/apps/common/main/resources/img/header/dark-logo@2x.png differ diff --git a/apps/common/main/resources/less/language-dialog.less b/apps/common/main/resources/less/language-dialog.less index 0d05cf1ee..8c7338f09 100644 --- a/apps/common/main/resources/less/language-dialog.less +++ b/apps/common/main/resources/less/language-dialog.less @@ -1,3 +1,37 @@ +// spell check indicator +.icon.spellcheck-lang { + width: 20px; + height: 20px; + position: absolute; +} + +li { + .icon.spellcheck-lang { + margin: -3px 4px 0 -24px; + } + + &.selected, a.checked { + .icon.spellcheck-lang { + background-position-x: -20px; --bgX: -20px; + } + } +} + +.dropdown-menu.lang-menu { + > li { + a.checked { + &:before { + display: none; + } + background-color: @primary; + + &, &:hover, &:focus { + color: @dropdown-link-active-color; + } + } + } +} + .combo-langs { .dropdown-menu { li .icon.lang-flag { @@ -7,12 +41,14 @@ .input-icon { position: absolute; - left: 5px; - top: 5px; - } - - input { - padding-left: 25px !important; + &.spellcheck-lang { // spell check indicator + left: 2px; + top: 1px; + } + &.lang-flag { // language flags + left: 5px; + top: 5px; + } } } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 8ef06f74f..5978e804f 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -257,6 +257,21 @@ } } + .toolbar-mask { + position: absolute; + top: 32px; + left: 48px; + right: 0; + bottom: 0; + opacity: 0; + background-color: @gray-light; + /* z-index: @zindex-tooltip + 1; */ + } + + &.toolbar-view .toolbar-mask{ + left: 0; + } + .top-title > & { &:not(.folded) { height: 28 + @height-controls; @@ -277,8 +292,120 @@ .box-tabs { height: 28px; } + + .toolbar-mask { + left: 0; + } + } +} + +.style-off-tabs { + .toolbar { + @underscore_height: 2px; + + .tabs, .extra { + background-color: transparent; + box-shadow: inset 0 -1px 0 0 @gray; + } + + .tabs { + ul { + padding: 0; + } + + li { + position: relative; + + &:after { + //transition: opacity .1s; + //transition: bottom .1s; + border-top: @underscore_height solid @gray-deep; + content: ''; + position: absolute; + width: 100%; + bottom: -@underscore_height; + opacity: 0; + } + + &.active { + background-color: transparent; + + &:after { + opacity: 1; + bottom: 0; + } + } + + &:hover:not(.active) { + background-color: rgba(0, 0, 0, .05); + //background-color: @secondary; + } + + > a { + color: @gray-deep; + } + } + } + + .extra { + #header-logo { + i { + .background-ximage('@{common-image-path}/header/dark-logo.png', '@{common-image-path}/header/dark-logo@2x.png', 86px); + } + } + } + + .tabs .scroll { + &.left { + box-shadow: 5px 0 20px 5px @gray-light; + } + + &.right { + box-shadow: -5px 0 20px 5px @gray-light; + } + + &:after { + border-color: @gray-deep; + } + } + + // TODO: move to appropriate module + .btn-header { + svg.icon { + fill: #000; + } + + &:hover:not(.disabled) { + background-color: @secondary; + } + + &:active, &.active { + &:not(.disabled) { + background-color: @primary; + + svg.icon { + fill: #fff; + } + } + } + } + + #rib-doc-name { + color: @gray-deep; + } + + &.editor-native-color { + .tabs li:after { + border-color: @tabs-bg-color; + } + } } + &.style-skip-docname .toolbar { + #box-doc-name > input { + display: none; + } + } } .toolbar-fullview-panel { diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.js b/apps/common/mobile/lib/component/ThemeColorPalette.js index cf8c9028c..f183868ba 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.js +++ b/apps/common/mobile/lib/component/ThemeColorPalette.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/mobile/utils/SharedSettings.js b/apps/common/mobile/utils/SharedSettings.js index 9b644d2c7..d1384ffa5 100644 --- a/apps/common/mobile/utils/SharedSettings.js +++ b/apps/common/mobile/utils/SharedSettings.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/mobile/utils/extendes.js b/apps/common/mobile/utils/extendes.js index b71e0bbf3..07e4f7fcd 100644 --- a/apps/common/mobile/utils/extendes.js +++ b/apps/common/mobile/utils/extendes.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/common/mobile/utils/utils.js b/apps/common/mobile/utils/utils.js index f5e6954c3..021595600 100644 --- a/apps/common/mobile/utils/utils.js +++ b/apps/common/mobile/utils/utils.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 2a269beb3..999c40b60 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/embed/js/ApplicationView.js b/apps/documenteditor/embed/js/ApplicationView.js index 046de676d..41fb404d8 100644 --- a/apps/documenteditor/embed/js/ApplicationView.js +++ b/apps/documenteditor/embed/js/ApplicationView.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/embed/js/application.js b/apps/documenteditor/embed/js/application.js index 2b0105028..785fd189e 100644 --- a/apps/documenteditor/embed/js/application.js +++ b/apps/documenteditor/embed/js/application.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index a996e4714..963a99082 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/collection/EquationGroups.js b/apps/documenteditor/main/app/collection/EquationGroups.js index e820dfa0d..db85a5498 100644 --- a/apps/documenteditor/main/app/collection/EquationGroups.js +++ b/apps/documenteditor/main/app/collection/EquationGroups.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/collection/Navigation.js b/apps/documenteditor/main/app/collection/Navigation.js index ab89bd852..20ee46bc1 100644 --- a/apps/documenteditor/main/app/collection/Navigation.js +++ b/apps/documenteditor/main/app/collection/Navigation.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/collection/ShapeGroups.js b/apps/documenteditor/main/app/collection/ShapeGroups.js index 40ae2e80f..fc7684e19 100644 --- a/apps/documenteditor/main/app/collection/ShapeGroups.js +++ b/apps/documenteditor/main/app/collection/ShapeGroups.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index a7283fbc9..68271c84a 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 07dd0f3f8..405267131 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -589,6 +589,9 @@ define([ /** coauthoring begin **/ this.leftMenu.btnComments.setDisabled(disable); + var comments = this.getApplication().getController('Common.Controllers.Comments'); + if (comments) + comments.setPreviewMode(disable); this.leftMenu.btnChat.setDisabled(disable); /** coauthoring end **/ this.leftMenu.btnPlugins.setDisabled(disable); diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 12e42053a..8afbc37cf 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 999f4001b..d1a306fc5 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -70,7 +70,6 @@ define([ toolbar: '#viewport #toolbar', leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings', rightMenu: '#viewport #right-menu', - header: '#viewport #header', statusBar: '#statusbar' }; @@ -589,12 +588,12 @@ define([ var app = this.getApplication(); if (this.appOptions.canEdit && this.editorConfig.mode !== 'view') { app.getController('RightMenu').getView('RightMenu').clearSelection(); - app.getController('Toolbar').DisableToolbar(disable, disable); app.getController('RightMenu').SetDisabled(disable, false); app.getController('Statusbar').getView('Statusbar').SetDisabled(disable); - app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable); } app.getController('LeftMenu').SetDisabled(disable, true); + app.getController('Toolbar').DisableToolbar(disable, disable); + app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable); }, goBack: function(current) { @@ -677,6 +676,10 @@ define([ this._state.fastCoauth) this.getApplication().getController('Common.Controllers.ReviewChanges').synchronizeChanges(); + if ( id == Asc.c_oAscAsyncAction['Open']) { + Common.Utils.InternalSettings.get("de-settings-livecomment") ? this.api.asc_showComments(Common.Utils.InternalSettings.get("de-settings-resolvedcomment")) : this.api.asc_hideComments(); + } + if ( type == Asc.c_oAscAsyncActionType.BlockInteraction && (!this.getApplication().getController('LeftMenu').dlgSearch || !this.getApplication().getController('LeftMenu').dlgSearch.isVisible()) && !( id == Asc.c_oAscAsyncAction['ApplyChanges'] && (this.dontCloseDummyComment || this.dontCloseChat || this.isModalShowed || this.inFormControl)) ) { @@ -1030,7 +1033,6 @@ define([ value = (value!==null) ? parseInt(value) : 0; var now = (new Date).getTime(); if (now - value > 86400000) { - Common.localStorage.setItem("de-license-warning", now); Common.UI.info({ width: 500, title: this.textNoLicenseTitle, @@ -1038,6 +1040,7 @@ define([ buttons: buttons, primary: primary, callback: function(btn) { + Common.localStorage.setItem("de-license-warning", now); if (btn == 'buynow') window.open('https://www.onlyoffice.com', "_blank"); else if (btn == 'contact') @@ -1156,6 +1159,10 @@ define([ this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object'); if (this.appOptions.canBranding) appHeader.setBranding(this.editorConfig.customization); + else if (typeof this.editorConfig.customization == 'object') { + this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarBreakTabs = + this.editorConfig.customization.toolbarHideFileName = false; + } this.appOptions.canRename && appHeader.setCanRename(true); @@ -1182,21 +1189,12 @@ define([ applyModeCommonElements: function() { window.editor_elements_prepared = true; - // var value = Common.localStorage.getItem("de-hidden-title"); - // value = this.appOptions.isEdit && (value!==null && parseInt(value) == 1); - var app = this.getApplication(), viewport = app.getController('Viewport').getView('Viewport'), - // headerView = app.getController('Viewport').getView('Common.Views.Header'), statusbarView = app.getController('Statusbar').getView('Statusbar'), documentHolder = app.getController('DocumentHolder').getView(), toolbarController = app.getController('Toolbar'); - // if (headerView) { - // headerView.setHeaderCaption(this.appOptions.isEdit ? 'Document Editor' : 'Document Viewer'); - // headerView.setVisible(!this.appOptions.nativeApp && !value && !this.appOptions.isDesktopApp); - // } - viewport && viewport.setMode(this.appOptions); statusbarView && statusbarView.setMode(this.appOptions); toolbarController.setMode(this.appOptions); @@ -1768,7 +1766,7 @@ define([ store.add({ imageUrl : shape.Image, data : {shapeType: shape.Type}, - tip : me.textShape + ' ' + (idx+1), + tip : me['txtShape_' + shape.Type] || (me.textShape + ' ' + (idx+1)), allowSelected : true, selected: false }); @@ -1839,20 +1837,23 @@ define([ }, loadLanguages: function(apiLangs) { - var langs = [], info; - _.each(apiLangs, function(lang, index, list){ - lang = parseInt(lang); - info = Common.util.LanguageInfo.getLocalLanguageName(lang); - langs.push({ - title: info[1], - tip: info[0], - code: lang - }); - }, this); + var langs = [], info, + allLangs = Common.util.LanguageInfo.getLanguages(); + for (var code in allLangs) { + if (allLangs.hasOwnProperty(code)) { + info = allLangs[code]; + info[2] && langs.push({ + displayValue: info[1], + value: info[0], + code: parseInt(code), + spellcheck: _.indexOf(apiLangs, code)>-1 + }); + } + } langs.sort(function(a, b){ - if (a.tip < b.tip) return -1; - if (a.tip > b.tip) return 1; + if (a.value < b.value) return -1; + if (a.value > b.value) return 1; return 0; }); @@ -1861,6 +1862,9 @@ define([ }, setLanguages: function() { + if (!this.languages || this.languages.length<1) { + this.loadLanguages([]); + } if (this.languages && this.languages.length>0) { this.getApplication().getController('DocumentHolder').getView().setLanguages(this.languages); this.getApplication().getController('Statusbar').setLanguages(this.languages); @@ -2110,7 +2114,7 @@ define([ var variationsArr = [], pluginVisible = false; item.variations.forEach(function(itemVar){ - var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, 'word'); + var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, 'word') && !itemVar.isSystem; if ( visible ) pluginVisible = true; if (item.isUICustomizer ) { @@ -2339,7 +2343,178 @@ define([ textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department', scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', errorEditingSaveas: 'An error occurred during the work with the document.
Use the \'Save as...\' option to save the file backup copy to your computer hard drive.', - errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' + errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.', + txtShape_textRect: 'Text Box', + txtShape_rect: 'Rectangle', + txtShape_ellipse: 'Ellipse', + txtShape_triangle: 'Triangle', + txtShape_rtTriangle: 'Right Triangle', + txtShape_parallelogram: 'Parallelogram', + txtShape_trapezoid: 'Trapezoid', + txtShape_diamond: 'Diamond', + txtShape_pentagon: 'Pentagon', + txtShape_hexagon: 'Hexagon', + txtShape_heptagon: 'Heptagon', + txtShape_octagon: 'Octagon', + txtShape_decagon: 'Decagon', + txtShape_dodecagon: 'Dodecagon', + txtShape_pie: 'Pie', + txtShape_chord: 'Chord', + txtShape_teardrop: 'Teardrop', + txtShape_frame: 'Frame', + txtShape_halfFrame: 'Half Frame', + txtShape_corner: 'Corner', + txtShape_diagStripe: 'Diagonal Stripe', + txtShape_plus: 'Plus', + txtShape_plaque: 'Sign', + txtShape_can: 'Can', + txtShape_cube: 'Cube', + txtShape_bevel: 'Bevel', + txtShape_donut: 'Donut', + txtShape_noSmoking: '"No" Symbol', + txtShape_blockArc: 'Block Arc', + txtShape_foldedCorner: 'Folded Corner', + txtShape_smileyFace: 'Smiley Face', + txtShape_heart: 'Heart', + txtShape_lightningBolt: 'Lightning Bolt', + txtShape_sun: 'Sun', + txtShape_moon: 'Moon', + txtShape_cloud: 'Cloud', + txtShape_arc: 'Arc', + txtShape_bracePair: 'Double Brace', + txtShape_leftBracket: 'Left Bracket', + txtShape_rightBracket: 'Right Bracket', + txtShape_leftBrace: 'Left Brace', + txtShape_rightBrace: 'Right Brace', + txtShape_rightArrow: 'Right Arrow', + txtShape_leftArrow: 'Left Arrow', + txtShape_upArrow: 'Up Arrow', + txtShape_downArrow: 'Down Arrow', + txtShape_leftRightArrow: 'Left Right Arrow', + txtShape_upDownArrow: 'Up Down Arrow', + txtShape_quadArrow: 'Quad Arrow', + txtShape_leftRightUpArrow: 'Left Right Up Arrow', + txtShape_bentArrow: 'Bent Arrow', + txtShape_uturnArrow: 'U-Turn Arrow', + txtShape_leftUpArrow: 'Left Up Arrow', + txtShape_bentUpArrow: 'Bent Up Arrow', + txtShape_curvedRightArrow: 'Curved Right Arrow', + txtShape_curvedLeftArrow: 'Curved Left Arrow', + txtShape_curvedUpArrow: 'Curved Up Arrow', + txtShape_curvedDownArrow: 'Curved Down Arrow', + txtShape_stripedRightArrow: 'Striped Right Arrow', + txtShape_notchedRightArrow: 'Notched Right Arrow', + txtShape_homePlate: 'Pentagon', + txtShape_chevron: 'Chevron', + txtShape_rightArrowCallout: 'Right Arrow Callout', + txtShape_downArrowCallout: 'Down Arrow Callout', + txtShape_leftArrowCallout: 'Left Arrow Callout', + txtShape_upArrowCallout: 'Up Arrow Callout', + txtShape_leftRightArrowCallout: 'Left Right Arrow Callout', + txtShape_quadArrowCallout: 'Quad Arrow Callout', + txtShape_circularArrow: 'Circular Arrow', + txtShape_mathPlus: 'Plus', + txtShape_mathMinus: 'Minus', + txtShape_mathMultiply: 'Multiply', + txtShape_mathDivide: 'Division', + txtShape_mathEqual: 'Equal', + txtShape_mathNotEqual: 'Not Equal', + txtShape_flowChartProcess: 'Flowchart: Process', + txtShape_flowChartAlternateProcess: 'Flowchart: Alternate Process', + txtShape_flowChartDecision: 'Flowchart: Decision', + txtShape_flowChartInputOutput: 'Flowchart: Data', + txtShape_flowChartPredefinedProcess: 'Flowchart: Predefined Process', + txtShape_flowChartInternalStorage: 'Flowchart: Internal Storage', + txtShape_flowChartDocument: 'Flowchart: Document', + txtShape_flowChartMultidocument: 'Flowchart: Multidocument ', + txtShape_flowChartTerminator: 'Flowchart: Terminator', + txtShape_flowChartPreparation: 'Flowchart: Preparation', + txtShape_flowChartManualInput: 'Flowchart: Manual Input', + txtShape_flowChartManualOperation: 'Flowchart: Manual Operation', + txtShape_flowChartConnector: 'Flowchart: Connector', + txtShape_flowChartOffpageConnector: 'Flowchart: Off-page Connector', + txtShape_flowChartPunchedCard: 'Flowchart: Card', + txtShape_flowChartPunchedTape: 'Flowchart: Punched Tape', + txtShape_flowChartSummingJunction: 'Flowchart: Summing Junction', + txtShape_flowChartOr: 'Flowchart: Or', + txtShape_flowChartCollate: 'Flowchart: Collate', + txtShape_flowChartSort: 'Flowchart: Sort', + txtShape_flowChartExtract: 'Flowchart: Extract', + txtShape_flowChartMerge: 'Flowchart: Merge', + txtShape_flowChartOnlineStorage: 'Flowchart: Stored Data', + txtShape_flowChartDelay: 'Flowchart: Delay', + txtShape_flowChartMagneticTape: 'Flowchart: Sequential Access Storage', + txtShape_flowChartMagneticDisk: 'Flowchart: Magnetic Disk', + txtShape_flowChartMagneticDrum: 'Flowchart: Direct Access Storage', + txtShape_flowChartDisplay: 'Flowchart: Display', + txtShape_irregularSeal1: 'Explosion 1', + txtShape_irregularSeal2: 'Explosion 2', + txtShape_star4: '4-Point Star', + txtShape_star5: '5-Point Star', + txtShape_star6: '6-Point Star', + txtShape_star7: '7-Point Star', + txtShape_star8: '8-Point Star', + txtShape_star10: '10-Point Star', + txtShape_star12: '12-Point Star', + txtShape_star16: '16-Point Star', + txtShape_star24: '24-Point Star', + txtShape_star32: '32-Point Star', + txtShape_ribbon2: 'Up Ribbon', + txtShape_ribbon: 'Down Ribbon', + txtShape_ellipseRibbon2: 'Curved Up Ribbon', + txtShape_ellipseRibbon: 'Curved Down Ribbon', + txtShape_verticalScroll: 'Vertical Scroll', + txtShape_horizontalScroll: 'Horizontal Scroll', + txtShape_wave: 'Wave', + txtShape_doubleWave: 'Double Wave', + txtShape_wedgeRectCallout: 'Rectangular Callout', + txtShape_wedgeRoundRectCallout: 'Rounded Rectangular Callout', + txtShape_wedgeEllipseCallout: 'Oval Callout', + txtShape_cloudCallout: 'Cloud Callout', + txtShape_borderCallout1: 'Line Callout 1', + txtShape_borderCallout2: 'Line Callout 2', + txtShape_borderCallout3: 'Line Callout 3', + txtShape_accentCallout1: 'Line Callout 1 (Accent Bar)', + txtShape_accentCallout2: 'Line Callout 2 (Accent Bar)', + txtShape_accentCallout3: 'Line Callout 3 (Accent Bar)', + txtShape_callout1: 'Line Callout 1 (No Border)', + txtShape_callout2: 'Line Callout 2 (No Border)', + txtShape_callout3: 'Line Callout 3 (No Border)', + txtShape_accentBorderCallout1: 'Line Callout 1 (Border and Accent Bar)', + txtShape_accentBorderCallout2: 'Line Callout 2 (Border and Accent Bar)', + txtShape_accentBorderCallout3: 'Line Callout 3 (Border and Accent Bar)', + txtShape_actionButtonBackPrevious: 'Back or Previous Button', + txtShape_actionButtonForwardNext: 'Forward or Next Button', + txtShape_actionButtonBeginning: 'Beginning Button', + txtShape_actionButtonEnd: 'End Button', + txtShape_actionButtonHome: 'Home Button', + txtShape_actionButtonInformation: 'Information Button', + txtShape_actionButtonReturn: 'Return Button', + txtShape_actionButtonMovie: 'Movie Button', + txtShape_actionButtonDocument: 'Document Button', + txtShape_actionButtonSound: 'Sound Button', + txtShape_actionButtonHelp: 'Help Button', + txtShape_actionButtonBlank: 'Blank Button', + txtShape_roundRect: 'Round Corner Rectangle', + txtShape_snip1Rect: 'Snip Single Corner Rectangle', + txtShape_snip2SameRect: 'Snip Same Side Corner Rectangle', + txtShape_snip2DiagRect: 'Snip Diagonal Corner Rectangle', + txtShape_snipRoundRect: 'Snip and Round Single Corner Rectangle', + txtShape_round1Rect: 'Round Single Corner Rectangle', + txtShape_round2SameRect: 'Round Same Side Corner Rectangle', + txtShape_round2DiagRect: 'Round Diagonal Corner Rectangle', + txtShape_line: 'Line', + txtShape_lineWithArrow: 'Arrow', + txtShape_lineWithTwoArrows: 'Double Arrow', + txtShape_bentConnector5: 'Elbow Connector', + txtShape_bentConnector5WithArrow: 'Elbow Arrow Connector', + txtShape_bentConnector5WithTwoArrows: 'Elbow Double-Arrow Connector', + txtShape_curvedConnector3: 'Curved Connector', + txtShape_curvedConnector3WithArrow: 'Curved Arrow Connector', + txtShape_curvedConnector3WithTwoArrows: 'Curved Double-Arrow Connector', + txtShape_spline: 'Curve', + txtShape_polyline1: 'Scribble', + txtShape_polyline2: 'Freeform' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js index db8234147..3ebd05091 100644 --- a/apps/documenteditor/main/app/controller/Navigation.js +++ b/apps/documenteditor/main/app/controller/Navigation.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/controller/PageLayout.js b/apps/documenteditor/main/app/controller/PageLayout.js index b454a0b13..a3930d06c 100644 --- a/apps/documenteditor/main/app/controller/PageLayout.js +++ b/apps/documenteditor/main/app/controller/PageLayout.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index a752c6f3e..d79e0ba8c 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index cdb4c001e..96d232761 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -215,8 +215,8 @@ define([ _onTextLanguage: function(langId) { var info = Common.util.LanguageInfo.getLocalLanguageName(langId); this.statusbar.setLanguage({ - tip: info[0], - title: info[1], + value: info[0], + displayValue: info[1], code: langId }); }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 0a6d52c89..e6bdb5c3c 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -1687,16 +1687,16 @@ define([ }, onNoControlsColor: function(item) { - this.api.asc_SetGlobalContentControlShowHighlight(!item.isChecked()); if (!item.isChecked()) - this.api.asc_SetGlobalContentControlHighlightColor(220, 220, 220); + this.api.asc_SetGlobalContentControlShowHighlight(true, 220, 220, 220); + else + this.api.asc_SetGlobalContentControlShowHighlight(false); }, onSelectControlsColor: function(picker, color) { var clr = Common.Utils.ThemeColor.getRgbColor(color); if (this.api) { - this.api.asc_SetGlobalContentControlShowHighlight(true); - this.api.asc_SetGlobalContentControlHighlightColor(clr.get_r(), clr.get_g(), clr.get_b()); + this.api.asc_SetGlobalContentControlShowHighlight(true, clr.get_r(), clr.get_g(), clr.get_b()); } Common.component.Analytics.trackEvent('ToolBar', 'Content Controls Color'); @@ -2037,16 +2037,6 @@ define([ } }, - // onHideTitleBar: function(item, checked) { - // var headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header'); - // headerView && headerView.setVisible(!checked); - // - // Common.localStorage.setItem('de-hidden-title', checked ? 1 : 0); - // - // Common.NotificationCenter.trigger('layout:changed', 'header'); - // Common.NotificationCenter.trigger('edit:complete', this.toolbar); - // }, - _clearBullets: function() { this.toolbar.btnMarkers.toggle(false, true); this.toolbar.btnNumbers.toggle(false, true); @@ -2783,15 +2773,17 @@ define([ me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); - // hide 'print' and 'save' buttons group and next separator - me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); + if (!(config.customization && config.customization.compactHeader)) { + // hide 'print' and 'save' buttons group and next separator + me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); - // hide 'undo' and 'redo' buttons and retrieve parent container - var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); + // hide 'undo' and 'redo' buttons and retrieve parent container + var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); - // move 'paste' button to the container instead of 'undo' and 'redo' - me.toolbar.btnPaste.$el.detach().appendTo($box); - me.toolbar.btnCopy.$el.removeClass('split'); + // move 'paste' button to the container instead of 'undo' and 'redo' + me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnCopy.$el.removeClass('split'); + } if ( config.isDesktopApp ) { if ( config.canProtect ) { diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index b6f1028c2..ded97ca41 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under @@ -76,7 +76,7 @@ define([ 'render:before' : function (toolbar) { var config = DE.getController('Main').appOptions; toolbar.setExtra('right', me.header.getPanel('right', config)); - if (!config.isEdit) + if (!config.isEdit || config.customization && !!config.customization.compactHeader) toolbar.setExtra('left', me.header.getPanel('left', config)); }, 'view:compact' : function (toolbar, state) { @@ -162,7 +162,15 @@ define([ if ( panel ) panel.height = _intvars.get('toolbar-height-tabs'); } - if ( config.isEdit ) { + if ( config.customization ) { + if ( config.customization.toolbarBreakTabs ) + me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs'); + + if ( config.customization.toolbarHideFileName ) + me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname'); + } + + if ( config.isEdit && (!(config.customization && config.customization.compactHeader))) { var $title = me.viewport.vlayout.getItem('title').el; $title.html(me.header.getPanel('title', config)).show(); $title.find('.extra').html(me.header.getPanel('left', config)); diff --git a/apps/documenteditor/main/app/model/EquationGroup.js b/apps/documenteditor/main/app/model/EquationGroup.js index be3bfe222..ff5c517cb 100644 --- a/apps/documenteditor/main/app/model/EquationGroup.js +++ b/apps/documenteditor/main/app/model/EquationGroup.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/model/Pages.js b/apps/documenteditor/main/app/model/Pages.js index d55205e0d..76b0f792b 100644 --- a/apps/documenteditor/main/app/model/Pages.js +++ b/apps/documenteditor/main/app/model/Pages.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/model/ShapeGroup.js b/apps/documenteditor/main/app/model/ShapeGroup.js index 0804326a3..a11d5d403 100644 --- a/apps/documenteditor/main/app/model/ShapeGroup.js +++ b/apps/documenteditor/main/app/model/ShapeGroup.js @@ -1,6 +1,6 @@ /* * - * (c) Copyright Ascensio System Limited 2010-2018 + * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) @@ -13,8 +13,8 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template index c9cccb90e..e313b8191 100644 --- a/apps/documenteditor/main/app/template/StatusBar.template +++ b/apps/documenteditor/main/app/template/StatusBar.template @@ -14,7 +14,6 @@