[de mobile] work with comments (fix styles)

This commit is contained in:
JuliaSvinareva 2020-04-02 18:30:36 +03:00
parent 218929dd3e
commit 22604c0567
10 changed files with 142 additions and 44 deletions

View file

@ -953,6 +953,9 @@ define([
} else {
idComment = id;
}
if (_.isNumber(idComment)) {
idComment = idComment.toString();
}
var comment = me.findComment(idComment);
me.getCurrentUser();
var date = me.dateToLocaleTimeString(new Date());
@ -966,7 +969,7 @@ define([
'<div class="navbar-inner">' +
'<div class="left sliding"><a href="#" class="back link close-popup">' + (isAndroid ? '<i class="icon icon-close-comment"></i>' : '<span>' + me.textCancel + '</span>') + '</a></div>' +
'<div class="center sliding">' + me.textAddReply + '</div>' +
'<div class="right sliding"><a href="#" class="link done-reply">' + (isAndroid ? '<i class="icon icon-done-comment"></i>' : '<span>' + me.textDone + '</span>') + '</a></div>' +
'<div class="right sliding"><a href="#" class="link" id="add-new-reply">' + (isAndroid ? '<i class="icon icon-done-comment"></i>' : '<span>' + me.textDone + '</span>') + '</a></div>' +
'</div>' +
'</div>' +
'<div class="pages">' +
@ -987,7 +990,7 @@ define([
$('.popup').css('z-index', '20000');
} else {
$('.container-view-comment .toolbar').find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'none');
var template = _.template('<a href="#" class="link done-reply">' + me.textDone + '</a>');
var template = _.template('<a href="#" class="link" id="add-new-reply">' + me.textDone + '</a>');
$('.container-view-comment .button-right').append(template);
template = _.template('<a href="#" class="link cancel-reply">' + me.textCancel + '</a>');
$('.container-view-comment .button-left').append(template);
@ -995,22 +998,23 @@ define([
$('.view-comment .page-content').append(template);
}
} else if ($('.container-collaboration').length > 0) {
me.getView('Common.Views.Collaboration').showPage('#comments-add-reply-view');
me.getView('Common.Views.Collaboration').showPage('#comments-add-reply-view', false);
var name = me.currentUser.asc_getUserName(),
color = me.currentUser.asc_getColor();
me.getView('Common.Views.Collaboration').renderAddReply(name, color, me.getInitials(name), date);
}
$('.done-reply').single('click', _.bind(function (uid) {
$('#add-new-reply').single('click', _.bind(function (uid) {
var reply = $('.reply-textarea')[0].value;
if ($('.container-view-comment').length > 0) {
var $viewComment = $('.container-view-comment');
if (reply && reply.length > 0) {
this.addReply(uid, reply);
uiApp.closeModal($$(addReplyView));
this.updateViewComment(this.showComments, this.indexCurrentComment);
if (!phone) {
$viewComment.find('a.done-reply, a.cancel-reply').css('display', 'none');
$viewComment.find('a#add-new-reply, a.cancel-reply').remove();
$viewComment.find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'flex');
} else {
uiApp.closeModal($$(addReplyView));
}
}
} else if ($('.container-collaboration').length > 0) {
@ -1023,7 +1027,7 @@ define([
if ($viewComment.find('.block-reply').length > 0) {
$viewComment.find('.block-reply').remove();
}
$viewComment.find('a.done-reply, a.cancel-reply').css('display', 'none');
$viewComment.find('a#add-new-reply, a.cancel-reply').css('display', 'none');
$viewComment.find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'flex');
}, me));
}
@ -1116,6 +1120,9 @@ define([
initMenuComments: function(e) {
var $comment = $(e.currentTarget).closest('.comment');
var idComment = $comment.data('uid');
if (_.isNumber(idComment)) {
idComment = idComment.toString();
}
var comment = this.findComment(idComment);
if ($('.actions-modal').length === 0 && comment) {
var me = this;
@ -1171,6 +1178,9 @@ define([
var me = this;
var ind = $(event.currentTarget).parent().parent().data('ind');
var idComment = $(event.currentTarget).closest('.comment').data('uid');
if (_.isNumber(idComment)) {
idComment = idComment.toString();
}
_.delay(function () {
var _menuItems = [];
_menuItems.push({
@ -1368,8 +1378,7 @@ define([
'<div class="right sliding"><a href="#" class="link" id="edit-comment">' + (isAndroid ? '<i class="icon icon-done-comment"></i>' : '<span>' + me.textDone + '</span>') + '</a></div>' +
'</div>' +
'</div>' +
'<div class="pages">' +
'<div class="page add-comment">' +
'<div class="page-edit-comment">' +
'<div class="page-content">' +
'<div class="wrap-comment">' +
(isAndroid ? '<div class="header-comment"><div class="initials-comment" style="background-color: ' + comment.usercolor + ';">' + comment.userInitials + '</div><div>' : '') +
@ -1380,7 +1389,6 @@ define([
'</div>' +
'</div>' +
'</div>' +
'</div>' +
'</div>'
);
$('.popup').css('z-index', '20000');
@ -1404,7 +1412,7 @@ define([
}
}
} else if ($('.container-collaboration').length > 0) {
this.getView('Common.Views.Collaboration').showPage('#comments-edit-view');
this.getView('Common.Views.Collaboration').showPage('#comments-edit-view', false);
this.getView('Common.Views.Collaboration').renderEditComment(comment);
}
_.defer(function () {
@ -1486,13 +1494,13 @@ define([
$viewComment.find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'none');
var template = _.template('<textarea class="edit-reply-textarea">' + reply.reply + '</textarea>');
$reply.append(template);
template = _.template('<a href="#" class="link done-reply" id="edit-reply">' + me.textDone + '</a>');
template = _.template('<a href="#" class="link" id="edit-reply">' + me.textDone + '</a>');
$viewComment.find('.button-right').append(template);
template = _.template('<a href="#" class="link cancel-reply">' + me.textCancel + '</a>');
$viewComment.find('.button-left').append(template);
}
} else if ($('.container-collaboration').length > 0) {
me.getView('Common.Views.Collaboration').showPage('#comments-edit-reply-view');
me.getView('Common.Views.Collaboration').showPage('#comments-edit-reply-view', false);
me.getView('Common.Views.Collaboration').renderEditReply(reply);
}
_.delay(function () {
@ -1509,7 +1517,7 @@ define([
if (Common.SharedSettings.get('phone')) {
uiApp.closeModal($$(editView));
} else {
$viewComment.find('a.done-reply, a.cancel-reply').remove();
$viewComment.find('a#edit-reply, a.cancel-reply').remove();
$viewComment.find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'flex');
}
this.updateViewComment();
@ -1521,7 +1529,7 @@ define([
}
}, me, comment, indReply));
$('.cancel-reply').single('click', _.bind(function () {
$viewComment.find('a.done-reply, a.cancel-reply, .edit-reply-textarea').remove();
$viewComment.find('a#edit-reply, a.cancel-reply, .edit-reply-textarea').remove();
$reply.find('.reply-text').css('display', 'block');
$viewComment.find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'flex');
}, me));
@ -1537,6 +1545,9 @@ define([
} else {
idComment = uid;
}
if (_.isNumber(idComment)) {
idComment = idComment.toString();
}
var comment = this.findComment(idComment);
if (comment) {
if (this.resolveComment(comment.uid)) {

View file

@ -262,7 +262,7 @@
<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="center sliding"><%= scope.textAddReply %></div>
<div class="right sliding"><a class="done-reply"><% if (android) { %><i class="icon icon-done-comment-white"></i><% } else { %><%= scope.textDone %><% } %></a></div>
<div class="right sliding"><a id="add-new-reply"><% if (android) { %><i class="icon icon-done-comment-white"></i><% } else { %><%= scope.textDone %><% } %></a></div>
</div>
</div>
<div class="pages">

View file

@ -201,6 +201,7 @@
//view comment
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 120ms;
background-color: #FFFFFF;
@ -225,7 +226,7 @@
}
.toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
&:before {
@ -264,12 +265,14 @@
margin-top: 0;
}
&.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
.toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
.toolbar-inner {
padding-right: 0;
@ -387,7 +390,7 @@
.navbar {
.right {
height: 100%;
.done-reply {
#add-reply, #edit-comment, #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
@ -398,3 +401,8 @@
}
}
.container-edit-comment {
position: fixed;
}

View file

@ -225,6 +225,7 @@
//view comment
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 100ms;
background-color: #FFFFFF;
@ -246,7 +247,7 @@
}
.toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
&.toolbar-bottom {
@ -294,12 +295,14 @@
margin-top: 0;
}
&.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
.toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
.toolbar-inner {
padding-right: 0;
@ -444,7 +447,7 @@
.navbar {
.right {
height: 100%;
.done-reply {
#add-reply, #edit-comment, #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
@ -453,4 +456,8 @@
}
}
}
}
.container-edit-comment {
position: fixed;
}

View file

@ -6746,6 +6746,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
background-color: #FFFFFF;
}
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 120ms;
background-color: #FFFFFF;
@ -6776,7 +6777,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
padding: 0;
}
.container-view-comment .toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
}
@ -6815,12 +6816,14 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
margin-top: 0;
}
.container-view-comment.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
}
.container-view-comment.popover .toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
}
.container-view-comment.popover .toolbar .toolbar-inner {
@ -6938,15 +6941,24 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-edit-reply .navbar .right {
height: 100%;
}
.page-edit-comment .navbar .right .done-reply,
.page-add-reply .navbar .right .done-reply,
.page-edit-reply .navbar .right .done-reply {
.page-edit-comment .navbar .right #add-reply,
.page-add-reply .navbar .right #add-reply,
.page-edit-reply .navbar .right #add-reply,
.page-edit-comment .navbar .right #edit-comment,
.page-add-reply .navbar .right #edit-comment,
.page-edit-reply .navbar .right #edit-comment,
.page-edit-comment .navbar .right #edit-reply,
.page-add-reply .navbar .right #edit-reply,
.page-edit-reply .navbar .right #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
.container-edit-comment {
position: fixed;
}
.tablet .searchbar.document.replace .center .searchbar:first-child {
margin-right: 10px;
}

View file

@ -6399,6 +6399,7 @@ html.phone .document-menu .list-block .item-link {
color: #446995;
}
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 100ms;
background-color: #FFFFFF;
@ -6426,7 +6427,7 @@ html.phone .document-menu .list-block .item-link {
padding: 0;
}
.container-view-comment .toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
}
@ -6472,12 +6473,14 @@ html.phone .document-menu .list-block .item-link {
margin-top: 0;
}
.container-view-comment.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
}
.container-view-comment.popover .toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
}
.container-view-comment.popover .toolbar .toolbar-inner {
@ -6628,15 +6631,24 @@ html.phone .document-menu .list-block .item-link {
.page-edit-reply .navbar .right {
height: 100%;
}
.page-edit-comment .navbar .right .done-reply,
.page-add-reply .navbar .right .done-reply,
.page-edit-reply .navbar .right .done-reply {
.page-edit-comment .navbar .right #add-reply,
.page-add-reply .navbar .right #add-reply,
.page-edit-reply .navbar .right #add-reply,
.page-edit-comment .navbar .right #edit-comment,
.page-add-reply .navbar .right #edit-comment,
.page-edit-reply .navbar .right #edit-comment,
.page-edit-comment .navbar .right #edit-reply,
.page-add-reply .navbar .right #edit-reply,
.page-edit-reply .navbar .right #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
.container-edit-comment {
position: fixed;
}
.tablet .searchbar.document.replace .center > .replace {
display: flex;
}

View file

@ -6746,6 +6746,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
background-color: #FFFFFF;
}
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 120ms;
background-color: #FFFFFF;
@ -6776,7 +6777,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
padding: 0;
}
.container-view-comment .toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
}
@ -6815,12 +6816,14 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
margin-top: 0;
}
.container-view-comment.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
}
.container-view-comment.popover .toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
}
.container-view-comment.popover .toolbar .toolbar-inner {
@ -6938,15 +6941,24 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-edit-reply .navbar .right {
height: 100%;
}
.page-edit-comment .navbar .right .done-reply,
.page-add-reply .navbar .right .done-reply,
.page-edit-reply .navbar .right .done-reply {
.page-edit-comment .navbar .right #add-reply,
.page-add-reply .navbar .right #add-reply,
.page-edit-reply .navbar .right #add-reply,
.page-edit-comment .navbar .right #edit-comment,
.page-add-reply .navbar .right #edit-comment,
.page-edit-reply .navbar .right #edit-comment,
.page-edit-comment .navbar .right #edit-reply,
.page-add-reply .navbar .right #edit-reply,
.page-edit-reply .navbar .right #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
.container-edit-comment {
position: fixed;
}
.tablet .searchbar.document.replace .center .searchbar:first-child {
margin-right: 10px;
}

View file

@ -6399,6 +6399,7 @@ html.phone .document-menu .list-block .item-link {
color: #aa5252;
}
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 100ms;
background-color: #FFFFFF;
@ -6426,7 +6427,7 @@ html.phone .document-menu .list-block .item-link {
padding: 0;
}
.container-view-comment .toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
}
@ -6472,12 +6473,14 @@ html.phone .document-menu .list-block .item-link {
margin-top: 0;
}
.container-view-comment.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
}
.container-view-comment.popover .toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
}
.container-view-comment.popover .toolbar .toolbar-inner {
@ -6628,15 +6631,24 @@ html.phone .document-menu .list-block .item-link {
.page-edit-reply .navbar .right {
height: 100%;
}
.page-edit-comment .navbar .right .done-reply,
.page-add-reply .navbar .right .done-reply,
.page-edit-reply .navbar .right .done-reply {
.page-edit-comment .navbar .right #add-reply,
.page-add-reply .navbar .right #add-reply,
.page-edit-reply .navbar .right #add-reply,
.page-edit-comment .navbar .right #edit-comment,
.page-add-reply .navbar .right #edit-comment,
.page-edit-reply .navbar .right #edit-comment,
.page-edit-comment .navbar .right #edit-reply,
.page-add-reply .navbar .right #edit-reply,
.page-edit-reply .navbar .right #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
.container-edit-comment {
position: fixed;
}
.tablet .searchbar.document.replace .center > .replace {
display: flex;
}

View file

@ -6746,6 +6746,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
background-color: #FFFFFF;
}
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 120ms;
background-color: #FFFFFF;
@ -6776,7 +6777,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
padding: 0;
}
.container-view-comment .toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
}
@ -6815,12 +6816,14 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
margin-top: 0;
}
.container-view-comment.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
}
.container-view-comment.popover .toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
}
.container-view-comment.popover .toolbar .toolbar-inner {
@ -6938,15 +6941,24 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-edit-reply .navbar .right {
height: 100%;
}
.page-edit-comment .navbar .right .done-reply,
.page-add-reply .navbar .right .done-reply,
.page-edit-reply .navbar .right .done-reply {
.page-edit-comment .navbar .right #add-reply,
.page-add-reply .navbar .right #add-reply,
.page-edit-reply .navbar .right #add-reply,
.page-edit-comment .navbar .right #edit-comment,
.page-add-reply .navbar .right #edit-comment,
.page-edit-reply .navbar .right #edit-comment,
.page-edit-comment .navbar .right #edit-reply,
.page-add-reply .navbar .right #edit-reply,
.page-edit-reply .navbar .right #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
.container-edit-comment {
position: fixed;
}
i.icon.icon-search {
width: 24px;
height: 24px;

View file

@ -6409,6 +6409,7 @@ html.phone .document-menu .list-block .item-link {
color: #40865c;
}
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 100ms;
background-color: #FFFFFF;
@ -6436,7 +6437,7 @@ html.phone .document-menu .list-block .item-link {
padding: 0;
}
.container-view-comment .toolbar {
position: absolute;
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
}
@ -6482,12 +6483,14 @@ html.phone .document-menu .list-block .item-link {
margin-top: 0;
}
.container-view-comment.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
}
.container-view-comment.popover .toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
}
.container-view-comment.popover .toolbar .toolbar-inner {
@ -6638,15 +6641,24 @@ html.phone .document-menu .list-block .item-link {
.page-edit-reply .navbar .right {
height: 100%;
}
.page-edit-comment .navbar .right .done-reply,
.page-add-reply .navbar .right .done-reply,
.page-edit-reply .navbar .right .done-reply {
.page-edit-comment .navbar .right #add-reply,
.page-add-reply .navbar .right #add-reply,
.page-edit-reply .navbar .right #add-reply,
.page-edit-comment .navbar .right #edit-comment,
.page-add-reply .navbar .right #edit-comment,
.page-edit-reply .navbar .right #edit-comment,
.page-edit-comment .navbar .right #edit-reply,
.page-add-reply .navbar .right #edit-reply,
.page-edit-reply .navbar .right #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
.container-edit-comment {
position: fixed;
}
.tablet .searchbar.document.replace .center > .replace {
display: flex;
}