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

[DE mobile] Fix disabled settings when change Display Mode

Browse source
This commit is contained in:
Julia Svinareva 2019-05-21 11:00:00 +03:00
parent a0337e4302
commit 039d15c233
4 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,8 +129,7 @@ define([
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>', '</div>'
$$('#toolbar-edit')
); );
} }
@ -175,10 +174,14 @@ define([
$('#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));
if(this.appConfig.isReviewOnly) { if(this.appConfig.isReviewOnly || displayMode == "Final" || displayMode == "Original" ) {
$('#settings-accept-all').addClass('disabled'); $('#settings-accept-all').addClass('disabled');
$('#settings-reject-all').addClass('disabled'); $('#settings-reject-all').addClass('disabled');
$('#settings-review').addClass('disabled'); $('#settings-review').addClass('disabled');
} else {
$('#settings-accept-all').removeClass('disabled');
$('#settings-reject-all').removeClass('disabled');
$('#settings-review').removeClass('disabled');
} }
}, },
@ -218,6 +221,10 @@ define([
} }
}, },
getDisplayMode: function() {
return displayMode;
},
onReviewViewClick: function(event) { onReviewViewClick: function(event) {
var value = $(event.currentTarget).val(); var value = $(event.currentTarget).val();
this.turnDisplayMode(value); this.turnDisplayMode(value);
@ -234,6 +241,8 @@ define([
else else
this.api.asc_EndViewModeInReview(); this.api.asc_EndViewModeInReview();
} }
this.initReviewingSettingsView();
DE.getController('Toolbar').setDisplayMode(value);
}, },
@ -251,9 +260,15 @@ define([
$('#btn-next-change').single('click', _.bind(this.onNextChange, this)); $('#btn-next-change').single('click', _.bind(this.onNextChange, this));
$('#btn-accept-change').single('click', _.bind(this.onAcceptCurrentChange, this)); $('#btn-accept-change').single('click', _.bind(this.onAcceptCurrentChange, this));
$('#btn-reject-change').single('click', _.bind(this.onRejectCurrentChange, this)); $('#btn-reject-change').single('click', _.bind(this.onRejectCurrentChange, this));
if(!this.appConfig.isReviewOnly) { if(this.appConfig.isReviewOnly) {
$('#btn-accept-change').removeClass('disabled'); $('#btn-accept-change').addClass('disabled');
$('#btn-reject-change').removeClass('disabled'); $('#btn-reject-change').addClass('disabled');
}
if(displayMode == "Final" || displayMode == "Original") {
$('#btn-accept-change').addClass('disabled');
$('#btn-reject-change').addClass('disabled');
$('#btn-prev-change').addClass('disabled');
$('#btn-next-change').addClass('disabled');
} }
}, },
@ -505,12 +520,12 @@ define([
textInserted: '<b>Inserted:</b><br>', textInserted: '<b>Inserted:</b>',
textDeleted: '<b>Deleted:</b><br>', textDeleted: '<b>Deleted:</b>',
textParaInserted: '<b>Paragraph Inserted</b><br> ', textParaInserted: '<b>Paragraph Inserted</b> ',
textParaDeleted: '<b>Paragraph Deleted</b><br> ', textParaDeleted: '<b>Paragraph Deleted</b> ',
textFormatted: 'Formatted', textFormatted: 'Formatted',
textParaFormatted: 'Paragraph Formatted', textParaFormatted: '<b>Paragraph Formatted</b>',
textNot: 'Not ', textNot: 'Not ',
textBold: 'Bold', textBold: 'Bold',
textItalic: 'Italic', textItalic: 'Italic',

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

@ -249,6 +249,10 @@ define([
$('#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));
$('#settings-collaboration').single('click', _.bind(me.clickCollaboration, me)); $('#settings-collaboration').single('click', _.bind(me.clickCollaboration, me));
var _stateDisplayMode = DE.getController('Collaboration').getDisplayMode();
if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
$('#settings-document').addClass('disabled');
}
} }
}, },
@ -331,6 +335,11 @@ define([
var value = Common.localStorage.getItem('de-mobile-settings-unit'); var value = Common.localStorage.getItem('de-mobile-settings-unit');
value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
$unitMeasurement.val([value]); $unitMeasurement.val([value]);
var _stateDisplayMode = DE.getController('Collaboration').getDisplayMode();
if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
$('#settings-no-characters').addClass('disabled');
$('#settings-hidden-borders').addClass('disabled');
}
}, },
initPageDocumentSettings: function () { initPageDocumentSettings: function () {

11
apps/documenteditor/mobile/app/controller/Toolbar.js
View file

@ -51,7 +51,8 @@ define([
DE.Controllers.Toolbar = Backbone.Controller.extend(_.extend((function() { DE.Controllers.Toolbar = Backbone.Controller.extend(_.extend((function() {
// private // private
var _backUrl; var _backUrl,
stateDisplayMode = false;
return { return {
models: [], models: [],
@ -149,6 +150,12 @@ define([
} }
}, },
setDisplayMode: function(displayMode) {
stateDisplayMode = displayMode == "Final" || displayMode == "Original" ? true : false;
var selected = this.api.getSelectedElements();
this.onApiFocusObject(selected);
},
onApiFocusObject: function (objects) { onApiFocusObject: function (objects) {
if (this.isDisconnected) return; if (this.isDisconnected) return;
@ -159,7 +166,7 @@ define([
topObjectValue = topObject.get_ObjectValue(), topObjectValue = topObject.get_ObjectValue(),
objectLocked = _.isFunction(topObjectValue.get_Locked) ? topObjectValue.get_Locked() : false; objectLocked = _.isFunction(topObjectValue.get_Locked) ? topObjectValue.get_Locked() : false;
$('#toolbar-add, #toolbar-edit').toggleClass('disabled', objectLocked); $('#toolbar-add, #toolbar-edit').toggleClass('disabled', objectLocked || stateDisplayMode);
} }
}, },

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

@ -180,8 +180,8 @@
<a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-review"></i></a> <a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-review"></i></a>
</span> </span>
<span class="accept-reject"> <span class="accept-reject">
<a href="#" id="btn-accept-change" class="link icon-only disabled"><i class="icon icon-review"></i></a> <a href="#" id="btn-accept-change" class="link icon-only"><i class="icon icon-review"></i></a>
<a href="#" id="btn-reject-change" class="link icon-only disabled"><i class="icon icon-review"></i></a> <a href="#" id="btn-reject-change" class="link icon-only"><i class="icon icon-review"></i></a>
</span> </span>
</div> </div>
<div id="current-change" class="content-block block-description"> <div id="current-change" class="content-block block-description">