Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
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
nexedi
converse.js
Commits
41426529
Commit
41426529
authored
Sep 24, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop dragresize-tm class. Don't set height if not available
parent
a9c2b7d9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
12 deletions
+10
-12
converse.js
converse.js
+4
-5
src/templates/chatbox.html
src/templates/chatbox.html
+2
-2
src/templates/chatroom.html
src/templates/chatroom.html
+2
-3
src/templates/controlbox.html
src/templates/controlbox.html
+2
-2
No files found.
converse.js
View file @
41426529
...
@@ -1197,7 +1197,7 @@
...
@@ -1197,7 +1197,7 @@
'
click .end-otr
'
:
'
endOTR
'
,
'
click .end-otr
'
:
'
endOTR
'
,
'
click .auth-otr
'
:
'
authOTR
'
,
'
click .auth-otr
'
:
'
authOTR
'
,
'
click .toggle-call
'
:
'
toggleCall
'
,
'
click .toggle-call
'
:
'
toggleCall
'
,
'
mousedown .dragresize
-tm
'
:
'
onDragResizeStart
'
'
mousedown .dragresize
'
:
'
onDragResizeStart
'
},
},
initialize
:
function
()
{
initialize
:
function
()
{
...
@@ -2017,8 +2017,7 @@
...
@@ -2017,8 +2017,7 @@
callback
.
apply
(
this
,
arguments
);
callback
.
apply
(
this
,
arguments
);
}
}
if
(
converse
.
connection
.
connected
)
{
if
(
converse
.
connection
.
connected
)
{
// Without a connection, we haven't yet initialized
// Without a connection, we haven't yet initialized localstorage
// localstorage
this
.
model
.
save
();
this
.
model
.
save
();
this
.
initDragResize
();
this
.
initDragResize
();
}
}
...
@@ -2375,7 +2374,7 @@
...
@@ -2375,7 +2374,7 @@
events
:
{
events
:
{
'
click a.close-chatbox-button
'
:
'
close
'
,
'
click a.close-chatbox-button
'
:
'
close
'
,
'
click ul#controlbox-tabs li a
'
:
'
switchTab
'
,
'
click ul#controlbox-tabs li a
'
:
'
switchTab
'
,
'
mousedown .dragresize
-tm
'
:
'
onDragResizeStart
'
'
mousedown .dragresize
'
:
'
onDragResizeStart
'
},
},
initialize
:
function
()
{
initialize
:
function
()
{
...
@@ -2734,7 +2733,7 @@
...
@@ -2734,7 +2733,7 @@
'
click .toggle-call
'
:
'
toggleCall
'
,
'
click .toggle-call
'
:
'
toggleCall
'
,
'
click .toggle-participants a
'
:
'
toggleOccupants
'
,
'
click .toggle-participants a
'
:
'
toggleOccupants
'
,
'
keypress textarea.chat-textarea
'
:
'
keyPressed
'
,
'
keypress textarea.chat-textarea
'
:
'
keyPressed
'
,
'
mousedown .dragresize
-tm
'
:
'
onDragResizeStart
'
'
mousedown .dragresize
'
:
'
onDragResizeStart
'
},
},
is_chatroom
:
true
,
is_chatroom
:
true
,
...
...
src/templates/chatbox.html
View file @
41426529
<div
class=
"box-flyout"
style=
"height: {{height}}px"
>
<div
class=
"box-flyout"
{[
if
(
height
)
{
]}
style=
"height: {{height}}px"
{[
}
]}
>
<div
class=
"dragresize
dragresize-tm
"
></div>
<div
class=
"dragresize"
></div>
<div
class=
"chat-head chat-head-chatbox"
>
<div
class=
"chat-head chat-head-chatbox"
>
<a
class=
"close-chatbox-button icon-close"
></a>
<a
class=
"close-chatbox-button icon-close"
></a>
<a
class=
"toggle-chatbox-button icon-minus"
></a>
<a
class=
"toggle-chatbox-button icon-minus"
></a>
...
...
src/templates/chatroom.html
View file @
41426529
<div
class=
"box-flyout"
style=
"height: {{height}}px"
<div
class=
"box-flyout"
{[
if
(
height
)
{
]}
style=
"height: {{height}}px"
{[
}
]}
>
{[
if
(
minimized
)
{
]}
style=
"display:none"
{[
}
]}
>
<div
class=
"dragresize"
></div>
<div
class=
"dragresize dragresize-tm"
></div>
<div
class=
"chat-head chat-head-chatroom"
>
<div
class=
"chat-head chat-head-chatroom"
>
<a
class=
"close-chatbox-button icon-close"
></a>
<a
class=
"close-chatbox-button icon-close"
></a>
<a
class=
"toggle-chatbox-button icon-minus"
></a>
<a
class=
"toggle-chatbox-button icon-minus"
></a>
...
...
src/templates/controlbox.html
View file @
41426529
<div
class=
"box-flyout"
style=
"height: {{height}}px"
>
<div
class=
"box-flyout"
{[
if
(
height
)
{
]}
style=
"height: {{height}}px"
{[
}
]}
>
<div
class=
"dragresize
dragresize-tm
"
></div>
<div
class=
"dragresize"
></div>
<div
class=
"chat-head controlbox-head"
>
<div
class=
"chat-head controlbox-head"
>
<ul
id=
"controlbox-tabs"
></ul>
<ul
id=
"controlbox-tabs"
></ul>
<a
class=
"close-chatbox-button icon-close"
></a>
<a
class=
"close-chatbox-button icon-close"
></a>
...
...
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