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

[DE mobile] [SSE mobile] Display Comments Settings and R1C1 for view mode

Browse source
This commit is contained in:
Julia Svinareva 2019-07-19 15:57:57 +03:00
parent 35a8b6ffe6
commit 16dc5af83b
5 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,8 @@ define([
_isReviewOnly = false, _isReviewOnly = false,
_fileKey, _fileKey,
templateInsert, templateInsert,
_metricText = Common.Utils.Metric.getCurrentMetricName(); _metricText = Common.Utils.Metric.getCurrentMetricName(),
_isEdit;
var mm2Cm = function(mm) { var mm2Cm = function(mm) {
return parseFloat((mm/10.).toFixed(2)); return parseFloat((mm/10.).toFixed(2));
@ -147,6 +148,7 @@ define([
_canReview = mode.canReview; _canReview = mode.canReview;
_isReviewOnly = mode.isReviewOnly; _isReviewOnly = mode.isReviewOnly;
_fileKey = mode.fileKey; _fileKey = mode.fileKey;
_isEdit = mode.isEdit;
}, },
initEvents: function () { initEvents: function () {
@ -380,6 +382,9 @@ define([
$('#settings-no-characters').addClass('disabled'); $('#settings-no-characters').addClass('disabled');
$('#settings-hidden-borders').addClass('disabled'); $('#settings-hidden-borders').addClass('disabled');
} }
if (!_isEdit) {
$('.page[data-page=settings-advanced-view] .page-content > :not(.display-view)').hide();
}
}, },
initPageDocumentSettings: function () { initPageDocumentSettings: function () {

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

@ -639,8 +639,8 @@
</ul> </ul>
</div> </div>
<div class="content-block-title"><%= scope.textCommentingDisplay %></div> <div class="content-block-title display-view"><%= scope.textCommentingDisplay %></div>
<div class="list-block"> <div class="list-block display-view">
<ul> <ul>
<div id="settings-display-comments" class="item-content"> <div id="settings-display-comments" class="item-content">
<div class="item-inner"> <div class="item-inner">

1
apps/documenteditor/mobile/app/view/Settings.js
View file

@ -124,7 +124,6 @@ define([
$layour.find('#settings-search .item-title').text(this.textFindAndReplace) $layour.find('#settings-search .item-title').text(this.textFindAndReplace)
} else { } else {
$layour.find('#settings-document').hide(); $layour.find('#settings-document').hide();
$layour.find('#settings-advanced').hide();
$layour.find('#color-schemes').hide(); $layour.find('#color-schemes').hide();
$layour.find('#settings-spellcheck').hide(); $layour.find('#settings-spellcheck').hide();
$layour.find('#settings-orthography').hide(); $layour.find('#settings-orthography').hide();

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

@ -430,23 +430,6 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="list-block">
<ul>
<li id="r1-c1-style">
<div class="item-content">
<div class="item-inner">
<div class="item-title"><%= scope.textR1C1Style %></div>
<div class="item-after">
<label class="label-switch">
<input type="checkbox">
<div class="checkbox"></div>
</label>
</div>
</div>
</div>
</li>
</ul>
</div>
<div class="content-block-title"><%= scope.textRegionalSettings %></div> <div class="content-block-title"><%= scope.textRegionalSettings %></div>
<div class="list-block"> <div class="list-block">
<ul> <ul>
@ -462,8 +445,8 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="content-block-title"><%= scope.textCommentingDisplay %></div> <div class="content-block-title display-view"><%= scope.textCommentingDisplay %></div>
<div class="list-block"> <div class="list-block display-view">
<ul> <ul>
<div id="settings-display-comments" class="item-content"> <div id="settings-display-comments" class="item-content">
<div class="item-inner"> <div class="item-inner">
@ -489,6 +472,23 @@
</div> </div>
</ul> </ul>
</div> </div>
<div class="list-block display-view">
<ul>
<li id="r1-c1-style">
<div class="item-content">
<div class="item-inner">
<div class="item-title"><%= scope.textR1C1Style %></div>
<div class="item-after">
<label class="label-switch">
<input type="checkbox">
<div class="checkbox"></div>
</label>
</div>
</div>
</div>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -130,7 +130,6 @@ define([
$layout.find('#settings-search .item-title').text(this.textFindAndReplace) $layout.find('#settings-search .item-title').text(this.textFindAndReplace)
} else { } else {
$layout.find('#settings-spreadsheet').hide(); $layout.find('#settings-spreadsheet').hide();
$layout.find('#settings-application').hide();
} }
if (!canDownload) $layout.find('#settings-download').hide(); if (!canDownload) $layout.find('#settings-download').hide();
if (!canAbout) $layout.find('#settings-about').hide(); if (!canAbout) $layout.find('#settings-about').hide();
@ -170,6 +169,9 @@ define([
this.showPage('#settings-application-view'); this.showPage('#settings-application-view');
$('#language-formula').single('click', _.bind(this.showFormulaLanguage, this)); $('#language-formula').single('click', _.bind(this.showFormulaLanguage, this));
$('#regional-settings').single('click', _.bind(this.showRegionalSettings, this)); $('#regional-settings').single('click', _.bind(this.showRegionalSettings, this));
if (!isEdit) {
$('.page[data-page=settings-application-view] .page-content > :not(.display-view)').hide();
}
}, },
showFormulaLanguage: function () { showFormulaLanguage: function () {