Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
d0382c04
Commit
d0382c04
authored
May 15, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32419
parent
c864a112
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
apps/common/main/lib/view/Chat.js
apps/common/main/lib/view/Chat.js
+6
-5
No files found.
apps/common/main/lib/view/Chat.js
View file @
d0382c04
...
@@ -278,6 +278,7 @@ define([
...
@@ -278,6 +278,7 @@ define([
hide
:
function
()
{
hide
:
function
()
{
Common
.
UI
.
BaseView
.
prototype
.
hide
.
call
(
this
,
arguments
);
Common
.
UI
.
BaseView
.
prototype
.
hide
.
call
(
this
,
arguments
);
this
.
fireEvent
(
'
hide
'
,
this
);
this
.
fireEvent
(
'
hide
'
,
this
);
this
.
textBoxAutoSizeLocked
=
undefined
;
},
},
setupLayout
:
function
()
{
setupLayout
:
function
()
{
...
@@ -340,6 +341,7 @@ define([
...
@@ -340,6 +341,7 @@ define([
// text box setup autosize input text
// text box setup autosize input text
this
.
setupAutoSizingTextBox
();
this
.
setupAutoSizingTextBox
();
this
.
txtMessage
.
bind
(
'
input propertychange
'
,
_
.
bind
(
this
.
updateHeightTextBox
,
this
));
},
},
updateLayout
:
function
(
applyUsersAutoSizig
)
{
updateLayout
:
function
(
applyUsersAutoSizig
)
{
...
@@ -373,18 +375,17 @@ define([
...
@@ -373,18 +375,17 @@ define([
this
.
lineHeight
=
parseInt
(
this
.
txtMessage
.
css
(
'
lineHeight
'
),
10
)
*
1.25
;
// TODO: need fix
this
.
lineHeight
=
parseInt
(
this
.
txtMessage
.
css
(
'
lineHeight
'
),
10
)
*
1.25
;
// TODO: need fix
this
.
updateHeightTextBox
(
true
);
this
.
updateHeightTextBox
(
true
);
this
.
txtMessage
.
bind
(
'
input propertychange
'
,
_
.
bind
(
this
.
updateHeightTextBox
,
this
));
},
},
updateHeightTextBox
:
function
(
event
)
{
updateHeightTextBox
:
function
(
event
)
{
var
textBox
,
controlHeight
,
contentHeight
,
height
,
var
textBox
=
this
.
txtMessage
,
controlHeight
,
contentHeight
,
height
,
textBoxMinHeightIndent
=
36
+
4
;
// 4px - autosize line height + big around border
textBoxMinHeightIndent
=
36
+
4
;
// 4px - autosize line height + big around border
textBox
=
$
(
'
#chat-msg-text
'
,
this
.
el
);
height
=
this
.
panelBox
.
height
();
height
=
this
.
panelBox
.
height
();
if
(
event
&&
0
==
textBox
.
val
().
length
)
{
if
(
event
&&
0
==
textBox
.
val
().
length
)
{
this
.
layout
.
setResizeValue
(
1
,
Math
.
max
(
-
this
.
addMessageBoxHeight
,
height
-
this
.
addMessageBoxHeight
));
this
.
layout
.
setResizeValue
(
1
,
Math
.
max
(
this
.
addMessageBoxHeight
,
height
-
this
.
addMessageBoxHeight
));
this
.
textBoxAutoSizeLocked
=
undefined
;
this
.
textBoxAutoSizeLocked
=
undefined
;
return
;
return
;
}
}
...
@@ -407,7 +408,7 @@ define([
...
@@ -407,7 +408,7 @@ define([
height
=
this
.
panelBox
.
height
();
height
=
this
.
panelBox
.
height
();
this
.
layout
.
setResizeValue
(
1
,
this
.
layout
.
setResizeValue
(
1
,
Math
.
max
(
-
this
.
addMessageBoxHeight
,
Math
.
max
(
this
.
addMessageBoxHeight
,
Math
.
min
(
height
-
contentHeight
-
textBoxMinHeightIndent
,
height
-
this
.
addMessageBoxHeight
)));
Math
.
min
(
height
-
contentHeight
-
textBoxMinHeightIndent
,
height
-
this
.
addMessageBoxHeight
)));
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment