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
06cbd5cd
Commit
06cbd5cd
authored
Nov 22, 2016
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the chats_panel.html template in converse-minimize.js
To which it's actually applicable (instead of core).
parent
586bbd0e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
22 deletions
+30
-22
src/converse-core.js
src/converse-core.js
+8
-8
src/converse-minimize.js
src/converse-minimize.js
+20
-10
src/templates/chats_panel.html
src/templates/chats_panel.html
+2
-4
No files found.
src/converse-core.js
View file @
06cbd5cd
...
...
@@ -15,15 +15,11 @@
"
moment_with_locales
"
,
"
strophe
"
,
"
pluggable
"
,
"
tpl!chats_panel
"
,
"
strophe.disco
"
,
"
backbone.browserStorage
"
,
"
backbone.overview
"
,
],
factory
);
}(
this
,
function
(
$
,
_
,
dummy
,
utils
,
moment
,
Strophe
,
pluggable
,
tpl_chats_panel
)
{
}(
this
,
function
(
$
,
_
,
dummy
,
utils
,
moment
,
Strophe
,
pluggable
)
{
/*
* Cannot use this due to Safari bug.
* See https://github.com/jcbrand/converse.js/issues/196
...
...
@@ -54,7 +50,7 @@
var
event_context
=
{};
var
converse
=
{
templates
:
{
'
chats_panel
'
:
tpl_chats_panel
},
templates
:
{},
emit
:
function
(
evt
,
data
)
{
$
(
event_context
).
trigger
(
evt
,
data
);
...
...
@@ -1517,7 +1513,7 @@
$el
=
$
(
'
<div id="conversejs">
'
);
$
(
'
body
'
).
append
(
$el
);
}
$el
.
html
(
converse
.
templates
.
chats_panel
()
);
$el
.
html
(
''
);
this
.
setElement
(
$el
,
false
);
}
else
{
this
.
setElement
(
_
.
result
(
this
,
'
el
'
),
false
);
...
...
@@ -1923,9 +1919,13 @@
return
this
;
};
this
.
_initialize
=
function
()
{
this
.
initChatBoxes
=
function
()
{
this
.
chatboxes
=
new
this
.
ChatBoxes
();
this
.
chatboxviews
=
new
this
.
ChatBoxViews
({
model
:
this
.
chatboxes
});
};
this
.
_initialize
=
function
()
{
this
.
initChatBoxes
();
this
.
initSession
();
this
.
initConnection
();
this
.
setUpXMLLogging
();
...
...
src/converse-minimize.js
View file @
06cbd5cd
...
...
@@ -13,6 +13,7 @@
"
tpl!chatbox_minimize
"
,
"
tpl!toggle_chats
"
,
"
tpl!trimmed_chat
"
,
"
tpl!chats_panel
"
,
"
converse-controlbox
"
,
"
converse-chatview
"
,
"
converse-muc
"
...
...
@@ -22,12 +23,14 @@
converse_api
,
tpl_chatbox_minimize
,
tpl_toggle_chats
,
tpl_trimmed_chat
tpl_trimmed_chat
,
tpl_chats_panel
)
{
"
use strict
"
;
converse
.
templates
.
chatbox_minimize
=
tpl_chatbox_minimize
;
converse
.
templates
.
toggle_chats
=
tpl_toggle_chats
;
converse
.
templates
.
trimmed_chat
=
tpl_trimmed_chat
;
converse
.
templates
.
chats_panel
=
tpl_chats_panel
;
var
$
=
converse_api
.
env
.
jQuery
,
_
=
converse_api
.
env
.
_
,
...
...
@@ -45,12 +48,12 @@
//
// New functions which don't exist yet can also be added.
_initialize
:
function
()
{
this
.
__super__
.
_initialize
.
apply
(
this
,
arguments
);
initChatBoxes
:
function
()
{
var
result
=
this
.
__super__
.
initChatBoxes
.
apply
(
this
,
arguments
);
converse
.
minimized_chats
=
new
converse
.
MinimizedChats
({
model
:
converse
.
chatboxes
});
return
this
;
return
result
;
},
registerGlobalEventHandlers
:
function
()
{
...
...
@@ -158,8 +161,7 @@
maximize
:
function
()
{
// Restores a minimized chat box
var
chatboxviews
=
converse
.
chatboxviews
;
this
.
$el
.
insertAfter
(
chatboxviews
.
get
(
"
controlbox
"
).
$el
)
this
.
$el
.
insertAfter
(
converse
.
chatboxviews
.
get
(
"
controlbox
"
).
$el
)
.
show
(
'
fast
'
,
this
.
onMaximized
.
bind
(
this
));
return
this
;
},
...
...
@@ -372,12 +374,15 @@
converse
.
MinimizedChats
=
Backbone
.
Overview
.
extend
({
el
:
"
#minimized-chats
"
,
tagName
:
'
div
'
,
id
:
"
minimized-chats
"
,
className
:
'
hidden
'
,
events
:
{
"
click #toggle-minimized-chats
"
:
"
toggle
"
},
initialize
:
function
()
{
this
.
render
();
this
.
initToggle
();
this
.
model
.
on
(
"
add
"
,
this
.
onChanged
,
this
);
this
.
model
.
on
(
"
destroy
"
,
this
.
removeChat
,
this
);
...
...
@@ -404,11 +409,16 @@
},
render
:
function
()
{
if
(
!
this
.
el
.
parentElement
)
{
this
.
el
.
innerHTML
=
converse
.
templates
.
chats_panel
();
converse
.
chatboxviews
.
el
.
appendChild
(
this
.
el
);
}
if
(
this
.
keys
().
length
===
0
)
{
this
.
$el
.
hide
(
);
this
.
el
.
classList
.
add
(
'
hidden
'
);
converse
.
chatboxviews
.
trimChats
.
bind
(
converse
.
chatboxviews
);
}
else
if
(
this
.
keys
().
length
===
1
&&
!
this
.
$el
.
is
(
'
:visible
'
))
{
this
.
$el
.
show
(
'
fast
'
,
converse
.
chatboxviews
.
trimChats
.
bind
(
converse
.
chatboxviews
));
}
else
if
(
this
.
keys
().
length
>
0
&&
!
this
.
$el
.
is
(
'
:visible
'
))
{
this
.
el
.
classList
.
remove
(
'
hidden
'
);
converse
.
chatboxviews
.
trimChats
();
}
return
this
.
$el
;
},
...
...
src/templates/chats_panel.html
View file @
06cbd5cd
<div
id=
"minimized-chats"
>
<a
id=
"toggle-minimized-chats"
href=
"#"
></a>
<div
class=
"flyout minimized-chats-flyout"
></div>
</div>
<a
id=
"toggle-minimized-chats"
href=
"#"
></a>
<div
class=
"flyout minimized-chats-flyout"
></div>
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