Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Maxim Kadushkin 2019-02-22 15:28:39 +03:00
parent e607c5f279
commit 963cd66d01
8 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/common/main/lib/controller/Chat.js
View file

@ -122,17 +122,7 @@ define([
this._isCoAuthoringStopped = true; this._isCoAuthoringStopped = true;
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
/*
setTimeout(_.bind(function(){
Common.UI.alert({
closable: false,
title: this.notcriticalErrorTitle,
msg: this.textUserLimit,
iconCls: 'warn',
buttons: ['ok']
});
}, this), 100);
*/
return; return;
} }
} }
@ -225,7 +215,6 @@ define([
} }
}, },
notcriticalErrorTitle: 'Warning', notcriticalErrorTitle: 'Warning'
textUserLimit: 'You are using ONLYOFFICE Editors free version.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Editors Pro version.<br><a href=\"http:\/\/www.onlyoffice.com\" target=\"_blank\">Read more</a>'
}, Common.Controllers.Chat || {})); }, Common.Controllers.Chat || {}));
}); });

2
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -44,7 +44,7 @@ var ApplicationController = new(function(){
// Initialize analytics // Initialize analytics
// ------------------------- // -------------------------
// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Document'); // Common.Analytics.initialize('UA-12442749-13', 'Embedded Document Editor');
// Check browser // Check browser

36
apps/documenteditor/main/app/view/FootnoteTip.js
View file

@ -2,24 +2,32 @@
* *
* (c) Copyright Ascensio System SIA 2010-2019 * (c) Copyright Ascensio System SIA 2010-2019
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is a free software product. You can redistribute it and/or
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * modify it under the terms of the GNU Affero General Public License (AGPL)
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that * version 3 as published by the Free Software Foundation. In accordance with
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights. * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
* *
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR * This program is distributed WITHOUT ANY WARRANTY; without even the implied
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
* *
* You can contact Ascensio System SIA by email at sales@onlyoffice.com * 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 ONLYOFFICE must display * The interactive user interfaces in modified source and object code versions
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3. * of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
* *
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains * Pursuant to Section 7(b) of the License you must retain the original Product
* relevant author attributions when distributing the software. If the display of the logo in its graphic * logo when distributing the program. Pursuant to Section 7(e) we decline to
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" * grant you any rights under trademark law for use of our trademarks.
* in every copy of the program you distribute. *
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks. * All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
* *
*/ */

2
apps/documenteditor/main/locale/en.json
View file

@ -1,7 +1,7 @@
{ {
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here", "Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>", "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
"Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",

2
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -45,7 +45,7 @@ var ApplicationController = new(function(){
// Initialize analytics // Initialize analytics
// ------------------------- // -------------------------
// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Presentation'); // Common.Analytics.initialize('UA-12442749-13', 'Embedded Presentation Editor');
// Check browser // Check browser

2
apps/presentationeditor/main/locale/en.json
View file

@ -1,7 +1,7 @@
{ {
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here", "Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>", "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
"Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",

2
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -47,7 +47,7 @@ var ApplicationController = new(function(){
// Initialize analytics // Initialize analytics
// ------------------------- // -------------------------
// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Spreadsheet'); // Common.Analytics.initialize('UA-12442749-13', 'Embedded Spreadsheet Editor');
// Check browser // Check browser

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2,7 +2,7 @@
"cancelButtonText": "Cancel", "cancelButtonText": "Cancel",
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here", "Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>", "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles", "Common.UI.ComboDataView.emptyComboText": "No styles",