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

Merge branch 'develop' into feature/symbol-table

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-13 14:55:17 +03:00
parent d01da7458f 56042f4c89
commit 3b0cb57e4e
41 changed files with 423 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/api/documents/api.js
View file

@ -798,6 +798,7 @@
iframe.allowFullscreen = true;
iframe.setAttribute("allowfullscreen",""); // for IE11
iframe.setAttribute("onmousewheel",""); // for Safari on Mac
iframe.setAttribute("allow", "autoplay");
if (config.type == "mobile")
{

19
apps/common/main/lib/component/TabBar.js
View file

@ -103,6 +103,8 @@ define([
var me = this,
length = me.bar.tabs.length,
barBounds = me.bar.$bar.get(0).getBoundingClientRect();
me.leftBorder = barBounds.left;
me.rightBorder = barBounds.right;
if (barBounds) {
me.bounds = [];
@ -324,18 +326,29 @@ define([
function dragMove (event) {
if (!_.isUndefined(me.drag)) {
me.drag.moveX = event.clientX*Common.Utils.zoom();
if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) {
if (me.drag.moveX < me.leftBorder) {
me.scrollLeft -= 20;
me.bar.$bar.scrollLeft(me.scrollLeft);
me.calculateBounds();
} else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) {
var name = $(event.target).parent().data('label'),
currentTab = _.findIndex(bar.tabs, {label: name});
if (currentTab !== -1 && (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft)) {
if (currentTab === -1) {
bar.$el.find('li.mousemove').removeClass('mousemove right');
me.drag.place = undefined;
} else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) {
me.drag.place = currentTab;
$(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right');
$(event.target).parent().addClass('mousemove');
}
} else if ((me.drag.moveX > me.lastTabRight - me.scrollLeft) && (me.tabBarRight >= me.lastTabRight - me.scrollLeft)) { //move to end of list, right border of the right tab is visible
} else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible
bar.$el.find('li.mousemove').removeClass('mousemove right');
bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right');
me.drag.place = bar.tabs.length;
} else if (me.drag.moveX - me.rightBorder > 3) {
me.scrollLeft += 20;
me.bar.$bar.scrollLeft(me.scrollLeft);
me.calculateBounds();
}
}
}

3
apps/common/main/lib/controller/Comments.js
View file

@ -821,6 +821,7 @@ define([
}
},
onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
var apihint = hint;
var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
if (hint && this.isSelectedComment && same_uids && !this.isModeChanged) {
@ -886,7 +887,7 @@ define([
this.animate = false;
}
this.isSelectedComment = !hint || !this.hintmode;
this.isSelectedComment = !apihint || !this.hintmode;
this.uids = _.clone(uids);
comments.push(comment);

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

@ -177,7 +177,7 @@ define([
if (historyStore && data!==null) {
var rev, revisions = historyStore.findRevisions(data.version),
urlGetTime = new Date();
var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url,
docId = opts.data.key ? opts.data.key : this.currentDocId,
docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev,

6
apps/common/main/lib/view/ListSettingsDialog.js
View file

@ -100,7 +100,7 @@ define([
this.spnSize = new Common.UI.MetricSpinner({
el : $window.find('#id-dlg-list-size'),
step : 1,
width : 45,
width : 53,
value : 100,
defaultUnit : '',
maxValue : 400,
@ -113,7 +113,7 @@ define([
});
this.btnColor = new Common.UI.ColorButton({
style: "width:45px;",
style: "width:53px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
@ -151,7 +151,7 @@ define([
this.spnStart = new Common.UI.MetricSpinner({
el : $window.find('#id-dlg-list-start'),
step : 1,
width : 45,
width : 53,
value : 1,
defaultUnit : '',
maxValue : 32767,

BIN
apps/common/main/resources/img/controls/common-controls@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

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

@ -402,6 +402,10 @@ DE.ApplicationController = new(function(){
message = me.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
message = me.errorUpdateVersionOnDisconnect;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -558,6 +562,7 @@ DE.ApplicationController = new(function(){
waitText: 'Please, wait...',
textLoadingDocument: 'Loading document',
txtClose: 'Close',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
}
})();

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

@ -22,6 +22,7 @@
"DE.ApplicationController.unknownErrorText": "Unknown error.",
"DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"DE.ApplicationController.waitText": "Please, wait...",
"DE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
"DE.ApplicationView.txtDownload": "Download",
"DE.ApplicationView.txtEmbed": "Embed",
"DE.ApplicationView.txtFullScreen": "Full Screen",

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

@ -366,6 +366,7 @@ define([
if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs ||
(this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) {
$('#editor-container').css('overflow', 'hidden');
$('#editor-container').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
}
@ -1055,6 +1056,7 @@ define([
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
Common.Gateway.documentReady();
$('#editor-container').css('overflow', '');
$('.doc-placeholder').remove();
},
@ -1497,6 +1499,10 @@ define([
config.msg = this.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
config.msg = this.errorUpdateVersionOnDisconnect;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2473,7 +2479,8 @@ define([
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
txtMainDocOnly: 'Error! Main Document Only.',
txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.',
txtNoText: 'Error! No text of specified style in document.'
txtNoText: 'Error! No text of specified style in document.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
}
})(), DE.Controllers.Main || {}))
});

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

@ -655,6 +655,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",

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

@ -1054,7 +1054,7 @@
"DE.Views.ChartSettings.textEditData": "Изменить данные",
"DE.Views.ChartSettings.textHeight": "Высота",
"DE.Views.ChartSettings.textLine": "График",
"DE.Views.ChartSettings.textOriginalSize": "По умолчанию",
"DE.Views.ChartSettings.textOriginalSize": "Реальный размер",
"DE.Views.ChartSettings.textPie": "Круговая",
"DE.Views.ChartSettings.textPoint": "Точечная",
"DE.Views.ChartSettings.textSize": "Размер",
@ -1136,7 +1136,7 @@
"DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
"DE.Views.DocumentHolder.moreText": "Больше вариантов...",
"DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
"DE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию",
"DE.Views.DocumentHolder.originalSizeText": "Реальный размер",
"DE.Views.DocumentHolder.paragraphText": "Абзац",
"DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
"DE.Views.DocumentHolder.rightText": "По правому краю",
@ -1496,7 +1496,7 @@
"DE.Views.ImageSettings.textHintFlipH": "Отразить слева направо",
"DE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
"DE.Views.ImageSettings.textInsert": "Заменить изображение",
"DE.Views.ImageSettings.textOriginalSize": "По умолчанию",
"DE.Views.ImageSettings.textOriginalSize": "Реальный размер",
"DE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
"DE.Views.ImageSettings.textRotation": "Поворот",
"DE.Views.ImageSettings.textSize": "Размер",
@ -1548,7 +1548,7 @@
"DE.Views.ImageSettingsAdvanced.textMiter": "Прямой",
"DE.Views.ImageSettingsAdvanced.textMove": "Перемещать с текстом",
"DE.Views.ImageSettingsAdvanced.textOptions": "Параметры",
"DE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию",
"DE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер",
"DE.Views.ImageSettingsAdvanced.textOverlap": "Разрешить перекрытие",
"DE.Views.ImageSettingsAdvanced.textPage": "Страницы",
"DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца",

7
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -971,6 +971,10 @@ define([
config.msg = this.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
config.msg = this.errorUpdateVersionOnDisconnect;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1456,7 +1460,8 @@ define([
textPaidFeature: 'Paid feature',
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.',
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
}
})(), DE.Controllers.Main || {}))
});

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

@ -249,6 +249,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",

2
apps/documenteditor/mobile/locale/ru.json
View file

@ -337,7 +337,7 @@
"DE.Views.EditImage.textBack": "Назад",
"DE.Views.EditImage.textBackward": "Перенести назад",
"DE.Views.EditImage.textBehind": "За текстом",
"DE.Views.EditImage.textDefault": "Размер по умолчанию",
"DE.Views.EditImage.textDefault": "Реальный размер",
"DE.Views.EditImage.textDistanceText": "Расстояние до текста",
"DE.Views.EditImage.textForward": "Перенести вперед",
"DE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",

1
apps/documenteditor/sdk_dev_scripts.js
View file

@ -160,6 +160,7 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/word/Editor/Footnotes.js",
"../../../../sdkjs/word/Editor/FootnotesChanges.js",
"../../../../sdkjs/word/Editor/FootEndNote.js",
"../../../../sdkjs/word/Drawing/buttons.js",
"../../../../sdkjs/word/Drawing/Graphics.js",
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
"../../../../sdkjs/word/Drawing/DrawingDocument.js",

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

@ -502,6 +502,10 @@ PE.ApplicationController = new(function(){
message = me.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
message = me.errorUpdateVersionOnDisconnect;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -629,6 +633,7 @@ PE.ApplicationController = new(function(){
waitText: 'Please, wait...',
textLoadingDocument: 'Loading presentation',
txtClose: 'Close',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
}
})();

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

@ -22,6 +22,7 @@
"PE.ApplicationController.unknownErrorText": "Unknown error.",
"PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"PE.ApplicationController.waitText": "Please, wait...",
"PE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
"PE.ApplicationView.txtDownload": "Download",
"PE.ApplicationView.txtEmbed": "Embed",
"PE.ApplicationView.txtFullScreen": "Full Screen",

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

@ -1204,6 +1204,10 @@ define([
config.msg = this.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
config.msg = this.errorUpdateVersionOnDisconnect;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2189,7 +2193,8 @@ define([
errorEmailClient: 'No email client could be found',
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.',
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
}
})(), PE.Controllers.Main || {}))
});

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

@ -574,6 +574,7 @@
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
"PE.Controllers.Toolbar.textAccent": "Accents",

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

@ -108,11 +108,6 @@
"Common.Views.InsertTableDialog.txtTitle": "Размер таблицы",
"Common.Views.InsertTableDialog.txtTitleSplit": "Разделить ячейку",
"Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа",
"Common.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет",
"Common.Views.ListSettingsDialog.txtColor": "Цвет",
"Common.Views.ListSettingsDialog.txtOfText": "% текста",
"Common.Views.ListSettingsDialog.txtSize": "Размер",
"Common.Views.ListSettingsDialog.txtTitle": "Параметры списка",
"Common.Views.OpenDialog.closeButtonText": "Закрыть файл",
"Common.Views.OpenDialog.txtEncoding": "Кодировка",
"Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.",
@ -974,7 +969,7 @@
"PE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
"PE.Views.DocumentHolder.moreText": "Больше вариантов...",
"PE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
"PE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию",
"PE.Views.DocumentHolder.originalSizeText": "Реальный размер",
"PE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
"PE.Views.DocumentHolder.rightText": "По правому краю",
"PE.Views.DocumentHolder.rowText": "Строку",
@ -1258,7 +1253,7 @@
"PE.Views.ImageSettings.textHintFlipH": "Отразить слева направо",
"PE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
"PE.Views.ImageSettings.textInsert": "Заменить изображение",
"PE.Views.ImageSettings.textOriginalSize": "По умолчанию",
"PE.Views.ImageSettings.textOriginalSize": "Реальный размер",
"PE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
"PE.Views.ImageSettings.textRotation": "Поворот",
"PE.Views.ImageSettings.textSize": "Размер",
@ -1272,7 +1267,7 @@
"PE.Views.ImageSettingsAdvanced.textHeight": "Высота",
"PE.Views.ImageSettingsAdvanced.textHorizontally": "По горизонтали",
"PE.Views.ImageSettingsAdvanced.textKeepRatio": "Сохранять пропорции",
"PE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию",
"PE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер",
"PE.Views.ImageSettingsAdvanced.textPlacement": "Положение",
"PE.Views.ImageSettingsAdvanced.textPosition": "Положение",
"PE.Views.ImageSettingsAdvanced.textRotation": "Поворот",
@ -1290,6 +1285,11 @@
"PE.Views.LeftMenu.tipTitles": "Заголовки",
"PE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
"PE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ",
"PE.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет",
"PE.Views.ListSettingsDialog.txtColor": "Цвет",
"PE.Views.ListSettingsDialog.txtOfText": "% текста",
"PE.Views.ListSettingsDialog.txtSize": "Размер",
"PE.Views.ListSettingsDialog.txtTitle": "Параметры списка",
"PE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал",
"PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами",
"PE.Views.ParagraphSettings.strSpacingAfter": "После",

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

@ -890,6 +890,10 @@ define([
config.msg = this.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
config.msg = this.errorUpdateVersionOnDisconnect;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1397,7 +1401,8 @@ define([
textPaidFeature: 'Paid feature',
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.',
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
}
})(), PE.Controllers.Main || {}))
});

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

@ -225,6 +225,7 @@
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
"PE.Controllers.Search.textNoTextFound": "Text not Found",
"PE.Controllers.Search.textReplaceAll": "Replace All",
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning",

13
apps/presentationeditor/mobile/locale/it.json
View file

@ -1,5 +1,6 @@
{
"Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.",
"Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati",
"Common.UI.ThemeColorPalette.textStandartColors": "Colori standard",
"Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema",
"Common.Utils.Metric.txtCm": "cm",
@ -253,6 +254,7 @@
"PE.Views.AddLink.textNumber": "Numero Diapositiva",
"PE.Views.AddLink.textPrev": "Diapositiva precedente",
"PE.Views.AddLink.textTip": "Suggerimento ",
"PE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato",
"PE.Views.EditChart.textAlign": "Allinea",
"PE.Views.EditChart.textAlignBottom": "Allinea in basso",
"PE.Views.EditChart.textAlignCenter": "Allinea al centro",
@ -264,6 +266,7 @@
"PE.Views.EditChart.textBackward": "Sposta indietro",
"PE.Views.EditChart.textBorder": "Bordo",
"PE.Views.EditChart.textColor": "Colore",
"PE.Views.EditChart.textCustomColor": "Colore personalizzato",
"PE.Views.EditChart.textFill": "Riempimento",
"PE.Views.EditChart.textForward": "Sposta avanti",
"PE.Views.EditChart.textRemoveChart": "Elimina Grafico",
@ -285,7 +288,7 @@
"PE.Views.EditImage.textAlignTop": "Allinea in alto",
"PE.Views.EditImage.textBack": "Indietro",
"PE.Views.EditImage.textBackward": "Sposta indietro",
"PE.Views.EditImage.textDefault": "Dimensione predefinita",
"PE.Views.EditImage.textDefault": "Dimensione reale",
"PE.Views.EditImage.textForward": "Sposta avanti",
"PE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta",
"PE.Views.EditImage.textFromURL": "Immagine da URL",
@ -314,6 +317,7 @@
"PE.Views.EditLink.textPrev": "Diapositiva precedente",
"PE.Views.EditLink.textRemove": "Elimina Collegamento",
"PE.Views.EditLink.textTip": "Suggerimento ",
"PE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato",
"PE.Views.EditShape.textAlign": "Allinea",
"PE.Views.EditShape.textAlignBottom": "Allinea in basso",
"PE.Views.EditShape.textAlignCenter": "Allinea al centro",
@ -325,6 +329,7 @@
"PE.Views.EditShape.textBackward": "Sposta indietro",
"PE.Views.EditShape.textBorder": "Bordo",
"PE.Views.EditShape.textColor": "Colore",
"PE.Views.EditShape.textCustomColor": "Colore personalizzato",
"PE.Views.EditShape.textEffects": "Effetti",
"PE.Views.EditShape.textFill": "Riempimento",
"PE.Views.EditShape.textForward": "Sposta avanti",
@ -338,6 +343,7 @@
"PE.Views.EditShape.textToForeground": "Porta in primo piano",
"PE.Views.EditShape.txtDistribHor": "Distribuisci orizzontalmente",
"PE.Views.EditShape.txtDistribVert": "Distribuisci verticalmente",
"PE.Views.EditSlide.textAddCustomColor": "Aggiungi colore personalizzato",
"PE.Views.EditSlide.textApplyAll": "Applica a tutte le diapositive",
"PE.Views.EditSlide.textBack": "Indietro",
"PE.Views.EditSlide.textBlack": "Attraverso il nero",
@ -349,6 +355,7 @@
"PE.Views.EditSlide.textColor": "Colore",
"PE.Views.EditSlide.textCounterclockwise": "In senso antiorario",
"PE.Views.EditSlide.textCover": "Copertina",
"PE.Views.EditSlide.textCustomColor": "Colore personalizzato",
"PE.Views.EditSlide.textDelay": "Ritardo",
"PE.Views.EditSlide.textDuplicateSlide": "Duplica diapositiva",
"PE.Views.EditSlide.textDuration": "Durata",
@ -383,6 +390,7 @@
"PE.Views.EditSlide.textZoomIn": "Ingrandisci",
"PE.Views.EditSlide.textZoomOut": "Rimpicciolisci",
"PE.Views.EditSlide.textZoomRotate": "Zoom e rotazione",
"PE.Views.EditTable.textAddCustomColor": "Aggiungi colore personalizzato",
"PE.Views.EditTable.textAlign": "Allinea",
"PE.Views.EditTable.textAlignBottom": "Allinea in basso",
"PE.Views.EditTable.textAlignCenter": "Allinea al centro",
@ -397,6 +405,7 @@
"PE.Views.EditTable.textBorder": "Bordo",
"PE.Views.EditTable.textCellMargins": "Margini cella",
"PE.Views.EditTable.textColor": "Colore",
"PE.Views.EditTable.textCustomColor": "Colore personalizzato",
"PE.Views.EditTable.textFill": "Riempimento",
"PE.Views.EditTable.textFirstColumn": "Prima colonna",
"PE.Views.EditTable.textForward": "Sposta avanti",
@ -414,6 +423,7 @@
"PE.Views.EditTable.textTotalRow": "Riga del Totale",
"PE.Views.EditTable.txtDistribHor": "Distribuisci orizzontalmente",
"PE.Views.EditTable.txtDistribVert": "Distribuisci verticalmente",
"PE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato",
"PE.Views.EditText.textAdditional": "Più...",
"PE.Views.EditText.textAdditionalFormat": "Formattazione aggiuntiva",
"PE.Views.EditText.textAfter": "dopo",
@ -426,6 +436,7 @@
"PE.Views.EditText.textCharacterItalic": "I",
"PE.Views.EditText.textCharacterStrikethrough": "S",
"PE.Views.EditText.textCharacterUnderline": "U",
"PE.Views.EditText.textCustomColor": "Colore personalizzato",
"PE.Views.EditText.textDblStrikethrough": "Barrato doppio",
"PE.Views.EditText.textDblSuperscript": "Apice",
"PE.Views.EditText.textFontColor": "Colore del carattere",

2
apps/presentationeditor/mobile/locale/ru.json
View file

@ -288,7 +288,7 @@
"PE.Views.EditImage.textAlignTop": "По верхнему краю",
"PE.Views.EditImage.textBack": "Назад",
"PE.Views.EditImage.textBackward": "Перенести назад",
"PE.Views.EditImage.textDefault": "Размер по умолчанию",
"PE.Views.EditImage.textDefault": "Реальный размер",
"PE.Views.EditImage.textForward": "Перенести вперед",
"PE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
"PE.Views.EditImage.textFromURL": "Изображение по URL",

1
apps/presentationeditor/sdk_dev_scripts.js
View file

@ -111,6 +111,7 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/word/Editor/StylesChanges.js",
"../../../../sdkjs/word/Editor/RevisionsChange.js",
"../../../../sdkjs/slide/Editor/Format/StylesPrototype.js",
"../../../../sdkjs/word/Drawing/buttons.js",
"../../../../sdkjs/word/Drawing/Graphics.js",
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
"../../../../sdkjs/slide/Drawing/Transitions.js",

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

@ -410,6 +410,10 @@ SSE.ApplicationController = new(function(){
message = me.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
message = me.errorUpdateVersionOnDisconnect;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -576,6 +580,7 @@ SSE.ApplicationController = new(function(){
waitText: 'Please, wait...',
textLoadingDocument: 'Loading spreadsheet',
txtClose: 'Close',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
}
})();

1
apps/spreadsheeteditor/embed/locale/en.json
View file

@ -22,6 +22,7 @@
"SSE.ApplicationController.unknownErrorText": "Unknown error.",
"SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"SSE.ApplicationController.waitText": "Please, wait...",
"SSE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
"SSE.ApplicationView.txtDownload": "Download",
"SSE.ApplicationView.txtEmbed": "Embed",
"SSE.ApplicationView.txtFullScreen": "Full Screen",

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

@ -1406,6 +1406,10 @@ define([
config.msg = this.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
config.msg = this.errorUpdateVersionOnDisconnect;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2435,7 +2439,8 @@ define([
txtTime: 'Time',
txtTab: 'Tab',
txtFile: 'File',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
}
})(), SSE.Controllers.Main || {}))
});

195
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -401,16 +401,16 @@ define([
this.disableControls(this._locked);
if (props )
{
if (props ) {
this._noApply = true;
var value = props.asc_getAngle();
if ( Math.abs(this._state.CellAngle-value)>0.1 || (this._state.CellAngle===undefined)&&(this._state.CellAngle!==value)) {
if (Math.abs(this._state.CellAngle - value) > 0.1 || (this._state.CellAngle === undefined) && (this._state.CellAngle !== value)) {
this.spnAngle.setValue((value !== null) ? value : '', true);
this._state.CellAngle=value;
this._state.CellAngle = value;
}
this.fill = props.asc_getFill2();
if (this.fill) {
this.pattern = this.fill.asc_getPatternFill();
this.gradient = this.fill.asc_getGradientFill();
if (this.pattern === null && this.gradient === null) {
@ -421,17 +421,33 @@ define([
this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0};
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
} else if (this.pattern !== null) {
if(this.pattern.asc_getType() === -1) {
if (this.pattern.asc_getType() === -1) {
var color = this.pattern.asc_getFgColor();
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
this.CellColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }};
this.CellColor = {
Value: 1,
Color: {
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
effectValue: color.asc_getValue()
}
};
} else {
this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())};
this.CellColor = {
Value: 1,
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
};
}
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID;
this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)};
this.FGColor = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)
};
this.BGColor = {Value: 1, Color: 'ffffff'};
this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color), Position: 0};
this.GradColors[0] = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color),
Position: 0
};
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
} else {
this.PatternFillType = this.pattern.asc_getType();
@ -447,9 +463,18 @@ define([
var color = this.pattern.asc_getFgColor();
if (color) {
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }};
this.FGColor = {
Value: 1,
Color: {
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
effectValue: color.asc_getValue()
}
};
} else {
this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())};
this.FGColor = {
Value: 1,
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
};
}
} else
this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
@ -457,14 +482,30 @@ define([
color = this.pattern.asc_getBgColor();
if (color) {
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }};
this.BGColor = {
Value: 1,
Color: {
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
effectValue: color.asc_getValue()
}
};
} else {
this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())};
this.BGColor = {
Value: 1,
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
};
}
} else
this.BGColor = {Value: 1, Color: 'ffffff'};
this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)};
this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color), Position: 0};
this.CellColor = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)
};
this.GradColors[0] = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color),
Position: 0
};
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT;
}
@ -485,8 +526,8 @@ define([
}
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
var value = this.gradient.asc_getDegree();
if (Math.abs(this.GradLinearDirectionType-value)>0.001) {
this.GradLinearDirectionType=value;
if (Math.abs(this.GradLinearDirectionType - value) > 0.001) {
this.GradLinearDirectionType = value;
var record = this.mnuDirectionPicker.store.findWhere({type: value});
this.mnuDirectionPicker.selectRecord(record, true);
if (record)
@ -504,21 +545,38 @@ define([
position = color.asc_getPosition(),
itemColor;
if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
itemColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), effectValue: clr.asc_getValue()}, Position: position};
itemColor = {
Value: 1,
Color: {
color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()),
effectValue: clr.asc_getValue()
},
Position: position
};
} else {
itemColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), Position: position};
itemColor = {
Value: 1,
Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()),
Position: position
};
}
me.GradColors.push(itemColor);
});
this.GradColors = _.sortBy(this.GradColors, 'Position');
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)};
this.FGColor = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)
};
this.BGColor = {Value: 1, Color: 'ffffff'};
this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)};
this.CellColor = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)
};
}
if ( this._state.FillType !== this.OriginalFillType ) {
if (this._state.FillType !== this.OriginalFillType) {
this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType);
this._state.FillType = this.OriginalFillType;
this.ShowHideElem(this.OriginalFillType);
@ -526,18 +584,18 @@ define([
// Color Back
var type1 = typeof(this.CellColor.Color),
type2 = typeof(this._state.CellColor);
if ( (type1 !== type2) || (type1=='object' &&
(this.CellColor.Color.effectValue!==this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color)<0)) ||
(type1!='object' && this._state.CellColor!==undefined && this._state.CellColor.indexOf(this.CellColor.Color)<0 )) {
var type1 = typeof (this.CellColor.Color),
type2 = typeof (this._state.CellColor);
if ((type1 !== type2) || (type1 == 'object' &&
(this.CellColor.Color.effectValue !== this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color) < 0)) ||
(type1 != 'object' && this._state.CellColor !== undefined && this._state.CellColor.indexOf(this.CellColor.Color) < 0)) {
this.btnBackColor.setColor(this.CellColor.Color);
if (_.isObject(this.CellColor.Color)) {
var isselected = false;
for (var i = 0; i < 10; i++) {
if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) {
this.colorsBack.select(this.CellColor.Color,true);
this.colorsBack.select(this.CellColor.Color, true);
isselected = true;
break;
}
@ -550,50 +608,50 @@ define([
}
// Pattern colors
type1 = typeof(this.FGColor.Color);
type2 = typeof(this._state.FGColor);
type1 = typeof (this.FGColor.Color);
type2 = typeof (this._state.FGColor);
if ( (type1 !== type2) || (type1=='object' &&
(this.FGColor.Color.effectValue!==this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color)<0)) ||
(type1!='object' && this._state.FGColor.indexOf(this.FGColor.Color)<0 )) {
if ((type1 !== type2) || (type1 == 'object' &&
(this.FGColor.Color.effectValue !== this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color) < 0)) ||
(type1 != 'object' && this._state.FGColor.indexOf(this.FGColor.Color) < 0)) {
this.btnFGColor.setColor(this.FGColor.Color);
if ( typeof(this.FGColor.Color) == 'object' ) {
if (typeof (this.FGColor.Color) == 'object') {
var isselected = false;
for (var i=0; i<10; i++) {
if ( Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue ) {
this.colorsFG.select(this.FGColor.Color,true);
for (var i = 0; i < 10; i++) {
if (Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue) {
this.colorsFG.select(this.FGColor.Color, true);
isselected = true;
break;
}
}
if (!isselected) this.colorsFG.clearSelection();
} else
this.colorsFG.select(this.FGColor.Color,true);
this.colorsFG.select(this.FGColor.Color, true);
this._state.FGColor = this.FGColor.Color;
}
type1 = typeof(this.BGColor.Color);
type2 = typeof(this._state.BGColor);
type1 = typeof (this.BGColor.Color);
type2 = typeof (this._state.BGColor);
if ( (type1 !== type2) || (type1=='object' &&
(this.BGColor.Color.effectValue!==this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color)<0)) ||
(type1!='object' && this._state.BGColor.indexOf(this.BGColor.Color)<0 )) {
if ((type1 !== type2) || (type1 == 'object' &&
(this.BGColor.Color.effectValue !== this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color) < 0)) ||
(type1 != 'object' && this._state.BGColor.indexOf(this.BGColor.Color) < 0)) {
this.btnBGColor.setColor(this.BGColor.Color);
if ( typeof(this.BGColor.Color) == 'object' ) {
if (typeof (this.BGColor.Color) == 'object') {
var isselected = false;
for (var i=0; i<10; i++) {
if ( Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue ) {
this.colorsBG.select(this.BGColor.Color,true);
for (var i = 0; i < 10; i++) {
if (Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue) {
this.colorsBG.select(this.BGColor.Color, true);
isselected = true;
break;
}
}
if (!isselected) this.colorsBG.clearSelection();
} else
this.colorsBG.select(this.BGColor.Color,true);
this.colorsBG.select(this.BGColor.Color, true);
this._state.BGColor = this.BGColor.Color;
}
@ -603,26 +661,26 @@ define([
if (!gradColor1) {
gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
}
type1 = typeof(gradColor1.Color);
type2 = typeof(this._state.GradColor1);
type1 = typeof (gradColor1.Color);
type2 = typeof (this._state.GradColor1);
if ( (type1 !== type2) || (type1=='object' &&
(gradColor1.Color.effectValue!==this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color)<0)) ||
(type1!='object' && this._state.GradColor1.indexOf(gradColor1.Color)<0 )) {
if ((type1 !== type2) || (type1 == 'object' &&
(gradColor1.Color.effectValue !== this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color) < 0)) ||
(type1 != 'object' && this._state.GradColor1.indexOf(gradColor1.Color) < 0)) {
this.btnGradColor1.setColor(gradColor1.Color);
if ( typeof(gradColor1.Color) == 'object' ) {
if (typeof (gradColor1.Color) == 'object') {
var isselected = false;
for (var i=0; i<10; i++) {
if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue ) {
this.colorsGrad1.select(gradColor1.Color,true);
for (var i = 0; i < 10; i++) {
if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue) {
this.colorsGrad1.select(gradColor1.Color, true);
isselected = true;
break;
}
}
if (!isselected) this.colorsGrad1.clearSelection();
} else
this.colorsGrad1.select(gradColor1.Color,true);
this.colorsGrad1.select(gradColor1.Color, true);
this._state.GradColor1 = gradColor1.Color;
}
@ -631,32 +689,33 @@ define([
if (!gradColor2) {
gradColor2 = {Value: 1, Color: 'ffffff'};
}
type1 = typeof(gradColor2.Color);
type2 = typeof(this._state.GradColor2);
type1 = typeof (gradColor2.Color);
type2 = typeof (this._state.GradColor2);
if ( (type1 !== type2) || (type1=='object' &&
(gradColor2.Color.effectValue!==this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color)<0)) ||
(type1!='object' && this._state.GradColor2.indexOf(gradColor2.Color)<0 )) {
if ((type1 !== type2) || (type1 == 'object' &&
(gradColor2.Color.effectValue !== this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color) < 0)) ||
(type1 != 'object' && this._state.GradColor2.indexOf(gradColor2.Color) < 0)) {
this.btnGradColor2.setColor(gradColor2.Color);
if ( typeof(gradColor2.Color) == 'object' ) {
if (typeof (gradColor2.Color) == 'object') {
var isselected = false;
for (var i=0; i<10; i++) {
if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue ) {
this.colorsGrad2.select(gradColor2.Color,true);
for (var i = 0; i < 10; i++) {
if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue) {
this.colorsGrad2.select(gradColor2.Color, true);
isselected = true;
break;
}
}
if (!isselected) this.colorsGrad2.clearSelection();
} else
this.colorsGrad2.select(gradColor2.Color,true);
this.colorsGrad2.select(gradColor2.Color, true);
this._state.GradColor2 = gradColor2.Color;
}
this._noApply = false;
}
}
},
UpdateThemeColors: function() {

10
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -571,11 +571,11 @@ define([
textNoColor : 'No Color',
textNewColor : 'Add New Custom Color',
zoomText : 'Zoom {0}%',
textSum : 'SUM',
textCount : 'COUNT',
textAverage : 'AVERAGE',
textMin : 'MIN',
textMax : 'MAX',
textSum : 'Sum',
textCount : 'Count',
textAverage : 'Average',
textMin : 'Min',
textMax : 'Max',
filteredRecordsText : '{0} of {1} records filtered',
filteredText : 'Filter mode',
selectAllSheets : 'Select All Sheets',

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

@ -743,6 +743,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning",
"SSE.Controllers.Print.txtCustom": "Custom",
@ -2093,13 +2094,13 @@
"SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "A sheet name cannot contain the following characters: \\/*?[]:",
"SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name",
"SSE.Views.Statusbar.selectAllSheets": "Select All Sheets",
"SSE.Views.Statusbar.textAverage": "AVERAGE",
"SSE.Views.Statusbar.textCount": "COUNT",
"SSE.Views.Statusbar.textMax": "MAX",
"SSE.Views.Statusbar.textMin": "MIN",
"SSE.Views.Statusbar.textAverage": "Average",
"SSE.Views.Statusbar.textCount": "Count",
"SSE.Views.Statusbar.textMax": "Max",
"SSE.Views.Statusbar.textMin": "Min",
"SSE.Views.Statusbar.textNewColor": "Add New Custom Color",
"SSE.Views.Statusbar.textNoColor": "No Color",
"SSE.Views.Statusbar.textSum": "SUM",
"SSE.Views.Statusbar.textSum": "Sum",
"SSE.Views.Statusbar.tipAddTab": "Add worksheet",
"SSE.Views.Statusbar.tipFirst": "Scroll to first sheet",
"SSE.Views.Statusbar.tipLast": "Scroll to last sheet",

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

@ -1391,7 +1391,7 @@
"SSE.Views.DocumentHolder.insertColumnRightText": "Столбец справа",
"SSE.Views.DocumentHolder.insertRowAboveText": "Строку выше",
"SSE.Views.DocumentHolder.insertRowBelowText": "Строку ниже",
"SSE.Views.DocumentHolder.originalSizeText": "По умолчанию",
"SSE.Views.DocumentHolder.originalSizeText": "Реальный размер",
"SSE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
"SSE.Views.DocumentHolder.selectColumnText": "Весь столбец",
"SSE.Views.DocumentHolder.selectDataText": "Данные столбцов",
@ -1702,7 +1702,7 @@
"SSE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
"SSE.Views.ImageSettings.textInsert": "Заменить изображение",
"SSE.Views.ImageSettings.textKeepRatio": "Сохранять пропорции",
"SSE.Views.ImageSettings.textOriginalSize": "По умолчанию",
"SSE.Views.ImageSettings.textOriginalSize": "Реальный размер",
"SSE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
"SSE.Views.ImageSettings.textRotation": "Поворот",
"SSE.Views.ImageSettings.textSize": "Размер",
@ -2086,13 +2086,13 @@
"SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Имя листа не может содержать следующие символы: \\/*?[]:",
"SSE.Views.Statusbar.RenameDialog.labelSheetName": "Имя листа",
"SSE.Views.Statusbar.selectAllSheets": "Выбрать все листы",
"SSE.Views.Statusbar.textAverage": "СРЕДНЕЕ",
"SSE.Views.Statusbar.textCount": "КОЛИЧЕСТВО",
"SSE.Views.Statusbar.textMax": "МАКС",
"SSE.Views.Statusbar.textMin": "МИН",
"SSE.Views.Statusbar.textAverage": "Среднее",
"SSE.Views.Statusbar.textCount": "Количество",
"SSE.Views.Statusbar.textMax": "Макс",
"SSE.Views.Statusbar.textMin": "Мин",
"SSE.Views.Statusbar.textNewColor": "Пользовательский цвет",
"SSE.Views.Statusbar.textNoColor": "Без цвета",
"SSE.Views.Statusbar.textSum": "СУММА",
"SSE.Views.Statusbar.textSum": "Сумма",
"SSE.Views.Statusbar.tipAddTab": "Добавить лист",
"SSE.Views.Statusbar.tipFirst": "Прокрутить до первого листа",
"SSE.Views.Statusbar.tipLast": "Прокрутить до последнего листа",

2
apps/spreadsheeteditor/main/resources/less/app.less
View file

@ -164,7 +164,7 @@
height: 100%;
display: inline-block;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0,
linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0,
linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0,
linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background-size: 80px 20px;

7
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -1044,6 +1044,10 @@ define([
config.msg = this.errorFileSizeExceed;
break;
case Asc.c_oAscError.ID.UpdateVersion:
config.msg = this.errorUpdateVersionOnDisconnect;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1625,7 +1629,8 @@ define([
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.',
errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&)',
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
}
})(), SSE.Controllers.Main || {}))
});

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -286,6 +286,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
"SSE.Controllers.Search.textNoTextFound": "Text not found",
"SSE.Controllers.Search.textReplaceAll": "Replace All",
"SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",

11
apps/spreadsheeteditor/mobile/locale/it.json
View file

@ -1,5 +1,6 @@
{
"Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.",
"Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati",
"Common.UI.ThemeColorPalette.textStandartColors": "Colori standard",
"Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema",
"Common.Utils.Metric.txtCm": "cm",
@ -346,6 +347,7 @@
"SSE.Views.AddOther.textLink": "Collegamento",
"SSE.Views.AddOther.textSort": "Ordina e filtra",
"SSE.Views.EditCell.textAccounting": "Contabilità",
"SSE.Views.EditCell.textAddCustomColor": "Aggiungi colore personalizzato",
"SSE.Views.EditCell.textAlignBottom": "Allinea in basso",
"SSE.Views.EditCell.textAlignCenter": "Allinea al centro",
"SSE.Views.EditCell.textAlignLeft": "Allinea a sinistra",
@ -362,6 +364,7 @@
"SSE.Views.EditCell.textCharacterUnderline": "U",
"SSE.Views.EditCell.textColor": "Colore",
"SSE.Views.EditCell.textCurrency": "Valuta",
"SSE.Views.EditCell.textCustomColor": "Colore personalizzato",
"SSE.Views.EditCell.textDate": "Data",
"SSE.Views.EditCell.textDiagDownBorder": "Bordo diagonale inferiore",
"SSE.Views.EditCell.textDiagUpBorder": "Bordo diagonale superiore",
@ -395,6 +398,7 @@
"SSE.Views.EditCell.textTopBorder": "Bordo superiore",
"SSE.Views.EditCell.textWrapText": "Disponi testo",
"SSE.Views.EditCell.textYen": "Yen",
"SSE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato",
"SSE.Views.EditChart.textAuto": "Auto",
"SSE.Views.EditChart.textAxisCrosses": "Intersezione asse",
"SSE.Views.EditChart.textAxisOptions": "Opzioni assi",
@ -408,6 +412,7 @@
"SSE.Views.EditChart.textChartTitle": "Titolo del grafico",
"SSE.Views.EditChart.textColor": "Colore",
"SSE.Views.EditChart.textCrossesValue": "Incrocia valore",
"SSE.Views.EditChart.textCustomColor": "Colore personalizzato",
"SSE.Views.EditChart.textDataLabels": "Etichette dati",
"SSE.Views.EditChart.textDesign": "Design",
"SSE.Views.EditChart.textDisplayUnits": "Mostra unità",
@ -461,7 +466,7 @@
"SSE.Views.EditImage.textAddress": "Indirizzo",
"SSE.Views.EditImage.textBack": "Indietro",
"SSE.Views.EditImage.textBackward": "Sposta indietro",
"SSE.Views.EditImage.textDefault": "Dimensione predefinita",
"SSE.Views.EditImage.textDefault": "Dimensione reale",
"SSE.Views.EditImage.textForward": "Sposta avanti",
"SSE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta",
"SSE.Views.EditImage.textFromURL": "Immagine da URL",
@ -473,10 +478,12 @@
"SSE.Views.EditImage.textReplaceImg": "Sostituisci immagine",
"SSE.Views.EditImage.textToBackground": "Porta in secondo piano",
"SSE.Views.EditImage.textToForeground": "Porta in primo piano",
"SSE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato",
"SSE.Views.EditShape.textBack": "Indietro",
"SSE.Views.EditShape.textBackward": "Sposta indietro",
"SSE.Views.EditShape.textBorder": "Bordo",
"SSE.Views.EditShape.textColor": "Colore",
"SSE.Views.EditShape.textCustomColor": "Colore personalizzato",
"SSE.Views.EditShape.textEffects": "Effetti",
"SSE.Views.EditShape.textFill": "Riempimento",
"SSE.Views.EditShape.textForward": "Sposta avanti",
@ -488,10 +495,12 @@
"SSE.Views.EditShape.textStyle": "Stile",
"SSE.Views.EditShape.textToBackground": "Porta in secondo piano",
"SSE.Views.EditShape.textToForeground": "Porta in primo piano",
"SSE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato",
"SSE.Views.EditText.textBack": "Indietro",
"SSE.Views.EditText.textCharacterBold": "B",
"SSE.Views.EditText.textCharacterItalic": "I",
"SSE.Views.EditText.textCharacterUnderline": "U",
"SSE.Views.EditText.textCustomColor": "Colore personalizzato",
"SSE.Views.EditText.textFillColor": "Colore di riempimento",
"SSE.Views.EditText.textFonts": "Caratteri",
"SSE.Views.EditText.textSize": "Dimensione",

2
apps/spreadsheeteditor/mobile/locale/ru.json
View file

@ -466,7 +466,7 @@
"SSE.Views.EditImage.textAddress": "Адрес",
"SSE.Views.EditImage.textBack": "Назад",
"SSE.Views.EditImage.textBackward": "Перенести назад",
"SSE.Views.EditImage.textDefault": "Размер по умолчанию",
"SSE.Views.EditImage.textDefault": "Реальный размер",
"SSE.Views.EditImage.textForward": "Перенести вперед",
"SSE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
"SSE.Views.EditImage.textFromURL": "Изображение по URL",

2
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -7723,7 +7723,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
width: 100%;
height: 100%;
display: inline-block;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background-size: 80px 20px;
-webkit-animation: flickerAnimation 2s infinite ease-in-out;
-moz-animation: flickerAnimation 2s infinite ease-in-out;

2
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -7585,7 +7585,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
width: 100%;
height: 100%;
display: inline-block;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background-size: 80px 20px;
-webkit-animation: flickerAnimation 2s infinite ease-in-out;
-moz-animation: flickerAnimation 2s infinite ease-in-out;

2
apps/spreadsheeteditor/mobile/resources/less/app-ios.less
View file

@ -311,7 +311,7 @@ input, textarea {
height: 100%;
display: inline-block;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0,
linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0,
linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0,
linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background-size: 80px 20px;

2
apps/spreadsheeteditor/mobile/resources/less/app-material.less
View file

@ -299,7 +299,7 @@ input, textarea {
height: 100%;
display: inline-block;
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0,
linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0,
linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0,
linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
background-size: 80px 20px;