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

[common] added 'Desktop' controller

Browse source
This commit is contained in:
Maxim Kadushkin 2018-02-22 02:23:32 +03:00
parent 5f1b291886
commit dcd1589adc
14 changed files with 104 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/api/documents/index.html.desktop
View file

@ -58,8 +58,6 @@
editorConfig: cfg,
events: {
onInternalMessage: onInternalMessage,
onDocumentReady: onDocumentReady
}
});
@ -97,7 +95,7 @@
function getEditorConfig(urlParams) {
return {
customization : {
goback: { url: "callback" }
goback: { url: "onlyoffice.com" }
},
mode : urlParams["mode"] || 'edit',
lang : urlParams["lang"] || 'en',

77
apps/common/main/lib/controller/Desktop.js Normal file
View file

@ -0,0 +1,77 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* Controller wraps up interaction with desktop app
*
* Created by Maxim.Kadushkin on 2/16/2018.
*/
define([
'core'
], function () {
'use strict';
var Desktop = function () {
var config = {};
var app = window.AscDesktopEditor;
// if ( app ) {
// app.execCommand('doc:onload', '');
// }
return {
init: function (opts) {
_.extend(config, opts);
if ( config.isDesktopApp ) {
Common.NotificationCenter.on('app:ready', function (config) {
!!app && app.execCommand('doc:onready', '');
});
}
},
process: function (opts) {
if ( opts == 'goback' ) {
if ( config.isDesktopApp && !!app ) {
app.execCommand('go:folder',
config.isOffline ? 'offline' : config.customization.goback.url);
return true;
}
return false;
}
}
};
};
Common.Controllers.Desktop = new Desktop();
});

1
apps/documenteditor/main/app.js
View file

@ -203,6 +203,7 @@ require([
,'common/main/lib/controller/ExternalMergeEditor'
,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop'
], function() {
app.start();
});

8
apps/documenteditor/main/app/controller/Main.js
View file

@ -314,6 +314,8 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
Common.Controllers.Desktop.init(this.appOptions);
},
loadDocument: function(data) {
@ -582,11 +584,7 @@ define([
},
goBack: function(blank) {
var me = this;
if ( me.appOptions.customization.goback.url == 'callback' ) {
Common.Gateway.internalMessage( 'goback',
{status: me.appOptions.isOffline ? 'offline' : 'online'} );
} else {
if ( !Common.Controllers.Desktop.process('goback') ) {
var href = this.appOptions.customization.goback.url;
if (blank) {
window.open(href, "_blank");

1
apps/documenteditor/main/app_dev.js
View file

@ -193,6 +193,7 @@ require([
,'common/main/lib/controller/ExternalMergeEditor'
,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop'
], function() {
window.compareVersions = true;
app.start();

4
apps/documenteditor/main/index.html.deploy
View file

@ -217,6 +217,10 @@
.replace(/>/g, '>');
}
if ( window.AscDesktopEditor ) {
window.AscDesktopEditor.execCommand('doc:onload', '');
}
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',

1
apps/presentationeditor/main/app.js
View file

@ -190,6 +190,7 @@ require([
'common/main/lib/controller/ExternalDiagramEditor'
,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop'
], function() {
app.start();
});

7
apps/presentationeditor/main/app/controller/Main.js
View file

@ -295,6 +295,8 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
Common.Controllers.Desktop.init(this.appOptions);
},
loadDocument: function(data) {
@ -394,10 +396,7 @@ define([
goBack: function(blank) {
var me = this;
if ( me.appOptions.customization.goback.url == 'callback' ) {
Common.Gateway.internalMessage( 'goback',
{status: me.appOptions.isOffline ? 'offline' : 'online'} );
} else {
if ( !Common.Controllers.Desktop.process('goback') ) {
var href = me.appOptions.customization.goback.url;
if (blank) {
window.open(href, "_blank");

1
apps/presentationeditor/main/app_dev.js
View file

@ -181,6 +181,7 @@ require([
'common/main/lib/controller/ExternalDiagramEditor'
,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop'
], function() {
window.compareVersions = true;
app.start();

4
apps/presentationeditor/main/index.html.deploy
View file

@ -217,6 +217,10 @@
.replace(/>/g, '&gt;');
}
if ( window.AscDesktopEditor ) {
window.AscDesktopEditor.execCommand('doc:onload', '');
}
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',

1
apps/spreadsheeteditor/main/app.js
View file

@ -196,6 +196,7 @@ require([
'common/main/lib/controller/Plugins'
,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop'
], function() {
app.start();
});

6
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -335,6 +335,7 @@ define([
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
Common.Controllers.Desktop.init(this.appOptions);
},
loadDocument: function(data) {
@ -429,10 +430,7 @@ define([
goBack: function(blank) {
var me = this;
if ( me.appOptions.customization.goback.url == 'callback' ) {
Common.Gateway.internalMessage( 'goback',
{status: me.appOptions.isOffline ? 'offline' : 'online'} );
} else {
if ( !Common.Controllers.Desktop.process('goback') ) {
var href = me.appOptions.customization.goback.url;
if (blank) {
window.open(href, "_blank");

1
apps/spreadsheeteditor/main/app_dev.js
View file

@ -186,6 +186,7 @@ require([
'common/main/lib/controller/Plugins'
,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop'
], function() {
window.compareVersions = true;
app.start();

4
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -216,6 +216,10 @@
.replace(/>/g, '&gt;');
}
if ( window.AscDesktopEditor ) {
window.AscDesktopEditor.execCommand('doc:onload', '');
}
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',