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

Merge with hotfix/v5.2.4

Browse source
This commit is contained in:
Julia Radzhabova 2018-12-11 16:27:35 +03:00
parent e27a99043e a23304f77c
commit 1d2d38ec1e
94 changed files with 201 additions and 485 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

346
apps/api/documents/index.html
View file

@ -1,346 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>ONLYOFFICE Documents</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/>
<meta name="description" content="" />
<meta name="keywords" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-touch-fullscreen" content="yes">
<style type="text/css">
html {
height: 100%;
}
body {
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
}
#wrap {
position:absolute;
left:0;
top:0;
right:0;
bottom:0;
}
</style>
</head>
<body>
<div id="wrap">
<div id="placeholder"></div>
</div>
<script type="text/javascript" src="api.js"></script>
<script>
(function() {
// Url parameters
var urlParams = getUrlParams(),
cfg = getEditorConfig(urlParams),
doc = getDocumentData(urlParams);
// Document Editor
var docEditor = new DocsAPI.DocEditor('placeholder', {
type: urlParams['type'],
width: '100%',
height: '100%',
documentType: urlParams['doctype'] || 'text',
document: doc,
editorConfig: cfg,
events: {
'onReady': onDocEditorReady,
'onDocumentStateChange': onDocumentStateChange,
'onRequestEditRights': onRequestEditRights,
'onRequestHistory': onRequestHistory,
'onRequestHistoryData': onRequestHistoryData,
'onRequestEmailAddresses': onRequestEmailAddresses,
'onRequestStartMailMerge': onRequestStartMailMerge,
'onRequestHistoryClose': onRequestHistoryClose,
'onError': onError
}
});
// Document Editor event handlers
function onRequestEmailAddresses() {
docEditor.setEmailAddresses({emailAddresses: ['aaa@mail.ru'], createEmailAccountUrl: 'http://ya.ru'});
}
function onRequestHistory() {
docEditor.refreshHistory({
'currentVersion': 3,
'history': [
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'changes': null,
'created': '1/18/2015 6:38 PM',
'version': 1,
'versionGroup': 1,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'changes': [
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'created': '1/19/2015 6:30 PM'
},
{
'user': {
'id': '8952d4ee-e8a5-42bf-11f0-6cd77801ec15',
'name': 'Александр Трофимов'
},
'created': '1/19/2015 6:32 PM'
},
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'created': '1/19/2015 6:38 PM'
}
],
'created': '2/19/2015 6:38 PM',
'version': 2,
'versionGroup': 1,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '895255ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Me'
},
'changes': null,
'created': '2/21/2015 6:38 PM',
'version': 3,
'versionGroup': 2,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '8952d4ee-e8a5-42bf-11f0-6cd77801ec15',
name: 'Александр Трофимов'
},
'changes': null,
'created': '2/22/2015 6:37 PM',
'version': 4,
'versionGroup': 3,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '8952d4ee-e8a5-42bf-11f0-6cd33801ec15',
name: 'Леонид Орлов'
},
'changes': null,
'created': '2/24/2015 6:29 PM',
'version': 5,
'versionGroup': 3,
'key': 'wyX9AwRq_677SWKjhfk='
}]
});
}
function onRequestHistoryData(revision) {
docEditor.setHistoryData(
{
'version': revision.data,
'url': 'http://isa2',
'urlDiff': 'http://isa2',
'changesUrl': 'http://isa2'
}
);
}
function onRequestStartMailMerge() {
docEditor.processMailMerge(true, 'some error message');
}
function onRequestHistoryClose() {
// reload page
}
function onDocEditorReady(event) {
if (event.target) {
//console.log('Ready! Editor: ', event.target);
}
}
function onDocumentStateChange(event) {
var isModified = event.data;
//console.log(isModified);
}
function onRequestEditRights(event) {
// occurs whenever the user tryes to enter edit mode
docEditor.applyEditRights(true, "Someone is editing this document right now. Please try again later.");
}
function onError(event) {
// critical error happened
// examine event.data.errorCode and event.data.errorDescription for details
}
function onDownloadAs(event) {
// return url of downloaded doc
// console.log(event.data);
}
// helpers
function getUrlParams() {
var e,
a = /\+/g, // Regex for replacing addition symbol with a space
r = /([^&=]+)=?([^&]*)/g,
d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
q = window.location.search.substring(1),
urlParams = {};
while (e = r.exec(q))
urlParams[d(e[1])] = d(e[2]);
return urlParams;
}
function getDocumentData(urlParams) {
return {
key: urlParams["key"],
url: urlParams["url"] || '_offline_',
title: urlParams["title"],
fileType: urlParams["filetype"],
vkey: urlParams["vkey"],
permissions: {
edit: true,
download: true,
reader: true
}
};
}
function getEditorConfig(urlParams) {
return {
mode : urlParams["mode"] || 'edit',
lang : urlParams["lang"] || 'en',
canCoAuthoring : true,
createUrl : 'http://www.example.com/create',
user: {
id: urlParams["userid"] || 'uid-901', firstname: urlParams["userfname"] || 'Mitchell', lastname: urlParams["userlname"] || 'Hamish'
},
recent : [
{title: 'Memory.docx', url: 'http://onlyoffice.com', folder: 'Document Editor'},
{title: 'Description.doc', url: 'http://onlyoffice.com', folder: 'Document Editor'},
{title: 'DocEditor_right.xsl', url: 'http://onlyoffice.com', folder: 'Spreadsheet Editor'},
{title: 'api.rtf', url: 'http://onlyoffice.com', folder: 'Unnamed folder'}
],
// templates : [
// {name: 'Contracts', icon: '../../api/documents/resources/templates/contracts.png', url: 'http://...'},
// {name: 'Letter', icon: '../../api/documents/resources/templates/letter.png', url: 'http://...'},
// {name: 'List', icon: '../../api/documents/resources/templates/list.png', url: 'http://...'},
// {name: 'Plan', icon: '../../api/documents/resources/templates/plan.png', url: 'http://...'}
// ],
embedded : {
embedUrl : 'http://onlyoffice.com/embed',
fullscreenUrl : 'http://onlyoffice.com/fullscreen',
saveUrl : 'http://onlyoffice.com/download',
shareUrl : 'http://tl.com/72b4la97',
toolbarDocked : 'top'
}
,customization: {
// logo: {
// image: 'https://dylnrgbh910l3.cloudfront.net/studio/tag/i8.8.237/skins/default/images/onlyoffice_logo/editor_logo_general.png', // default size 86 x 20
// imageEmbedded: 'https://d2hw9csky753gb.cloudfront.net/studio/tag/i8.8.237/skins/default/images/onlyoffice_logo/editor_embedded_logo.png', // default size 124 x 20
// url: 'http://...'
// },
// backgroundColor: '#ffffff',
// textColor: '#ff0000',
// customer: {
// name: 'SuperPuper',
// address: 'New-York, 125f-25',
// mail: 'support@gmail.com',
// www: 'www.superpuper.com',
// info: 'Some info',
// logo: 'https://img.imgsmail.ru/r/default/portal/0.1.29/logo.png' // default size 216 x 35
// },
// goback: {text: 'Go To London', url: 'http://...'},
about: true,
feedback: true
}
};
}
// Mobile version
function isMobile(){
var prefixes = {
ios: 'i(?:Pad|Phone|Pod)(?:.*)CPU(?: iPhone)? OS ',
android: '(Android |HTC_|Silk/)',
blackberry: 'BlackBerry(?:.*)Version\/',
rimTablet: 'RIM Tablet OS ',
webos: '(?:webOS|hpwOS)\/',
bada: 'Bada\/'
},
i, prefix, match;
for (i in prefixes){
if (prefixes.hasOwnProperty(i)) {
prefix = prefixes[i];
if (navigator.userAgent.match(new RegExp('(?:'+prefix+')([^\\s;]+)')))
return true;
}
}
return false;
}
var fixSize = function() {
var wrapEl = document.getElementById('wrap');
if (wrapEl){
wrapEl.style.height = screen.availHeight + 'px';
window.scrollTo(0, -1);
wrapEl.style.height = window.innerHeight + 'px';
}
};
var fixIpadLandscapeIos7 = function() {
if (navigator.userAgent.match(/iPad;.*CPU.*OS 7_\d/i)) {
var wrapEl = document.getElementById('wrap');
if (wrapEl){
wrapEl.style.position = "fixed";
wrapEl.style.bottom = 0;
wrapEl.style.width = "100%";
}
}
};
if (isMobile()){
window.addEventListener('load', fixSize);
window.addEventListener('resize', fixSize);
fixIpadLandscapeIos7();
}
})();
</script>
</body>
</html>

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

