diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js
index c51901c09..0bd465c2f 100644
--- a/apps/common/mobile/lib/controller/Collaboration.js
+++ b/apps/common/mobile/lib/controller/Collaboration.js
@@ -411,6 +411,7 @@ define([
}
!suppressEvent && this.initReviewingSettingsView();
DE.getController('Toolbar').setDisplayMode(displayMode);
+ DE.getController('DocumentHolder').setDisplayMode(displayMode);
},
diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js
index 107c627ab..5ff80e096 100644
--- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js
@@ -474,6 +474,7 @@ define([
}
result += val;
+ prev = Math.abs(val);
}
return result;
diff --git a/apps/documenteditor/main/app/view/NumberingValueDialog.js b/apps/documenteditor/main/app/view/NumberingValueDialog.js
index 399289f67..b0f555db7 100644
--- a/apps/documenteditor/main/app/view/NumberingValueDialog.js
+++ b/apps/documenteditor/main/app/view/NumberingValueDialog.js
@@ -248,6 +248,7 @@ define([
}
result += val;
+ prev = Math.abs(val);
}
return result;
diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js
index 4684d4a32..3b2f0daf4 100644
--- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js
+++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js
@@ -65,7 +65,8 @@ define([
_timer = 0,
_canViewComments = true,
_isRestrictedEdit = false,
- _canFillForms = true;
+ _canFillForms = true,
+ _stateDisplayMode = false;
return {
models: [],
@@ -553,7 +554,7 @@ define([
items[indexAfter] = items.splice(indexBefore, 1, items[indexAfter])[0];
};
- if (_isEdit && !me.isDisconnected) {
+ if (_isEdit && !me.isDisconnected && !_stateDisplayMode) {
if (!lockedText && !lockedTable && !lockedImage && !lockedHeader && canCopy) {
arrItemsIcon.push({
caption: me.menuCut,
@@ -673,6 +674,10 @@ define([
this.isDisconnected = true;
},
+ setDisplayMode: function(displayMode) {
+ _stateDisplayMode = displayMode == "final" || displayMode == "original" ? true : false;
+ },
+
textGuest: 'Guest',
textCancel: 'Cancel',
textColumns: 'Columns',
diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
index 26bc4d8a1..81837da66 100644
--- a/apps/documenteditor/mobile/app/controller/Main.js
+++ b/apps/documenteditor/mobile/app/controller/Main.js
@@ -110,7 +110,16 @@ define([
'Y Axis': this.txtYAxis,
'Your text here': this.txtArt,
'Header': this.txtHeader,
- 'Footer': this.txtFooter
+ 'Footer': this.txtFooter,
+ "above": this.txtAbove,
+ "below": this.txtBelow,
+ "on page ": this.txtOnPage + " ",
+ " -Section ": " " + this.txtSection + " ",
+ "First Page ": this.txtFirstPage + " ",
+ "Even Page ": this.txtEvenPage + " ",
+ "Odd Page ": this.txtOddPage + " ",
+ "Same as Previous": this.txtSameAsPrev,
+ "Current Document": this.txtCurrentDocument
};
styleNames.forEach(function(item){
translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -1598,7 +1607,16 @@ define([
errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.',
errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.',
warnLicenseLimitedRenewed: 'License needs to be renewed.
You have a limited access to document editing functionality.
Please contact your administrator to get full access',
- warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.'
+ warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.',
+ txtAbove: "above",
+ txtBelow: "below",
+ txtOnPage: "on page",
+ txtSection: "-Section",
+ txtFirstPage: "First Page",
+ txtEvenPage: "Even Page",
+ txtOddPage: "Odd Page",
+ txtSameAsPrev: "Same as Previous",
+ txtCurrentDocument: "Current Document"
}
})(), DE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js
index 2c2d9a36c..8bb43f073 100644
--- a/apps/documenteditor/mobile/app/controller/Settings.js
+++ b/apps/documenteditor/mobile/app/controller/Settings.js
@@ -346,8 +346,8 @@ define([
me.localSectionProps = me.api.asc_GetSectionProps();
if (me.localSectionProps) {
- me.maxMarginsH = me.localSectionProps.get_H() - 26;
- me.maxMarginsW = me.localSectionProps.get_W() - 127;
+ me.maxMarginsH = me.localSectionProps.get_H() - 2.6;
+ me.maxMarginsW = me.localSectionProps.get_W() - 12.7;
var top = parseFloat(Common.Utils.Metric.fnRecalcFromMM(me.localSectionProps.get_TopMargin()).toFixed(2)),
bottom = parseFloat(Common.Utils.Metric.fnRecalcFromMM(me.localSectionProps.get_BottomMargin()).toFixed(2)),
diff --git a/apps/documenteditor/mobile/app/controller/add/AddOther.js b/apps/documenteditor/mobile/app/controller/add/AddOther.js
index 454ac1826..9dca563e3 100644
--- a/apps/documenteditor/mobile/app/controller/add/AddOther.js
+++ b/apps/documenteditor/mobile/app/controller/add/AddOther.js
@@ -456,6 +456,7 @@ define([
}
result += val;
+ prev = Math.abs(val);
}
return result;
diff --git a/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js b/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
index b0ac19f25..114601e6a 100644
--- a/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
+++ b/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
@@ -150,7 +150,7 @@ define([
$('#paragraph-distance-before .item-after label').text(_paragraphInfo.spaceBefore < 0 ? 'Auto' : distanceBeforeFix + ' ' + metricText);
$('#paragraph-distance-after .item-after label').text(_paragraphInfo.spaceAfter < 0 ? 'Auto' : distanceAfterFix + ' ' + metricText);
- $('#paragraph-space input:checkbox').prop('checked', me._paragraphObject.get_ContextualSpacing());
+ $('#paragraph-space input:checkbox').prop('checked', !me._paragraphObject.get_ContextualSpacing());
$('#paragraph-page-break input:checkbox').prop('checked', me._paragraphObject.get_PageBreakBefore());
$('#paragraph-page-orphan input:checkbox').prop('checked', me._paragraphObject.get_WidowControl());
$('#paragraph-page-keeptogether input:checkbox').prop('checked', me._paragraphObject.get_KeepLines());
@@ -325,7 +325,7 @@ define([
onSpaceBetween: function (e) {
var $checkbox = $(e.currentTarget);
- this.api.put_AddSpaceBetweenPrg($checkbox.is(':checked'));
+ this.api.put_AddSpaceBetweenPrg(!$checkbox.is(':checked'));
},
onBreakBefore: function (e) {
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index 181bf1527..34a49ba06 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -298,6 +298,15 @@
"DE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "DE.Controllers.Main.txtAbove": "above",
+ "DE.Controllers.Main.txtBelow": "below",
+ "DE.Controllers.Main.txtOddPage": "Odd Page",
+ "DE.Controllers.Main.txtOnPage": "on page",
+ "DE.Controllers.Main.txtSameAsPrev": "Same as Previous",
+ "DE.Controllers.Main.txtSection": "-Section",
+ "DE.Controllers.Main.txtEvenPage": "Even Page",
+ "DE.Controllers.Main.txtFirstPage": "First Page",
+ "DE.Controllers.Main.txtCurrentDocument": "Current Document",
"DE.Controllers.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json
index d05e6f062..fc6d3e7c8 100644
--- a/apps/documenteditor/mobile/locale/ru.json
+++ b/apps/documenteditor/mobile/locale/ru.json
@@ -298,6 +298,15 @@
"DE.Controllers.Main.warnNoLicense": "Вы достигли лимита на одновременные подключения к редакторам %1. Этот документ будет открыт на просмотр.
Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"DE.Controllers.Main.warnNoLicenseUsers": "Вы достигли лимита на одновременные подключения к редакторам %1.
Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+ "DE.Controllers.Main.txtAbove": "выше",
+ "DE.Controllers.Main.txtBelow": "ниже",
+ "DE.Controllers.Main.txtCurrentDocument": "Текущий документ",
+ "DE.Controllers.Main.txtOddPage": "Нечетная страница",
+ "DE.Controllers.Main.txtOnPage": "на странице",
+ "DE.Controllers.Main.txtSameAsPrev": "Как в предыдущем",
+ "DE.Controllers.Main.txtSection": "-Раздел",
+ "DE.Controllers.Main.txtFirstPage": "Первая страница",
+ "DE.Controllers.Main.txtEvenPage": "Четная страница",
"DE.Controllers.Search.textNoTextFound": "Текст не найден",
"DE.Controllers.Search.textReplaceAll": "Заменить все",
"DE.Controllers.Settings.notcriticalErrorTitle": "Внимание",
diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js
index 828019d7c..8f610f438 100644
--- a/apps/presentationeditor/mobile/app/controller/Main.js
+++ b/apps/presentationeditor/mobile/app/controller/Main.js
@@ -118,7 +118,8 @@ define([
'Slide number': this.txtSlideNumber,
'Slide subtitle': this.txtSlideSubtitle,
'Table': this.txtSldLtTTbl,
- 'Slide title': this.txtSlideTitle
+ 'Slide title': this.txtSlideTitle,
+ 'Click to add first slide': this.txtAddFirstSlide
}
});
@@ -1539,7 +1540,8 @@ define([
errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.',
errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.',
warnLicenseLimitedRenewed: 'License needs to be renewed.
You have a limited access to document editing functionality.
Please contact your administrator to get full access',
- warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.'
+ warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.',
+ txtAddFirstSlide: 'Click to add first slide'
}
})(), PE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
index c272290ce..e880b9d8c 100644
--- a/apps/presentationeditor/mobile/locale/en.json
+++ b/apps/presentationeditor/mobile/locale/en.json
@@ -266,6 +266,7 @@
"PE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.",
"PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "PE.Controllers.Main.txtAddFirstSlide": "Click to add the first slide",
"PE.Controllers.Search.textNoTextFound": "Text not Found",
"PE.Controllers.Search.textReplaceAll": "Replace All",
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json
index 196516b0c..bc05db040 100644
--- a/apps/presentationeditor/mobile/locale/ru.json
+++ b/apps/presentationeditor/mobile/locale/ru.json
@@ -266,6 +266,7 @@
"PE.Controllers.Main.warnNoLicense": "Вы достигли лимита на одновременные подключения к редакторам %1. Этот документ будет открыт на просмотр.
Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"PE.Controllers.Main.warnNoLicenseUsers": "Вы достигли лимита на одновременные подключения к редакторам %1.
Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+ "PE.Controllers.Main.txtAddFirstSlide": "Нажмите, чтобы добавить первый слайд",
"PE.Controllers.Search.textNoTextFound": "Текст не найден",
"PE.Controllers.Search.textReplaceAll": "Заменить все",
"PE.Controllers.Settings.notcriticalErrorTitle": "Внимание",