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

[DE mobile] Add button exit modal window, delete track changes from settings.

Browse source
This commit is contained in:
Julia Svinareva 2019-05-17 18:56:58 +03:00
parent 4f9d1e85f3
commit a0337e4302
4 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/mobile/app/controller/Collaboration.js
View file

@ -54,7 +54,8 @@ define([
_headerType = 1, _headerType = 1,
rootView, rootView,
displayMode = "Markup", displayMode = "Markup",
arrChangeReview = []; arrChangeReview = [],
_fileKey;
return { return {
models: [], models: [],
@ -83,6 +84,7 @@ define([
setMode: function(mode) { setMode: function(mode) {
this.appConfig = mode; this.appConfig = mode;
_fileKey = mode.fileKey;
return this; return this;
}, },
@ -169,7 +171,7 @@ define([
initReviewingSettingsView: function () { initReviewingSettingsView: function () {
var me = this; var me = this;
$('#settings-review input:checkbox').attr('checked', this.appConfig.isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes")); $('#settings-review input:checkbox').attr('checked', this.appConfig.isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (_fileKey || '')));
$('#settings-review input:checkbox').single('change', _.bind(me.onTrackChanges, me)); $('#settings-review input:checkbox').single('change', _.bind(me.onTrackChanges, me));
$('#settings-accept-all').single('click', _.bind(me.onAcceptAllClick, me)); $('#settings-accept-all').single('click', _.bind(me.onAcceptAllClick, me));
$('#settings-reject-all').single('click', _.bind(me.onRejectAllClick, me)); $('#settings-reject-all').single('click', _.bind(me.onRejectAllClick, me));
@ -187,7 +189,7 @@ define([
$checkbox.attr('checked', true); $checkbox.attr('checked', true);
} else { } else {
this.api.asc_SetTrackRevisions(state); this.api.asc_SetTrackRevisions(state);
Common.localStorage.setItem("de-mobile-track-changes", state ? 1 : 0); Common.localStorage.setItem("de-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0);
} }
}, },

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

@ -243,10 +243,8 @@ define([
Common.Utils.addScrollIfNeed('.page[data-page=margin-view]', '.page[data-page=margin-view] .page-content'); Common.Utils.addScrollIfNeed('.page[data-page=margin-view]', '.page[data-page=margin-view] .page-content');
} else { } else {
$('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode')); $('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode'));
$('#settings-review input:checkbox').attr('checked', _isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (_fileKey || '')));
$('#settings-search').single('click', _.bind(me.onSearch, me)); $('#settings-search').single('click', _.bind(me.onSearch, me));
$('#settings-readermode input:checkbox').single('change', _.bind(me.onReaderMode, me)); $('#settings-readermode input:checkbox').single('change', _.bind(me.onReaderMode, me));
$('#settings-review input:checkbox').single('change', _.bind(me.onTrackChanges, me));
$('#settings-help').single('click', _.bind(me.onShowHelp, me)); $('#settings-help').single('click', _.bind(me.onShowHelp, me));
$('#settings-download').single('click', _.bind(me.onDownloadOrigin, me)); $('#settings-download').single('click', _.bind(me.onDownloadOrigin, me));
$('#settings-print').single('click', _.bind(me.onPrint, me)); $('#settings-print').single('click', _.bind(me.onPrint, me));
@ -470,17 +468,6 @@ define([
this.api && this.api.asc_pluginRun("asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", 0); this.api && this.api.asc_pluginRun("asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", 0);
}, },
onTrackChanges: function(e) {
var $checkbox = $(e.currentTarget),
state = $checkbox.is(':checked');
if ( _isReviewOnly ) {
$checkbox.attr('checked', true);
} else if ( _canReview ) {
this.api.asc_SetTrackRevisions(state);
Common.localStorage.setItem("de-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0);
}
},
onShowHelp: function () { onShowHelp: function () {
window.open('{{SUPPORT_URL}}', "_blank"); window.open('{{SUPPORT_URL}}', "_blank");
this.hideModal(); this.hideModal();

3
apps/documenteditor/mobile/app/template/Collaboration.template
View file

@ -36,6 +36,7 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div> <div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= scope.textReviewing %></div> <div class="center sliding"><%= scope.textReviewing %></div>
<div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div> </div>
</div> </div>
<div class="pages"> <div class="pages">
@ -118,6 +119,7 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div> <div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= scope.textDisplayMode %></div> <div class="center sliding"><%= scope.textDisplayMode %></div>
<div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div> </div>
</div> </div>
<div class="pages"> <div class="pages">
@ -166,6 +168,7 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div> <div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= scope.textChange %></div> <div class="center sliding"><%= scope.textChange %></div>
<div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div> </div>
</div> </div>
<div class="pages"> <div class="pages">

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

@ -55,22 +55,6 @@
</a> </a>
</li> </li>
<% } %> <% } %>
<li>
<div id="settings-review" class="item-content">
<div class="item-media">
<i class="icon icon-review"></i>
</div>
<div class="item-inner">
<div class="item-title"><%= scope.textReview %></div>
<div class="item-after">
<label class="label-switch">
<input type="checkbox">
<div class="checkbox"></div>
</label>
</div>
</div>
</div>
</li>
<li> <li>
<div id="settings-collaboration" class="item-content"> <div id="settings-collaboration" class="item-content">
<div class="item-media"> <div class="item-media">