@ -58,6 +58,7 @@
editorConfig: cfg,
events: {
onInternalMessage: onInternalMessage,
onRequestClose: e => {return 0;}
}
});

5
apps/common/main/lib/controller/Desktop.js
View file

@ -70,6 +70,11 @@ define([
}
return false;
},
requestClose: function () {
if ( config.isDesktopApp && !!app ) {
app.execCommand('editor:request', JSON.stringify({action:'close', url: config.customization.goback.url}));
}
}
};
};

2
apps/common/main/lib/controller/Plugins.js
View file

@ -63,7 +63,7 @@ define([
var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption};
me.$toolbarPanelPlugins = me.panelPlugins.getPanel();
toolbar.addTab(tab, me.$toolbarPanelPlugins, 4); // TODO: clear plugins list in left panel
toolbar.addTab(tab, me.$toolbarPanelPlugins, 10); // TODO: clear plugins list in left panel
}
}
},

5
apps/common/main/lib/view/About.js
View file

@ -61,7 +61,7 @@ define([
this.template = _.template([
'<table id="id-about-licensor-logo" cols="1" style="width: 100%; margin-top: 20px;">',
'<tr>',
'<td align="center"><div><img class="asc-about-office"></div></td>',
'<td align="center"><div class="asc-about-office"></div></td>',
'</tr>',
'<tr>',
'<td align="center"><label class="asc-about-version">' + options.appName.toUpperCase() + '</label></td>',
@ -77,7 +77,7 @@ define([
'<tr>',
'<td colspan="3" align="center" class="padding-small">',
'<label class="asc-about-desc-name">' + this.txtAddress + '</label>',
'<label class="asc-about-desc">' + this.txtAscAddress + '</label>',
'<label class="asc-about-desc">' + "20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050" + '</label>',
'</td>',
'</tr>',
'<tr>',
@ -247,7 +247,6 @@ define([
txtLicensor: 'LICENSOR',
txtLicensee: 'LICENSEE',
txtAddress: 'address: ',
txtAscAddress: 'Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021',
txtMail: 'email: ',
txtTel: 'tel.: ',
txtEdition: 'Integration Edition '

13
apps/common/main/lib/view/Header.js
View file

@ -204,11 +204,12 @@ define([
if ( me.logo )
me.logo.children(0).on('click', function (e) {
var _url = !!me.branding && !!me.branding.logo && !!me.branding.logo.url ?
me.branding.logo.url : 'http://www.onlyoffice.com';
var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus();
var _url = !!me.branding && !!me.branding.logo && (me.branding.logo.url!==undefined) ?
me.branding.logo.url : 'https://www.onlyoffice.com';
if (_url) {
var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus();
}
});
onResetUsers(storeUsers);
@ -412,6 +413,7 @@ define([
if (this.branding && this.branding.logo && this.branding.logo.image && this.logo) {
this.logo.html('<img src="' + this.branding.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
this.logo.css({'background-image': 'none', width: 'auto'});
(this.branding.logo.url || this.branding.logo.url===undefined) && this.logo.addClass('link');
}
return $html;
@ -522,6 +524,7 @@ define([
if (element) {
element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
element.css({'background-image': 'none', width: 'auto'});
(value.logo.url || value.logo.url===undefined) && element.addClass('link');
}
}
}

5
apps/common/main/lib/view/LanguageDialog.js
View file

@ -109,7 +109,8 @@ define([
if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
var langname = Common.util.LanguageInfo.getLocalLanguageName(this.options.current);
this.cmbLanguage.setValue(langname[0], langname[1]);
this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
},
@ -133,7 +134,7 @@ define([
plang = icon.attr('lang');
if (plang) icon.removeClass(plang);
icon.addClass(rec.value).attr('lang',rec.value);
rec && icon.addClass(rec.value).attr('lang',rec.value);
},
onPrimary: function() {

15
apps/common/main/resources/less/about.less
View file

@ -2,13 +2,16 @@
.asc-about-office {
background-repeat: no-repeat;
margin-bottom: 5px;
content: data-uri('@{common-image-path}/about/logo.png');
@media
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min-resolution: 2dppx),
only screen and (min-resolution: 192dpi) {
content: data-uri('@{common-image-path}/about/logo@2x.png');
&:before {
content: data-uri('@{common-image-path}/about/logo.png');
@media
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min-resolution: 2dppx),
only screen and (min-resolution: 192dpi) {
content: data-uri('@{common-image-path}/about/logo@2x.png');
}
}
}

2
apps/common/main/resources/less/header.less
View file

@ -144,7 +144,7 @@
.background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px);
}
img {
&.link img {
cursor: pointer;
}
}

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

@ -1068,7 +1068,7 @@ define([
var elem = document.getElementById('loadmask-text');
var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%';
elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc);
elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc);
},
onEditorPermissions: function(params) {
@ -1932,8 +1932,10 @@ define([
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value));
me.loadMask && me.loadMask.show();
}
} else
} else {
Common.Gateway.requestClose();
Common.Controllers.Desktop.requestClose();
}
me._state.openDlg = null;
}
});
@ -2094,7 +2096,8 @@ define([
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
isEdit = this.appOptions.isEdit;
if (plugins) {
var arr = [], arrUI = [];
var arr = [], arrUI = [],
lang = this.appOptions.lang.split(/[\-\_]/)[0];
plugins.pluginsData.forEach(function(item){
if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
@ -2111,8 +2114,12 @@ define([
visible && arrUI.push(item.baseUrl + itemVar.url);
} else {
var model = new Common.Models.PluginVariation(itemVar);
var description = itemVar.description;
if (typeof itemVar.descriptionLocale == 'object')
description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || '';
model.set({
description: description,
index: variationsArr.length,
url: itemVar.url,
icons: itemVar.icons,
@ -2123,9 +2130,13 @@ define([
}
});
if (variationsArr.length>0 && !item.isUICustomizer)
if (variationsArr.length>0 && !item.isUICustomizer) {
var name = item.name;
if (typeof item.nameLocale == 'object')
name = item.nameLocale[lang] || item.nameLocale['en'] || name || '';
arr.push(new Common.Models.Plugin({
name : item.name,
name : name,
guid: item.guid,
baseUrl : item.baseUrl,
variations: variationsArr,
@ -2134,6 +2145,7 @@ define([
groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0
}));
}
});
if ( uiCustomize!==false ) // from ui customizer in editor config or desktop event

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

@ -1141,6 +1141,7 @@ define([
onFontNameSelect: function(combo, record) {
if (this.api) {
if (record.isNewFont) {
!this.getApplication().getController('Main').isModalShowed &&
Common.UI.warning({
width: 500,
closable: false,

5
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -614,6 +614,7 @@ define([
var coord = specialPasteShowOptions.asc_getCellCoord(),
pasteContainer = me.cmpEl.find('#special-paste-container'),
pasteItems = specialPasteShowOptions.asc_getOptions();
if (!pasteItems) return;
// Prepare menu container
if (pasteContainer.length < 1) {
@ -772,13 +773,15 @@ define([
}
if (props && props.get_Checked()===false && props.get_Variants() !== null && props.get_Variants() !== undefined) {
me.addWordVariants();
if (me.textMenu.isVisible()) {
if (me.textMenu && me.textMenu.isVisible()) {
me.textMenu.alignPosition();
}
}
};
this.addWordVariants = function(isParagraph) {
if (!me.textMenu) return;
if (_.isUndefined(isParagraph)) {
isParagraph = me.textMenu.isVisible();
}

12
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -376,8 +376,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -515,8 +517,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -242,8 +242,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -381,8 +383,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

1
apps/documenteditor/main/locale/cs.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCE",
"Common.Views.About.txtLicensor": "UDĚLOVATEL LICENCE",
"Common.Views.About.txtMail": "email:",

1
apps/documenteditor/main/locale/de.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "Adresse:",
"Common.Views.About.txtAscAddress": "Lubanas St. 125a-25, Riga, Lettland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LIZENZNEHMER",
"Common.Views.About.txtLicensor": "LIZENZGEBER",
"Common.Views.About.txtMail": "E-Mail-Adresse: ",

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

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",

1
apps/documenteditor/main/locale/es.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "dirección: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENCIATARIO ",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "email: ",

1
apps/documenteditor/main/locale/fr.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresse: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonie, EU, LV-1021",
"Common.Views.About.txtLicensee": "CESSIONNAIRE",
"Common.Views.About.txtLicensor": "CONCÉDANT",
"Common.Views.About.txtMail": "émail: ",

1
apps/documenteditor/main/locale/it.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "indirizzo: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENZIATARIO",
"Common.Views.About.txtLicensor": "CONCEDENTE",
"Common.Views.About.txtMail": "email: ",

1
apps/documenteditor/main/locale/ja.json
View file

@ -99,7 +99,6 @@
"Common.Utils.Metric.txtCm": "センチ",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "アドレス：",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ライセンシー",
"Common.Views.About.txtLicensor": "ライセンサー\t",
"Common.Views.About.txtMail": "メール",

1
apps/documenteditor/main/locale/ko.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "주소 :",
"Common.Views.About.txtAscAddress": "Lubanas 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email :",

1
apps/documenteditor/main/locale/lv.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",

1
apps/documenteditor/main/locale/nl.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENTIEHOUDER",
"Common.Views.About.txtLicensor": "LICENTIEVERLENER",
"Common.Views.About.txtMail": "e-mail:",

1
apps/documenteditor/main/locale/pl.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCJOBIORCA",
"Common.Views.About.txtLicensor": "LICENCJODAWCA",
"Common.Views.About.txtMail": "e-mail:",

1
apps/documenteditor/main/locale/pt.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "Pt",
"Common.Views.About.txtAddress": "endereço:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENÇA",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "e-mail:",

1
apps/documenteditor/main/locale/ru.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "пт",
"Common.Views.About.txtAddress": "адрес: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ",
"Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР",
"Common.Views.About.txtMail": "email: ",

1
apps/documenteditor/main/locale/sk.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "DRŽITEĽ LICENCIE",
"Common.Views.About.txtLicensor": "UDEĽOVATEĽ LICENCIE",
"Common.Views.About.txtMail": "e-mail: ",

1
apps/documenteditor/main/locale/sl.json
View file

@ -96,7 +96,6 @@
"Common.UI.Window.textWarning": "Opozorilo",
"Common.UI.Window.yesButtonText": "Da",
"Common.Views.About.txtAddress": "naslov:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvija, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCE",
"Common.Views.About.txtLicensor": "DAJALEC LICENCE",
"Common.Views.About.txtMail": "e-naslov:",

1
apps/documenteditor/main/locale/tr.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonya, AB, LV-1021",
"Common.Views.About.txtLicensee": "LİSANS SAHİBİ",
"Common.Views.About.txtLicensor": "LİSANS VEREN",
"Common.Views.About.txtMail": "eposta:",

1
apps/documenteditor/main/locale/uk.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "Пт",
"Common.Views.About.txtAddress": "адреса:",
"Common.Views.About.txtAscAddress": "Вул. Лубанас 125а-25, Рига, Латвія, ЄС, LV-1021",
"Common.Views.About.txtLicensee": "ЛІЦЕНЗІЯ",
"Common.Views.About.txtLicensor": "Ліцензіар",
"Common.Views.About.txtMail": "пошта:",

1
apps/documenteditor/main/locale/vi.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "địa chỉ:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "NGƯỜI ĐƯỢC CẤP GIẤY PHÉP",
"Common.Views.About.txtLicensor": "NGƯỜI CẤP GIẤY PHÉP",
"Common.Views.About.txtMail": "email:",

1
apps/documenteditor/main/locale/zh.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "厘米",
"Common.Utils.Metric.txtPt": "像素",
"Common.Views.About.txtAddress": "地址：",
"Common.Views.About.txtAscAddress": "卢巴纳斯125a-25，里加，拉脱维亚，欧盟，LV-1021",
"Common.Views.About.txtLicensee": "被许可人",
"Common.Views.About.txtLicensor": "许可",
"Common.Views.About.txtMail": "电子邮件：",

2
apps/documenteditor/mobile/app/template/Settings.template
View file

@ -426,7 +426,7 @@
</div>
<div class="content-block">
<h3 id="settings-about-name" class="vendor">Ascensio System SIA</h3>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021</a></p>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050</a></p>
<p><label><%= scope.textEmail %>:</label><a id="settings-about-email" class="external" target="_blank" href="mailto:support@onlyoffice.com">support@onlyoffice.com</a></p>
<p><label><%= scope.textTel %>:</label><a id="settings-about-tel" class="external" target="_blank" href="tel:+371 660-16425">+371 660-16425</a></p>
<p><a id="settings-about-url" class="external" target="_blank" href="http://www.onlyoffice.com">www.onlyoffice.com</a></p>

2
apps/presentationeditor/main/app.reporter.js
View file

@ -107,7 +107,7 @@ require([
docInfo.put_VKey(data.vkey);
docInfo.put_Options(data.options);
docInfo.put_Token(data.token);
docInfo.put_Permissions( data.permissions);
docInfo.put_Permissions(data.permissions || {});
window.document.title = 'Presenter View' + (data.title ? (' - ' + data.title) : '');
}

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

@ -841,7 +841,7 @@ define([
var elem = document.getElementById('loadmask-text');
var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%';
elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc);
elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc);
},
onEditorPermissions: function(params) {
@ -1776,8 +1776,10 @@ define([
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value));
me.loadMask && me.loadMask.show();
}
} else
} else {
Common.Gateway.requestClose();
Common.Controllers.Desktop.requestClose();
}
me._state.openDlg = null;
}
});
@ -1841,7 +1843,8 @@ define([
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
isEdit = this.appOptions.isEdit;
if (plugins) {
var arr = [], arrUI = [];
var arr = [], arrUI = [],
lang = this.appOptions.lang.split(/[\-\_]/)[0];
plugins.pluginsData.forEach(function(item){
if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
@ -1858,8 +1861,12 @@ define([
visible && arrUI.push(item.baseUrl + itemVar.url);
} else {
var model = new Common.Models.PluginVariation(itemVar);
var description = itemVar.description;
if (typeof itemVar.descriptionLocale == 'object')
description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || '';
model.set({
description: description,
index: variationsArr.length,
url: itemVar.url,
icons: itemVar.icons,
@ -1869,9 +1876,13 @@ define([
variationsArr.push(model);
}
});
if (variationsArr.length>0 && !item.isUICustomizer)
if (variationsArr.length>0 && !item.isUICustomizer) {
var name = item.name;
if (typeof item.nameLocale == 'object')
name = item.nameLocale[lang] || item.nameLocale['en'] || name || '';
arr.push(new Common.Models.Plugin({
name : item.name,
name : name,
guid: item.guid,
baseUrl : item.baseUrl,
variations: variationsArr,
@ -1880,6 +1891,7 @@ define([
groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0
}));
}
});
if (uiCustomize!==false) // from ui customizer in editor config or desktop event

3
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -258,7 +258,6 @@ define([
toolbar.btnPrint.on('click', _.bind(this.onPrint, this));
toolbar.btnPrint.on('disabled', _.bind(this.onBtnChangeState, this, 'print:disabled'));
toolbar.btnSave.on('click', _.bind(this.onSave, this));
toolbar.btnSave.on('disabled', _.bind(this.onBtnChangeState, this, 'save:disabled'));
toolbar.btnUndo.on('click', _.bind(this.onUndo, this));
toolbar.btnUndo.on('disabled', _.bind(this.onBtnChangeState, this, 'undo:disabled'));
toolbar.btnRedo.on('click', _.bind(this.onRedo, this));
@ -1085,6 +1084,7 @@ define([
onFontNameSelect: function(combo, record) {
if (this.api) {
if (record.isNewFont) {
!this.getApplication().getController('Main').isModalShowed &&
Common.UI.warning({
width: 500,
closable: false,
@ -2017,6 +2017,7 @@ define([
if ( $panel )
me.toolbar.addTab(tab, $panel, 3);
me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
if ( config.isDesktopApp ) {
// hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();

5
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -724,13 +724,15 @@ define([
}
if (props && props.get_Checked()===false && props.get_Variants() !== null && props.get_Variants() !== undefined) {
me.addWordVariants();
if (me.textMenu.isVisible()) {
if (me.textMenu && me.textMenu.isVisible()) {
me.textMenu.alignPosition();
}
}
};
this.addWordVariants = function(isParagraph) {
if (!me.textMenu) return;
if (_.isUndefined(isParagraph)) {
isParagraph = me.textMenu.isVisible();
}
@ -1506,6 +1508,7 @@ define([
var coord = specialPasteShowOptions.asc_getCellCoord(),
pasteContainer = me.cmpEl.find('#special-paste-container'),
pasteItems = specialPasteShowOptions.asc_getOptions();
if (!pasteItems) return;
// Prepare menu container
if (pasteContainer.length < 1) {

12
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -361,8 +361,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -496,8 +498,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

6
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -572,8 +572,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

12
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -363,8 +363,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -502,8 +504,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

2
apps/presentationeditor/main/app_dev.reporter.js
View file

@ -108,7 +108,7 @@ require([
docInfo.put_VKey(data.vkey);
docInfo.put_Options(data.options);
docInfo.put_Token(data.token);
docInfo.put_Permissions( data.permissions);
docInfo.put_Permissions(data.permissions || {});
window.document.title = 'Presenter View' + (data.title ? (' - ' + data.title) : '');
}

1
apps/presentationeditor/main/locale/cs.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "DRŽITEL LICENCE",
"Common.Views.About.txtLicensor": "UDĚLOVATEL LICENCE",
"Common.Views.About.txtMail": "email:",

1
apps/presentationeditor/main/locale/de.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "Adresse: ",
"Common.Views.About.txtAscAddress": "Lubanas St. 125a-25, Riga, Lettland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LIZENZNEHMER",
"Common.Views.About.txtLicensor": "LIZENZGEBER",
"Common.Views.About.txtMail": "E-Mail-Adresse: ",

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

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",

1
apps/presentationeditor/main/locale/es.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "dirección: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENCIATARIO ",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "email: ",

1
apps/presentationeditor/main/locale/fr.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresse: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonie, EU, LV-1021",
"Common.Views.About.txtLicensee": "CESSIONNAIRE",
"Common.Views.About.txtLicensor": "CONCÉDANT",
"Common.Views.About.txtMail": "émail: ",

1
apps/presentationeditor/main/locale/it.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "indirizzo: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENZIATARIO",
"Common.Views.About.txtLicensor": "CONCEDENTE",
"Common.Views.About.txtMail": "email: ",

1
apps/presentationeditor/main/locale/ja.json
View file

@ -41,7 +41,6 @@
"Common.Utils.Metric.txtCm": "センチ",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "アドレス：",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ライセンス",
"Common.Views.About.txtLicensor": "ライセンサー",
"Common.Views.About.txtMail": "メール：",

1
apps/presentationeditor/main/locale/ko.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "주소 :",
"Common.Views.About.txtAscAddress": "Lubanas 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email :",

1
apps/presentationeditor/main/locale/lv.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",

1
apps/presentationeditor/main/locale/nl.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENTIEHOUDER",
"Common.Views.About.txtLicensor": "LICENTIEVERLENER",
"Common.Views.About.txtMail": "e-mail:",

1
apps/presentationeditor/main/locale/pl.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCJOBIORCA",
"Common.Views.About.txtLicensor": "LICENCJODAWCA",
"Common.Views.About.txtMail": "e-mail:",

1
apps/presentationeditor/main/locale/pt.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "Pt",
"Common.Views.About.txtAddress": "endereço:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENÇA",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "e-mail:",

1
apps/presentationeditor/main/locale/ru.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "пт",
"Common.Views.About.txtAddress": "адрес: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ",
"Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР",
"Common.Views.About.txtMail": "email: ",

1
apps/presentationeditor/main/locale/sk.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "DRŽITEĽ LICENCIE",
"Common.Views.About.txtLicensor": "UDEĽOVATEĽ LICENCIE",
"Common.Views.About.txtMail": "e-mail: ",

1
apps/presentationeditor/main/locale/sl.json
View file

@ -38,7 +38,6 @@
"Common.UI.Window.textWarning": "Opozorilo",
"Common.UI.Window.yesButtonText": "Da",
"Common.Views.About.txtAddress": "naslov:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvija, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCE",
"Common.Views.About.txtLicensor": "DAJALEC LICENCE",
"Common.Views.About.txtMail": "e-naslov:",

1
apps/presentationeditor/main/locale/tr.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonya, AB, LV-1021",
"Common.Views.About.txtLicensee": "LİSANS SAHİBİ",
"Common.Views.About.txtLicensor": "LİSANS VEREN",
"Common.Views.About.txtMail": "Eposta:",

1
apps/presentationeditor/main/locale/uk.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "Пт",
"Common.Views.About.txtAddress": "адреса:",
"Common.Views.About.txtAscAddress": "Вул. Лубанас 125а-25, Рига, Латвія, ЄС, LV-1021",
"Common.Views.About.txtLicensee": "ЛІЦЕНЗІЯ",
"Common.Views.About.txtLicensor": "Ліцензіар",
"Common.Views.About.txtMail": "пошта:",

1
apps/presentationeditor/main/locale/vi.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "địa chỉ:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "NGƯỜI ĐƯỢC CẤP GIẤY PHÉP",
"Common.Views.About.txtLicensor": "NGƯỜI CẤP GIẤY PHÉP",
"Common.Views.About.txtMail": "email:",

1
apps/presentationeditor/main/locale/zh.json
View file

@ -43,7 +43,6 @@
"Common.Utils.Metric.txtCm": "厘米",
"Common.Utils.Metric.txtPt": "像素",
"Common.Views.About.txtAddress": "地址：",
"Common.Views.About.txtAscAddress": "卢巴纳斯125a-25，里加，拉脱维亚，欧盟，LV-1021",
"Common.Views.About.txtLicensee": "被许可人",
"Common.Views.About.txtLicensor": "许可",
"Common.Views.About.txtMail": "电子邮件：",

2
apps/presentationeditor/mobile/app/template/Settings.template
View file

@ -228,7 +228,7 @@
</div>
<div class="content-block">
<h3 id="settings-about-name" class="vendor">Ascensio System SIA</h3>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021</a></p>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050</a></p>
<p><label><%= scope.textEmail %>:</label><a id="settings-about-email" class="external" target="_blank" href="mailto:support@onlyoffice.com">support@onlyoffice.com</a></p>
<p><label><%= scope.textTel %>:</label><a id="settings-about-tel" class="external" target="_blank" href="tel:+371 660-16425">+371 660-16425</a></p>
<p><a id="settings-about-url" class="external" target="_blank" href="http://www.onlyoffice.com">www.onlyoffice.com</a></p>

3
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1848,6 +1848,8 @@ define([
},
onFormulaCompleteMenu: function(funcarr) {
if (!this.documentHolder.funcMenu) return;
if (funcarr) {
var me = this,
documentHolderView = me.documentHolder,
@ -1958,6 +1960,7 @@ define([
coord = specialPasteShowOptions.asc_getCellCoord(),
pasteContainer = documentHolderView.cmpEl.find('#special-paste-container'),
pasteItems = specialPasteShowOptions.asc_getOptions();
if (!pasteItems) return;
// Prepare menu container
if (pasteContainer.length < 1) {

4
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -353,6 +353,10 @@ define([
value = resolved = true;
(value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments();
value = Common.localStorage.getBool("sse-settings-r1c1");
Common.Utils.InternalSettings.set("sse-settings-r1c1", value);
this.api.asc_setR1C1Mode(value);
if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
value = Common.localStorage.getBool("sse-settings-coauthmode", true);
Common.Utils.InternalSettings.set("sse-settings-coauthmode", value);

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

@ -331,6 +331,10 @@ define([
}
if (value) this.api.asc_setLocalization(value);
value = Common.localStorage.getBool("sse-settings-r1c1");
Common.Utils.InternalSettings.set("sse-settings-r1c1", value);
this.api.asc_setR1C1Mode(value);
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
@ -865,7 +869,7 @@ define([
var elem = document.getElementById('loadmask-text');
var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%';
elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc);
elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc);
},
onEditorPermissions: function(params) {
@ -1598,8 +1602,10 @@ define([
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value));
me.loadMask && me.loadMask.show();
}
} else
} else {
Common.Gateway.requestClose();
Common.Controllers.Desktop.requestClose();
}
me._state.openDlg = null;
}
});
@ -2027,7 +2033,8 @@ define([
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
isEdit = this.appOptions.isEdit;
if (plugins) {
var arr = [], arrUI = [];
var arr = [], arrUI = [],
lang = this.appOptions.lang.split(/[\-\_]/)[0];
plugins.pluginsData.forEach(function(item){
if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
@ -2044,8 +2051,12 @@ define([
visible && arrUI.push(item.baseUrl + itemVar.url);
} else {
var model = new Common.Models.PluginVariation(itemVar);
var description = itemVar.description;
if (typeof itemVar.descriptionLocale == 'object')
description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || '';
model.set({
description: description,
index: variationsArr.length,
url: itemVar.url,
icons: itemVar.icons,
@ -2055,9 +2066,13 @@ define([
variationsArr.push(model);
}
});
if (variationsArr.length>0 && !item.isUICustomizer)
if (variationsArr.length>0 && !item.isUICustomizer) {
var name = item.name;
if (typeof item.nameLocale == 'object')
name = item.nameLocale[lang] || item.nameLocale['en'] || name || '';
arr.push(new Common.Models.Plugin({
name : item.name,
name : name,
guid: item.guid,
baseUrl : item.baseUrl,
variations: variationsArr,
@ -2066,6 +2081,7 @@ define([
groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0
}));
}
});
if (uiCustomize!==false) // from ui customizer in editor config or desktop event

7
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1310,6 +1310,7 @@ define([
onFontNameSelect: function(combo, record) {
if (this.api) {
if (record.isNewFont) {
!this.getApplication().getController('Main').isModalShowed &&
Common.UI.warning({
width: 500,
closable: false,
@ -3100,7 +3101,7 @@ define([
tab = {action: 'pivot', caption: me.textPivot};
$panel = me.getApplication().getController('PivotTable').createToolbarPanel();
if ($panel) {
me.toolbar.addTab(tab, $panel, 4);
me.toolbar.addTab(tab, $panel, 3);
me.toolbar.setVisible('pivot', true);
}
}
@ -3108,7 +3109,7 @@ define([
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel )
me.toolbar.addTab(tab, $panel, 5);
me.toolbar.addTab(tab, $panel, 4);
if ( config.isDesktopApp ) {
// hide 'print' and 'save' buttons group and next separator
@ -3125,7 +3126,7 @@ define([
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
if ($panel)
me.toolbar.addTab(tab, $panel, 6);
me.toolbar.addTab(tab, $panel, 5);
}
}
}

2
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -983,6 +983,8 @@ define([
var win = new SSE.Views.CellRangeDialog({
handler: handlerDlg
}).on('close', function() {
me.api.asc_onCloseChartFrame();
});
win.show();

15
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -513,6 +513,10 @@ define([
'<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
'<td class="right"><span id="fms-chb-forcesave" /></td>',
'</tr>','<tr class="divider forcesave"></tr>',
'<tr>',
'<td class="left"><label><%= scope.textRefStyle %></label></td>',
'<td class="right"><div id="fms-chb-r1c1-style"/></td>',
'</tr>','<tr class="divider"></tr>',
'<tr class="coauth changes">',
'<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
'<td class="right">',
@ -573,6 +577,11 @@ define([
labelText: this.strResolvedComment
});
this.chR1C1Style = new Common.UI.CheckBox({
el: $('#fms-chb-r1c1-style'),
labelText: this.strR1C1
});
this.cmbCoAuthMode = new Common.UI.ComboBox({
el : $('#fms-cmb-coauth-mode'),
style : 'width: 160px;',
@ -754,6 +763,7 @@ define([
/** coauthoring begin **/
this.chLiveComment.setValue(Common.Utils.InternalSettings.get("sse-settings-livecomment"));
this.chResolvedComment.setValue(Common.Utils.InternalSettings.get("sse-settings-resolvedcomment"));
this.chR1C1Style.setValue(Common.Utils.InternalSettings.get("sse-settings-r1c1"));
var fast_coauth = Common.Utils.InternalSettings.get("sse-settings-coauthmode");
item = this.cmbCoAuthMode.store.findWhere({value: fast_coauth ? 1 : 0});
@ -805,6 +815,7 @@ define([
if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring)
Common.localStorage.setItem("sse-settings-coauthmode", this.cmbCoAuthMode.getValue());
/** coauthoring end **/
Common.localStorage.setItem("sse-settings-r1c1", this.chR1C1Style.isChecked() ? 1 : 0);
Common.localStorage.setItem("sse-settings-fontrender", this.cmbFontRender.getValue());
Common.localStorage.setItem("sse-settings-unit", this.cmbUnit.getValue());
Common.localStorage.setItem("sse-settings-autosave", this.chAutosave.isChecked() ? 1 : 0);
@ -889,7 +900,9 @@ define([
txtInch: 'Inch',
textForceSave: 'Save to Server',
strForcesave: 'Always save to server (otherwise save to server on document close)',
strResolvedComment: 'Turn on display of the resolved comments'
strResolvedComment: 'Turn on display of the resolved comments',
textRefStyle: 'Reference Style',
strR1C1: 'Turn on R1C1 style'
}, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));
SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

8
apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -155,12 +155,8 @@ define([
validateOnChange: true,
validateOnBlur: false,
validation : function(value) {
var isvalid = /^[A-Z]+[1-9]\d*:[A-Z]+[1-9]\d*$/.test(value);
if (!isvalid)
isvalid = /^[A-Z]+[1-9]\d*$/.test(value);
if (isvalid) {
var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.FormatTable, value, false);
if (isvalid == Asc.c_oAscError.ID.No) {
return true;
} else {
return me.textInvalidRange;

12
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -372,8 +372,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -511,8 +513,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

12
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -364,8 +364,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -503,8 +505,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

1
apps/spreadsheeteditor/main/locale/cs.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "DRŽITEL LICENCE",
"Common.Views.About.txtLicensor": "UDĚLOVATEL LICENCE",
"Common.Views.About.txtMail": "email:",

1
apps/spreadsheeteditor/main/locale/de.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "Adresse: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LIZENZNEHMER",
"Common.Views.About.txtLicensor": "LIZENZGEBER",
"Common.Views.About.txtMail": "E-Mail-Adresse: ",

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

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",
@ -1332,6 +1331,8 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Reference Style",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strR1C1": "Turn on R1C1 style",
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet",

1
apps/spreadsheeteditor/main/locale/es.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "dirección: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENCIATARIO ",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "email: ",

1
apps/spreadsheeteditor/main/locale/fr.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresse: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonie, EU, LV-1021",
"Common.Views.About.txtLicensee": "CESSIONNAIRE",
"Common.Views.About.txtLicensor": "CONCÉDANT",
"Common.Views.About.txtMail": "émail: ",

1
apps/spreadsheeteditor/main/locale/it.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "indirizzo: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENZIATARIO",
"Common.Views.About.txtLicensor": "CONCEDENTE",
"Common.Views.About.txtMail": "email: ",

1
apps/spreadsheeteditor/main/locale/ja.json
View file

@ -38,7 +38,6 @@
"Common.Utils.Metric.txtCm": "センチ",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "アドレス：",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ライセンス",
"Common.Views.About.txtLicensor": "ライセンサー",
"Common.Views.About.txtMail": "メール：",

1
apps/spreadsheeteditor/main/locale/ko.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "주소 :",
"Common.Views.About.txtAscAddress": "Lubanas 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email :",

1
apps/spreadsheeteditor/main/locale/lv.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",

1
apps/spreadsheeteditor/main/locale/nl.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letland, EU, LV-1021",
"Common.Views.About.txtLicensee": "Licentiehouder",
"Common.Views.About.txtLicensor": "LICENTIEVERLENER",
"Common.Views.About.txtMail": "e-mail:",

1
apps/spreadsheeteditor/main/locale/pl.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCJOBIORCA",
"Common.Views.About.txtLicensor": "LICENCJODAWCA",
"Common.Views.About.txtMail": "e-mail:",

1
apps/spreadsheeteditor/main/locale/pt.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "endereço:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENÇA",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "e-mail:",

3
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "пт",
"Common.Views.About.txtAddress": "адрес: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ",
"Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР",
"Common.Views.About.txtMail": "email: ",
@ -1323,6 +1322,8 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Пункт",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Русский",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "как Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Стиль ссылок",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strR1C1": "Включить стиль R1C1",
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Внимание",
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "C помощью пароля",
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Защитить электронную таблицу",

1
apps/spreadsheeteditor/main/locale/sk.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "DRŽITEĽ LICENCIE",
"Common.Views.About.txtLicensor": "UDEĽOVATEĽ LICENCIE",
"Common.Views.About.txtMail": "e-mail: ",

1
apps/spreadsheeteditor/main/locale/sl.json
View file

@ -35,7 +35,6 @@
"Common.UI.Window.textWarning": "Opozorilo",
"Common.UI.Window.yesButtonText": "Da",
"Common.Views.About.txtAddress": "naslov:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvija, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCE",
"Common.Views.About.txtLicensor": "DAJALEC LICENCE",
"Common.Views.About.txtMail": "e-naslov:",

1
apps/spreadsheeteditor/main/locale/tr.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonya, AB, LV-1021",
"Common.Views.About.txtLicensee": "LİSANS SAHİBİ",
"Common.Views.About.txtLicensor": "LİSANS VEREN",
"Common.Views.About.txtMail": "Eposta:",

1
apps/spreadsheeteditor/main/locale/uk.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "Пт",
"Common.Views.About.txtAddress": "адреса:",
"Common.Views.About.txtAscAddress": "Вул. Лубанас 125а-25, Рига, Латвія, ЄС, LV-1021",
"Common.Views.About.txtLicensee": "ЛІЦЕНЗІЯ",
"Common.Views.About.txtLicensor": "Ліцензіар",
"Common.Views.About.txtMail": "пошта:",

1
apps/spreadsheeteditor/main/locale/vi.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "địa chỉ:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "NGƯỜI ĐƯỢC CẤP GIẤY PHÉP",
"Common.Views.About.txtLicensor": "NGƯỜI CẤP GIẤY PHÉP",
"Common.Views.About.txtMail": "email:",

1
apps/spreadsheeteditor/main/locale/zh.json
View file

@ -40,7 +40,6 @@
"Common.Utils.Metric.txtCm": "厘米",
"Common.Utils.Metric.txtPt": "像素",
"Common.Views.About.txtAddress": "地址：",
"Common.Views.About.txtAscAddress": "卢巴纳斯125a-25，里加，拉脱维亚，欧盟，LV-1021",
"Common.Views.About.txtLicensee": "被许可人",
"Common.Views.About.txtLicensor": "许可",
"Common.Views.About.txtMail": "电子邮件：",

2
apps/spreadsheeteditor/mobile/app/template/Settings.template
View file

@ -266,7 +266,7 @@
</div>
<div class="content-block">
<h3 id="settings-about-name" class="vendor">Ascensio System SIA</h3>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021</a></p>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050</a></p>
<p><label><%= scope.textEmail %>:</label><a id="settings-about-email" class="external" target="_blank" href="mailto:support@onlyoffice.com">support@onlyoffice.com</a></p>
<p><label><%= scope.textTel %>:</label><a id="settings-about-tel" class="external" target="_blank" href="tel:+371 660-16425">+371 660-16425</a></p>
<p><a id="settings-about-url" class="external" target="_blank" href="http://www.onlyoffice.com">www.onlyoffice.com</a></p>

4
apps/spreadsheeteditor/mobile/app/view/Statusbar.js
View file

@ -90,8 +90,8 @@ define([
var $el = tab.get('el');
if ( $el ) {
var rightbound = this.$boxTabs.width();
var left = tab.position().left,
right = left + parseInt(tab.css('width'));
var left = $el.position().left,
right = left + parseInt($el.css('width'));
if (left < 0) {
this.$boxTabs.scrollLeft(/*this.$boxTabs.scrollLeft() + */left - 26);

8
build/Gruntfile.js
View file

@ -423,9 +423,11 @@ module.exports = function(grunt) {
grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4));
});
//quick workaround for build desktop version
var copyTask = grunt.option('desktop')? "copy": "copy:script";
grunt.registerTask('deploy-api', ['api-init', 'clean', 'copy', 'replace:writeVersion']);
grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', 'copy']);
grunt.registerTask('deploy-api', ['api-init', 'clean', copyTask, 'replace:writeVersion']);
grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]);
grunt.registerTask('deploy-sockjs', ['sockjs-init', 'clean', 'copy']);
grunt.registerTask('deploy-xregexp', ['xregexp-init', 'clean', 'copy']);
@ -482,4 +484,4 @@ module.exports = function(grunt) {
'deploy-documenteditor-component',
'deploy-spreadsheeteditor-component',
'deploy-presentationeditor-component']);
};
};

8
build/common.json
View file

@ -48,6 +48,10 @@
"dest": "../deploy/sdkjs/slide/"
}
]
},
"desktop": {
"src": "../../sdkjs/common/HtmlFileInternal/AllFonts.js",
"dest": "../deploy/sdkjs/common/AllFonts.js"
}
}
},
@ -64,6 +68,10 @@
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
},
"desktop": {
"src": "../apps/api/documents/index.html.desktop",
"dest": "../deploy/web-apps/apps/api/documents/index.html"
}
}
},