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

[DE mobile] Fix bug 45472

Browse source
This commit is contained in:
JuliaSvinareva 2020-05-27 17:03:14 +03:00
parent a626ca471d
commit 485c31bc80
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file

@ -91,10 +91,13 @@ define([
}, },
initEvents: function () { initEvents: function () {
this.view.hideInsertComments = this.isHideInsertComment(); this.setDisableMenuItem();
}, },
isHideInsertComment: function() { setDisableMenuItem: function() {
var isDisableComment = true,
isDisableBreak = false,
isDisableFootnote = false;
var stack = this.api.getSelectedElements(); var stack = this.api.getSelectedElements();
var isText = false, var isText = false,
isTable = false, isTable = false,
@ -133,9 +136,14 @@ define([
}); });
if (stack.length > 0) { if (stack.length > 0) {
var isObject = isShape || isChart || isImage || isTable; var isObject = isShape || isChart || isImage || isTable;
return (this.api.can_AddQuotedComment() === false || lockedText || lockedTable || lockedImage || lockedHeader || (!isText && isObject)); isDisableComment = (this.api.can_AddQuotedComment() === false || lockedText || lockedTable || lockedImage || lockedHeader || (!isText && isObject));
if (isShape && isText) {
isDisableBreak = isDisableFootnote = true;
} }
return true; }
this.view.isDisableComment = isDisableComment;
this.view.isDisableBreak = isDisableBreak;
this.view.isDisableFootnote = isDisableFootnote;
}, },
onPageShow: function (view, pageId) { onPageShow: function (view, pageId) {

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

@ -38,7 +38,7 @@
</div> </div>
</a> </a>
</li> </li>
<li> <li id="item-break">
<a id="add-other-break" class="item-link"> <a id="add-other-break" class="item-link">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
@ -50,7 +50,7 @@
</div> </div>
</a> </a>
</li> </li>
<li> <li id="item-footnote">
<a id="add-other-footnote" class="item-link"> <a id="add-other-footnote" class="item-link">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">

20
apps/documenteditor/mobile/app/view/add/AddOther.js
View file

@ -68,14 +68,24 @@ define([
$('#add-other-link').single('click', _.bind(me.showLink, me)); $('#add-other-link').single('click', _.bind(me.showLink, me));
$('#add-other-pagenumber').single('click', _.bind(me.showPagePosition, me)); $('#add-other-pagenumber').single('click', _.bind(me.showPagePosition, me));
$('#add-other-footnote').single('click', _.bind(me.showPageFootnote, me)); if (this.isDisableComment) {
$('#add-other-break').single('click', _.bind(me.showPageBreak, me)); $('#item-comment').addClass('disabled');
if (this.hideInsertComments) {
$('#item-comment').hide();
} else { } else {
$('#item-comment').show(); $('#item-comment').removeClass('disabled');
$('#add-other-comment').single('click', _.bind(me.showPageComment, me)); $('#add-other-comment').single('click', _.bind(me.showPageComment, me));
} }
if (this.isDisableBreak) {
$('#item-break').addClass('disabled');
} else {
$('#item-break').removeClass('disabled');
$('#add-other-break').single('click', _.bind(me.showPageBreak, me));
}
if (this.isDisableFootnote) {
$('#item-footnote').addClass('disabled');
} else {
$('#item-footnote').removeClass('disabled');
$('#add-other-footnote').single('click', _.bind(me.showPageFootnote, me));
}
me.initControls(); me.initControls();
}, },