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

Merge commit '1bac56bb701bc589088522f8800ccc7ad278abd6' into release/v5.3.0

Browse source 
# Conflicts:
#	apps/documenteditor/mobile/index.html.deploy
#	apps/presentationeditor/mobile/index.html.deploy
#	apps/spreadsheeteditor/mobile/index.html.deploy
This commit is contained in:
Alexander Yuzhin 2019-03-21 09:38:08 +03:00
parent 40869ada36 1bac56bb70
commit 2aae4b3ee5
13 changed files with 25 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -191,7 +191,6 @@ define([
this.api.asc_registerCallback('asc_onPrintUrl', _.bind(this.onPrintUrl, this));
this.api.asc_registerCallback('asc_onMeta', _.bind(this.onMeta, this));
this.api.asc_registerCallback('asc_onSpellCheckInit', _.bind(this.loadLanguages, this));
this.api.asc_registerCallback('asc_onLicenseError', _.bind(this.onPaidFeatureError, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
@ -1088,26 +1087,6 @@ define([
}
},
onPaidFeatureError: function() {
var buttons = [], primary,
mail = (this.appOptions.canBranding) ? ((this.editorConfig && this.editorConfig.customization && this.editorConfig.customization.customer) ? this.editorConfig.customization.customer.mail : '') : 'sales@onlyoffice.com';
if (mail.length>0) {
buttons.push({value: 'contact', caption: this.textContactUs});
primary = 'contact';
}
buttons.push({value: 'close', caption: this.textClose});
Common.UI.info({
title: this.textPaidFeature,
msg : this.textLicencePaidFeature,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:'+mail, "_blank");
}
});
},
onOpenDocument: function(progress) {
var elem = document.getElementById('loadmask-text');
var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
@ -2381,7 +2360,6 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>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.<br>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.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',

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

@ -401,7 +401,7 @@
"DE.Controllers.Main.textCloseTip": "Click to close the tip",
"DE.Controllers.Main.textContactUs": "Contact sales",
"DE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"DE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"del_DE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"DE.Controllers.Main.textLoadingDocument": "Loading document",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"DE.Controllers.Main.textPaidFeature": "Paid feature",

2
apps/documenteditor/mobile/index.html.deploy
View file

@ -185,7 +185,7 @@
var ua = navigator.userAgent;
if (/Sailfish/.test(ua) || /Jolla/.test(ua)) {
document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.js"><\/script>');
document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.min.js"><\/script>');
if (!/R7OfficeApp/.test(ua)) {
var ua = navigator.userAgent + ';Android 5.0;';

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

@ -178,7 +178,6 @@ define([
this.api.asc_registerCallback('asc_onMeta', _.bind(this.onMeta, this));
this.api.asc_registerCallback('asc_onAdvancedOptions', _.bind(this.onAdvancedOptions, this));
this.api.asc_registerCallback('asc_onSpellCheckInit', _.bind(this.loadLanguages, this));
this.api.asc_registerCallback('asc_onLicenseError', _.bind(this.onPaidFeatureError, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
@ -842,26 +841,6 @@ define([
}
},
onPaidFeatureError: function() {
var buttons = [], primary,
mail = (this.appOptions.canBranding) ? ((this.editorConfig && this.editorConfig.customization && this.editorConfig.customization.customer) ? this.editorConfig.customization.customer.mail : '') : 'sales@onlyoffice.com';
if (mail.length>0) {
buttons.push({value: 'contact', caption: this.textContactUs});
primary = 'contact';
}
buttons.push({value: 'close', caption: this.textClose});
Common.UI.info({
title: this.textPaidFeature,
msg : this.textLicencePaidFeature,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:'+mail, "_blank");
}
});
},
disableEditing: function(disable) {
var app = this.getApplication();
if (this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
@ -2146,7 +2125,6 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>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.<br>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.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',

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

@ -313,7 +313,7 @@
"PE.Controllers.Main.textCloseTip": "Click to close the tip",
"PE.Controllers.Main.textContactUs": "Contact sales",
"PE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"PE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"del_PE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"PE.Controllers.Main.textLoadingDocument": "Loading presentation",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"PE.Controllers.Main.textPaidFeature": "Paid feature",

2
apps/presentationeditor/mobile/index.html.deploy
View file

@ -185,7 +185,7 @@
var ua = navigator.userAgent;
if (/Sailfish/.test(ua) || /Jolla/.test(ua)) {
document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.js"><\/script>');
document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.min.js"><\/script>');
if (!/R7OfficeApp/.test(ua)) {
var ua = navigator.userAgent + ';Android 5.0;';

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

@ -165,7 +165,6 @@ define([
this.api.asc_registerCallback('asc_onDocumentName', _.bind(this.onDocumentName, this));
this.api.asc_registerCallback('asc_onPrintUrl', _.bind(this.onPrintUrl, this));
this.api.asc_registerCallback('asc_onMeta', _.bind(this.onMeta, this));
this.api.asc_registerCallback('asc_onLicenseError', _.bind(this.onPaidFeatureError, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
Common.NotificationCenter.on('namedrange:locked', _.bind(this.onNamedRangeLocked, this));
@ -870,26 +869,6 @@ define([
}
},
onPaidFeatureError: function() {
var buttons = [], primary,
mail = (this.appOptions.canBranding) ? ((this.editorConfig && this.editorConfig.customization && this.editorConfig.customization.customer) ? this.editorConfig.customization.customer.mail : '') : 'sales@onlyoffice.com';
if (mail.length>0) {
buttons.push({value: 'contact', caption: this.textContactUs});
primary = 'contact';
}
buttons.push({value: 'close', caption: this.textClose});
Common.UI.info({
title: this.textPaidFeature,
msg : this.textLicencePaidFeature,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:'+mail, "_blank");
}
});
},
disableEditing: function(disable) {
var app = this.getApplication();
if (this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
@ -2334,7 +2313,6 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>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.<br>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.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',

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

@ -484,7 +484,7 @@
"SSE.Controllers.Main.textConfirm": "Confirmation",
"SSE.Controllers.Main.textContactUs": "Contact sales",
"SSE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"SSE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"del_SSE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet",
"SSE.Controllers.Main.textNo": "No",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",

2
apps/spreadsheeteditor/mobile/index.html.deploy
View file

@ -184,7 +184,7 @@
var ua = navigator.userAgent;
if (/Sailfish/.test(ua) || /Jolla/.test(ua)) {
document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.js"><\/script>');
document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.min.js"><\/script>');
if (!/R7OfficeApp/.test(ua)) {
var ua = navigator.userAgent + ';Android 5.0;';

2
build/Gruntfile.js
View file

@ -116,6 +116,7 @@ module.exports = function(grunt) {
doRegisterTask('underscore');
doRegisterTask('zeroclipboard');
doRegisterTask('bootstrap');
doRegisterTask('iscroll');
doRegisterTask('jszip');
doRegisterTask('jsziputils');
doRegisterTask('requirejs', function(defaultConfig, packageFile) {
@ -434,6 +435,7 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-megapixel', ['megapixel-init', 'clean', 'copy']);
grunt.registerTask('deploy-jquery', ['jquery-init', 'clean', 'copy']);
grunt.registerTask('deploy-underscore', ['underscore-init', 'clean', 'copy']);
grunt.registerTask('deploy-iscroll', ['iscroll-init', 'clean', 'copy']);
grunt.registerTask('deploy-bootstrap', ['bootstrap-init', 'clean', 'copy']);
grunt.registerTask('deploy-jszip', ['jszip-init', 'clean', 'copy']);
grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']);

14
build/common.json
View file

@ -1,7 +1,7 @@
{
"name": "common",
"version": "4.3.0",
"build": 35,
"build": 37,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {
@ -181,6 +181,17 @@
}
}
},
"iscroll": {
"clean": [
"../deploy/web-apps/vendor/iscroll"
],
"copy": {
"script": {
"src": "../vendor/iscroll/iscroll.min.js",
"dest": "../deploy/web-apps/vendor/iscroll/iscroll.min.js"
}
}
},
"requirejs": {
"clean": [
"../deploy/web-apps/vendor/requirejs"
@ -202,6 +213,7 @@
"deploy-jquery",
"deploy-underscore",
"deploy-bootstrap",
"deploy-iscroll",
"deploy-jszip",
"deploy-jsziputils"
]

3
vendor/iscroll/iscroll.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
vendor/iscroll/iscroll.min.js.map vendored Normal file
View file

File diff suppressed because one or more lines are too long