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
d0ba94e9
Commit
d0ba94e9
authored
Jul 09, 2020
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace lodash templates with lit-html
parent
54ffd900
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
34 deletions
+42
-34
spec/chatbox.js
spec/chatbox.js
+2
-2
src/converse-minimize.js
src/converse-minimize.js
+14
-21
src/templates/toggle_chats.html
src/templates/toggle_chats.html
+0
-2
src/templates/toggle_chats.js
src/templates/toggle_chats.js
+11
-0
src/templates/trimmed_chat.html
src/templates/trimmed_chat.html
+0
-9
src/templates/trimmed_chat.js
src/templates/trimmed_chat.js
+15
-0
No files found.
spec/chatbox.js
View file @
d0ba94e9
...
@@ -1618,7 +1618,7 @@ describe("Chatboxes", function () {
...
@@ -1618,7 +1618,7 @@ describe("Chatboxes", function () {
const
unread_count
=
selectUnreadMsgCount
();
const
unread_count
=
selectUnreadMsgCount
();
expect
(
u
.
isVisible
(
unread_count
)).
toBeTruthy
();
expect
(
u
.
isVisible
(
unread_count
)).
toBeTruthy
();
expect
(
unread_count
.
innerHTML
).
toBe
(
'
1
'
);
expect
(
unread_count
.
innerHTML
.
replace
(
/<!---->/g
,
''
)
).
toBe
(
'
1
'
);
done
();
done
();
}));
}));
...
@@ -1643,7 +1643,7 @@ describe("Chatboxes", function () {
...
@@ -1643,7 +1643,7 @@ describe("Chatboxes", function () {
await
u
.
waitUntil
(()
=>
view
.
model
.
messages
.
length
);
await
u
.
waitUntil
(()
=>
view
.
model
.
messages
.
length
);
const
unread_count
=
selectUnreadMsgCount
();
const
unread_count
=
selectUnreadMsgCount
();
expect
(
u
.
isVisible
(
unread_count
)).
toBeTruthy
();
expect
(
u
.
isVisible
(
unread_count
)).
toBeTruthy
();
expect
(
unread_count
.
innerHTML
).
toBe
(
'
1
'
);
expect
(
unread_count
.
innerHTML
.
replace
(
/<!---->/g
,
''
)
).
toBe
(
'
1
'
);
done
();
done
();
}));
}));
...
...
src/converse-minimize.js
View file @
d0ba94e9
...
@@ -5,14 +5,15 @@
...
@@ -5,14 +5,15 @@
*/
*/
import
"
converse-chatview
"
;
import
"
converse-chatview
"
;
import
tpl_chats_panel
from
"
templates/chats_panel.html
"
;
import
tpl_chats_panel
from
"
templates/chats_panel.html
"
;
import
tpl_toggle_chats
from
"
templates/toggle_chats.
html
"
;
import
tpl_toggle_chats
from
"
templates/toggle_chats.
js
"
;
import
tpl_trimmed_chat
from
"
templates/trimmed_chat.
html
"
;
import
tpl_trimmed_chat
from
"
templates/trimmed_chat.
js
"
;
import
{
Model
}
from
'
@converse/skeletor/src/model.js
'
;
import
{
Model
}
from
'
@converse/skeletor/src/model.js
'
;
import
{
Overview
}
from
"
@converse/skeletor/src/overview
"
;
import
{
Overview
}
from
"
@converse/skeletor/src/overview
"
;
import
{
View
}
from
"
@converse/skeletor/src/view
"
;
import
{
View
}
from
"
@converse/skeletor/src/view
"
;
import
{
__
}
from
'
@converse/headless/i18n
'
;
import
{
__
}
from
'
@converse/headless/i18n
'
;
import
{
_converse
,
api
,
converse
}
from
"
@converse/headless/converse-core
"
;
import
{
_converse
,
api
,
converse
}
from
"
@converse/headless/converse-core
"
;
import
{
debounce
,
sum
}
from
'
lodash-es
'
;
import
{
debounce
,
sum
}
from
'
lodash-es
'
;
import
{
render
}
from
'
lit-html
'
;
const
{
dayjs
}
=
converse
.
env
;
const
{
dayjs
}
=
converse
.
env
;
const
u
=
converse
.
env
.
utils
;
const
u
=
converse
.
env
.
utils
;
...
@@ -342,12 +343,8 @@ converse.plugins.add('converse-minimize', {
...
@@ -342,12 +343,8 @@ converse.plugins.add('converse-minimize', {
},
},
render
()
{
render
()
{
const
data
=
Object
.
assign
(
const
data
=
Object
.
assign
(
this
.
model
.
toJSON
(),
{
'
title
'
:
this
.
model
.
getDisplayName
()});
this
.
model
.
toJSON
(),
{
render
(
tpl_trimmed_chat
(
data
),
this
.
el
);
'
tooltip
'
:
__
(
'
Click to restore this chat
'
),
'
title
'
:
this
.
model
.
getDisplayName
()
});
this
.
el
.
innerHTML
=
tpl_trimmed_chat
(
data
);
return
this
.
el
;
return
this
.
el
;
},
},
...
@@ -383,9 +380,9 @@ converse.plugins.add('converse-minimize', {
...
@@ -383,9 +380,9 @@ converse.plugins.add('converse-minimize', {
"
click #toggle-minimized-chats
"
:
"
toggle
"
"
click #toggle-minimized-chats
"
:
"
toggle
"
},
},
initialize
()
{
async
initialize
()
{
this
.
render
();
this
.
render
();
this
.
initToggle
();
await
this
.
initToggle
();
this
.
addMultipleChats
(
this
.
model
.
where
({
'
minimized
'
:
true
}));
this
.
addMultipleChats
(
this
.
model
.
where
({
'
minimized
'
:
true
}));
this
.
listenTo
(
this
.
model
,
"
add
"
,
this
.
onChanged
)
this
.
listenTo
(
this
.
model
,
"
add
"
,
this
.
onChanged
)
this
.
listenTo
(
this
.
model
,
"
destroy
"
,
this
.
removeChat
)
this
.
listenTo
(
this
.
model
,
"
destroy
"
,
this
.
removeChat
)
...
@@ -406,13 +403,12 @@ converse.plugins.add('converse-minimize', {
...
@@ -406,13 +403,12 @@ converse.plugins.add('converse-minimize', {
return
this
.
el
;
return
this
.
el
;
},
},
initToggle
()
{
async
initToggle
()
{
const
id
=
`converse.minchatstoggle-
${
_converse
.
bare_jid
}
`
;
const
id
=
`converse.minchatstoggle-
${
_converse
.
bare_jid
}
`
;
this
.
toggleview
=
new
_converse
.
MinimizedChatsToggleView
({
const
model
=
new
_converse
.
MinimizedChatsToggle
({
id
});
'
model
'
:
new
_converse
.
MinimizedChatsToggle
({
'
id
'
:
id
})
model
.
browserStorage
=
_converse
.
createStore
(
id
);
});
await
new
Promise
(
resolve
=>
model
.
fetch
({
'
success
'
:
resolve
,
'
error
'
:
resolve
}));
this
.
toggleview
.
model
.
browserStorage
=
_converse
.
createStore
(
id
);
this
.
toggleview
=
new
_converse
.
MinimizedChatsToggleView
({
model
});
this
.
toggleview
.
model
.
fetch
();
},
},
toggle
(
ev
)
{
toggle
(
ev
)
{
...
@@ -489,11 +485,8 @@ converse.plugins.add('converse-minimize', {
...
@@ -489,11 +485,8 @@ converse.plugins.add('converse-minimize', {
},
},
render
()
{
render
()
{
this
.
el
.
innerHTML
=
tpl_toggle_chats
(
render
(
tpl_toggle_chats
(
Object
.
assign
(
this
.
model
.
toJSON
())),
this
.
el
);
Object
.
assign
(
this
.
model
.
toJSON
(),
{
'
Minimized
'
:
__
(
'
Minimized
'
)
})
);
if
(
this
.
model
.
get
(
'
collapsed
'
))
{
if
(
this
.
model
.
get
(
'
collapsed
'
))
{
u
.
hideElement
(
this
.
flyout
);
u
.
hideElement
(
this
.
flyout
);
}
else
{
}
else
{
...
...
src/templates/toggle_chats.html
deleted
100644 → 0
View file @
54ffd900
{{{o.num_minimized}}} {{{o.Minimized}}}
<span
class=
"unread-message-count {[ if (!o.num_unread) { ]} unread-message-count-hidden {[ } ]}"
href=
"#"
>
{{{o.num_unread}}}
</span>
src/templates/toggle_chats.js
0 → 100644
View file @
d0ba94e9
import
{
html
}
from
"
lit-html
"
;
import
{
__
}
from
'
@converse/headless/i18n
'
;
const
i18n_minimized
=
__
(
'
Minimized
'
)
export
default
(
o
)
=>
html
`
${
o
.
num_minimized
}
${
i18n_minimized
}
<span class="unread-message-count
${
!
o
.
num_unread
?
'
unread-message-count-hidden
'
:
''
}
" href="#">
${
o
.
num_unread
}
</span>
`
;
src/templates/trimmed_chat.html
deleted
100644 → 0
View file @
54ffd900
<div
class=
"chat-head-{{{o.type}}} chat-head row no-gutters"
>
<a
class=
"restore-chat w-100 align-self-center"
title=
"{{{o.tooltip}}}"
>
{[ if (o.num_unread) { ]}
<span
class=
"message-count badge badge-light"
>
{{{o.num_unread}}}
</span>
{[ } ]}
{{{o.title}}}
</a>
<a
class=
"chatbox-btn close-chatbox-button fa fa-times"
></a>
</div>
src/templates/trimmed_chat.js
0 → 100644
View file @
d0ba94e9
import
{
html
}
from
"
lit-html
"
;
import
{
__
}
from
'
@converse/headless/i18n
'
;
const
i18n_tooltip
=
__
(
'
Click to restore this chat
'
);
export
default
(
o
)
=>
html
`
<div class="chat-head-
${
o
.
type
}
chat-head row no-gutters">
<a class="restore-chat w-100 align-self-center" title="
${
i18n_tooltip
}
">
${
o
.
num_unread
?
html
`<span class="message-count badge badge-light">
${
o
.
num_unread
}
</span>`
:
''
}
${
o
.
title
}
</a>
<a class="chatbox-btn close-chatbox-button fa fa-times"></a>
</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