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

revert commit 161bd0ee3d (Bug 35896)

Browse source
This commit is contained in:
Julia Radzhabova 2018-05-08 11:07:01 +03:00
parent 12c8e28d52
commit 0af418dced
4 changed files with 29 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/mods/perfect-scrollbar.js
View file

@ -317,7 +317,7 @@
var deltaX = e.deltaX * e.deltaFactor || deprecatedDeltaX, var deltaX = e.deltaX * e.deltaFactor || deprecatedDeltaX,
deltaY = e.deltaY * e.deltaFactor || deprecatedDeltaY; deltaY = e.deltaY * e.deltaFactor || deprecatedDeltaY;
if (e && e.target && (e.target.type === 'textarea' && !e.target.hasAttribute('readonly') || e.target.type === 'input')) { if (e && e.target && (e.target.type === 'textarea' || e.target.type === 'input')) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();

4
apps/common/main/lib/template/CommentsPopover.template
View file

@ -5,7 +5,7 @@
<div class="user-name"><%=scope.getUserName(username)%></div> <div class="user-name"><%=scope.getUserName(username)%></div>
<div class="user-date"><%=date%></div> <div class="user-date"><%=date%></div>
<% if (!editTextInPopover || hint) { %> <% if (!editTextInPopover || hint) { %>
<textarea readonly class="user-message user-select" style="overflow: hidden;" maxlength="maxCommLength"><%=scope.pickLink(comment)%></textarea> <div class="user-message"><%=scope.pickLink(comment)%></div>
<% } else { %> <% } else { %>
<div class="inner-edit-ct"> <div class="inner-edit-ct">
<textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea> <textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
@ -27,7 +27,7 @@
<div class="user-name"><%=scope.getUserName(item.get("username"))%></div> <div class="user-name"><%=scope.getUserName(item.get("username"))%></div>
<div class="user-date"><%=item.get("date")%></div> <div class="user-date"><%=item.get("date")%></div>
<% if (!item.get("editTextInPopover")) { %> <% if (!item.get("editTextInPopover")) { %>
<textarea readonly class="user-message user-select" maxlength="maxCommLength" style="overflow: hidden;"><%=scope.pickLink(item.get("reply"))%></textarea> <div class="user-message"><%=scope.pickLink(item.get("reply"))%></div>
<% if (!hint) { %> <% if (!hint) { %>
<div class="btns-reply-ct"> <div class="btns-reply-ct">
<% if (item.get("editable")) { %> <% if (item.get("editable")) { %>

61
apps/common/main/lib/view/Comments.js
View file

@ -152,11 +152,11 @@ define([
}, },
getTextBox: function () { getTextBox: function () {
var text = $(this.el).find('textarea:not(.user-message)'); var text = $(this.el).find('textarea');
return (text && text.length) ? text : undefined; return (text && text.length) ? text : undefined;
}, },
setFocusToTextBox: function (blur) { setFocusToTextBox: function (blur) {
var text = $(this.el).find('textarea:not(.user-message)'); var text = $(this.el).find('textarea');
if (blur) { if (blur) {
text.blur(); text.blur();
} else { } else {
@ -169,16 +169,15 @@ define([
} }
}, },
getActiveTextBoxVal: function () { getActiveTextBoxVal: function () {
var text = $(this.el).find('textarea:not(.user-message)'); var text = $(this.el).find('textarea');
return (text && text.length) ? text.val().trim() : ''; return (text && text.length) ? text.val().trim() : '';
}, },
autoHeightTextBox: function () { autoHeightTextBox: function () {
var view = this, var view = this,
textBox = this.$el.find('textarea'), textBox = this.$el.find('textarea'),
domTextBox = null, domTextBox = null,
$domTextBox = null,
lineHeight = 0,
minHeight = 50, minHeight = 50,
lineHeight = 0,
scrollPos = 0, scrollPos = 0,
oldHeight = 0, oldHeight = 0,
newHeight = 0; newHeight = 0;
@ -187,17 +186,17 @@ define([
scrollPos = $(view.scroller.el).scrollTop(); scrollPos = $(view.scroller.el).scrollTop();
if (domTextBox.scrollHeight > domTextBox.clientHeight) { if (domTextBox.scrollHeight > domTextBox.clientHeight) {
$domTextBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'}); textBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
parentView.calculateSizeOfContent(); parentView.calculateSizeOfContent();
} else { } else {
oldHeight = domTextBox.clientHeight; oldHeight = domTextBox.clientHeight;
if (oldHeight >= minHeight) { if (oldHeight >= minHeight) {
$domTextBox.css({height: minHeight + 'px'}); textBox.css({height: minHeight + 'px'});
if (domTextBox.scrollHeight > domTextBox.clientHeight) { if (domTextBox.scrollHeight > domTextBox.clientHeight) {
newHeight = Math.max(domTextBox.scrollHeight + lineHeight, minHeight); newHeight = Math.max(domTextBox.scrollHeight + lineHeight, minHeight);
$domTextBox.css({height: newHeight + 'px'}); textBox.css({height: newHeight + 'px'});
} }
parentView.calculateSizeOfContent(); parentView.calculateSizeOfContent();
@ -210,23 +209,17 @@ define([
view.autoScrollToEditButtons(); view.autoScrollToEditButtons();
} }
this.textBox = undefined;
if (textBox && textBox.length) { if (textBox && textBox.length) {
textBox.each(function(idx, item){ domTextBox = textBox.get(0);
if (item) {
domTextBox = item; if (domTextBox) {
$domTextBox = $(item); lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
var isEdited = !$domTextBox.hasClass('user-message'); updateTextBoxHeight();
lineHeight = isEdited ? parseInt($domTextBox.css('lineHeight'), 10) * 0.25 : 0; textBox.bind('input propertychange', updateTextBoxHeight)
minHeight = isEdited ? 50 : 24; }
updateTextBoxHeight();
if (isEdited) {
$domTextBox.bind('input propertychange', updateTextBoxHeight);
view.textBox = $domTextBox;
}
}
});
} }
this.textBox = textBox;
}, },
clearTextBoxBind: function () { clearTextBoxBind: function () {
if (this.textBox) { if (this.textBox) {
@ -383,7 +376,6 @@ define([
t.fireEvent('comment:closeEditing'); t.fireEvent('comment:closeEditing');
readdresolves(); readdresolves();
this.autoHeightTextBox();
} else if (btn.hasClass('user-reply')) { } else if (btn.hasClass('user-reply')) {
t.fireEvent('comment:closeEditing'); t.fireEvent('comment:closeEditing');
@ -408,7 +400,6 @@ define([
t.fireEvent('comment:closeEditing'); t.fireEvent('comment:closeEditing');
readdresolves(); readdresolves();
this.autoHeightTextBox();
} }
} else if (btn.hasClass('btn-close', false)) { } else if (btn.hasClass('btn-close', false)) {
t.fireEvent('comment:closeEditing', [commentId]); t.fireEvent('comment:closeEditing', [commentId]);
@ -416,7 +407,6 @@ define([
t.fireEvent('comment:show', [commentId]); t.fireEvent('comment:show', [commentId]);
readdresolves(); readdresolves();
this.autoHeightTextBox();
} else if (btn.hasClass('btn-inner-edit', false)) { } else if (btn.hasClass('btn-inner-edit', false)) {
@ -447,7 +437,6 @@ define([
} }
readdresolves(); readdresolves();
this.autoHeightTextBox();
} else if (btn.hasClass('btn-inner-close', false)) { } else if (btn.hasClass('btn-inner-close', false)) {
if (record.get('dummy')) { if (record.get('dummy')) {
@ -459,8 +448,11 @@ define([
me.saveText(); me.saveText();
record.set('hideAddReply', false); record.set('hideAddReply', false);
this.getTextBox().val(me.textVal); this.getTextBox().val(me.textVal);
this.autoHeightTextBox();
} else { } else {
this.clearTextBoxBind(); this.clearTextBoxBind();
t.fireEvent('comment:closeEditing', [commentId]); t.fireEvent('comment:closeEditing', [commentId]);
} }
@ -471,7 +463,6 @@ define([
me.calculateSizeOfContent(); me.calculateSizeOfContent();
readdresolves(); readdresolves();
this.autoHeightTextBox();
} else if (btn.hasClass('btn-resolve', false)) { } else if (btn.hasClass('btn-resolve', false)) {
var tip = btn.data('bs.tooltip'); var tip = btn.data('bs.tooltip');
@ -480,7 +471,6 @@ define([
t.fireEvent('comment:resolve', [commentId]); t.fireEvent('comment:resolve', [commentId]);
readdresolves(); readdresolves();
this.autoHeightTextBox();
} else if (btn.hasClass('btn-resolve-check', false)) { } else if (btn.hasClass('btn-resolve-check', false)) {
var tip = btn.data('bs.tooltip'); var tip = btn.data('bs.tooltip');
if (tip) tip.dontShow = true; if (tip) tip.dontShow = true;
@ -488,21 +478,20 @@ define([
t.fireEvent('comment:resolve', [commentId]); t.fireEvent('comment:resolve', [commentId]);
readdresolves(); readdresolves();
this.autoHeightTextBox();
} }
} }
}); });
me.on({ me.on({
'show': function () { 'show': function () {
me.$window.find('textarea:not(.user-message)').keydown(function (event) { me.commentsView.autoHeightTextBox();
me.$window.find('textarea').keydown(function (event) {
if (event.keyCode == Common.UI.Keys.ESC) { if (event.keyCode == Common.UI.Keys.ESC) {
me.hide(); me.hide();
} }
}); });
}, },
'animate:before': function () { 'animate:before': function () {
me.commentsView.autoHeightTextBox(); var text = me.$window.find('textarea');
var text = me.$window.find('textarea:not(.user-message)');
if (text && text.length) if (text && text.length)
text.focus(); text.focus();
} }
@ -910,11 +899,11 @@ define([
}, },
getTextBox: function () { getTextBox: function () {
var text = $(this.el).find('textarea:not(.user-message)'); var text = $(this.el).find('textarea');
return (text && text.length) ? text : undefined; return (text && text.length) ? text : undefined;
}, },
setFocusToTextBox: function () { setFocusToTextBox: function () {
var text = $(this.el).find('textarea:not(.user-message)'); var text = $(this.el).find('textarea');
if (text && text.length) { if (text && text.length) {
var val = text.val(); var val = text.val();
text.focus(); text.focus();
@ -923,7 +912,7 @@ define([
} }
}, },
getActiveTextBoxVal: function () { getActiveTextBoxVal: function () {
var text = $(this.el).find('textarea:not(.user-message)'); var text = $(this.el).find('textarea');
return (text && text.length) ? text.val().trim() : ''; return (text && text.length) ? text.val().trim() : '';
}, },
autoHeightTextBox: function () { autoHeightTextBox: function () {

10
apps/common/main/resources/less/comments.less
View file

@ -78,7 +78,7 @@
overflow: hidden; overflow: hidden;
color: @gray-darker; color: @gray-darker;
textarea:not(.user-message) { textarea {
width: 100%; width: 100%;
height: 50px; height: 50px;
resize: none; resize: none;
@ -171,14 +171,6 @@
} }
} }
textarea.user-message {
border: none;
resize: none;
width: 100%;
line-height: 15px;
cursor: text;
}
.user-reply { .user-reply {
color: @black; color: @black;
margin-top: 10px; margin-top: 10px;