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
4140cc12
Commit
4140cc12
authored
Jan 07, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #302 from gbonvehi/solve-252-253-contact-info-tooltip
Add fullname and jid to contact's tooltip in roster
parents
3d4c7659
f7566d02
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
10 deletions
+39
-10
docs/CHANGES.rst
docs/CHANGES.rst
+1
-0
mockup/index.html
mockup/index.html
+7
-3
spec/controlbox.js
spec/controlbox.js
+24
-4
src/templates/pending_contact.html
src/templates/pending_contact.html
+2
-1
src/templates/requesting_contact.html
src/templates/requesting_contact.html
+2
-1
src/templates/roster_item.html
src/templates/roster_item.html
+3
-1
No files found.
docs/CHANGES.rst
View file @
4140cc12
...
...
@@ -7,6 +7,7 @@ Changelog
* Norwegian Bokmål translations. [Andreas Lorentsen]
* Updated Afrikaans translations. [jcbrand]
* Add responsiveness to CSS. We now use Sass preprocessor for generating CSS. [jcbrand]
* Add fullname and jid to contact's tooltip in roster, solves #252 and #253. [gbonvehi]
0.8.6 (2014-12-07)
------------------
...
...
mockup/index.html
View file @
4140cc12
...
...
@@ -143,7 +143,9 @@
<a
href=
"#"
data-group=
"Colleagues"
class=
"group-toggle icon-opened"
title=
"Click to hide these contacts"
>
Colleagues
</a>
</dt>
<dd
class=
"online current-xmpp-contact"
>
<a
class=
"open-chat"
title=
"Click to chat with this contact"
href=
"#"
>
<a
class=
"open-chat"
title=
"Name: Victor Matfield
JID: victor.matfield@localhost
Click to chat with this contact"
href=
"#"
>
<span
class=
"icon-online"
title=
"This contact is online"
></span>
Victor Matfield
</a>
...
...
@@ -215,7 +217,8 @@
<a
href=
"#"
class=
"group-toggle icon-opened"
title=
"Click to hide these contacts"
>
Contact Requests
</a>
</dt>
<dd
class=
"offline requesting-xmpp-contact"
>
<span
class=
"req-contact-name"
>
Bob Skinstad
</span>
<span
class=
"req-contact-name"
title=
"Name: Bob Skinstad
JID: bob.skinstad@localhost"
>
Bob Skinstad
</span>
<span
class=
"request-actions"
>
<a
class=
"accept-xmpp-request icon-checkmark"
title=
"Click here to accept this contact's request"
href=
"#"
></a>
<a
class=
"decline-xmpp-request icon-close"
title=
"Click here to decline this contact's request"
href=
"#"
></a>
...
...
@@ -232,7 +235,8 @@
<dt
id=
"pending-xmpp-contacts"
style=
"display: block;"
>
<a
href=
"#"
class=
"group-toggle icon-opened"
title=
"Click to hide these contacts"
>
Pending Contacts
</a>
</dt>
<dd
class=
"offline pending-xmpp-contact"
><span
class=
"pending-contact-name"
>
Rassie Erasmus
</span>
<dd
class=
"offline pending-xmpp-contact"
><span
class=
"pending-contact-name"
title=
"Name: Rassie Erasmus
JID: rassie.erasmus@localhost"
>
Rassie Erasmus
</span>
<a
class=
"remove-xmpp-contact icon-remove"
title=
"Click to remove this contact"
href=
"#"
></a>
</dd>
<dd
class=
"offline pending-xmpp-contact"
><span
class=
"pending-contact-name"
>
Victor Matfield
</span>
...
...
spec/controlbox.js
View file @
4140cc12
...
...
@@ -971,10 +971,15 @@
describe
(
"
All Contacts
"
,
$
.
proxy
(
function
()
{
beforeEach
(
$
.
proxy
(
function
()
{
runs
(
function
()
{
utils
.
clearBrowserStorage
();
converse
.
rosterview
.
model
.
reset
();
utils
.
createContacts
(
'
all
'
).
openControlBox
();
});
waits
(
50
);
runs
(
function
()
{
utils
.
openContactsPanel
();
});
},
converse
));
it
(
"
are saved to, and can be retrieved from, browserStorage
"
,
$
.
proxy
(
function
()
{
...
...
@@ -998,6 +1003,21 @@
expect
(
_
.
isEqual
(
new_attrs
.
sort
(),
old_attrs
.
sort
())).
toEqual
(
true
);
}
},
converse
));
it
(
"
will show fullname and jid properties on tooltip
"
,
$
.
proxy
(
function
()
{
var
jid
,
name
,
i
,
t
;
for
(
i
=
0
;
i
<
mock
.
cur_names
.
length
;
i
++
)
{
name
=
mock
.
cur_names
[
i
];
jid
=
name
.
replace
(
/ /g
,
'
.
'
).
toLowerCase
()
+
'
@localhost
'
;
var
$dd
=
this
.
rosterview
.
$el
.
find
(
"
dd:contains('
"
+
name
+
"
')
"
).
children
().
first
();
var
dd_text
=
$dd
.
text
();
var
dd_title
=
$dd
.
attr
(
'
title
'
);
expect
(
dd_text
).
toBe
(
name
);
expect
(
dd_title
).
toContain
(
name
);
expect
(
dd_title
).
toContain
(
jid
);
}
},
converse
));
},
converse
));
},
converse
,
mock
,
test_utils
));
...
...
src/templates/pending_contact.html
View file @
4140cc12
<span
class=
"pending-contact-name"
>
{{fullname}}
</span>
<a
class=
"remove-xmpp-contact icon-remove"
title=
"{{desc_remove}}"
href=
"#"
></a>
<span
class=
"pending-contact-name"
title=
"Name: {{fullname}}
JID: {{jid}}"
>
{{fullname}}
</span>
<a
class=
"remove-xmpp-contact icon-remove"
title=
"{{desc_remove}}"
href=
"#"
></a>
src/templates/requesting_contact.html
View file @
4140cc12
<span
class=
"req-contact-name"
>
{{fullname}}
</span>
<span
class=
"req-contact-name"
title=
"Name: {{fullname}}
JID: {{jid}}"
>
{{fullname}}
</span>
<span
class=
"request-actions"
>
<a
class=
"accept-xmpp-request icon-checkmark"
title=
"{{desc_accept}}"
href=
"#"
></a>
<a
class=
"decline-xmpp-request icon-close"
title=
"{{desc_decline}}"
href=
"#"
></a>
...
...
src/templates/roster_item.html
View file @
4140cc12
<a
class=
"open-chat"
title=
"{{desc_chat}}"
href=
"#"
><span
class=
"icon-{{chat_status}}"
title=
"{{desc_status}}"
></span>
{{fullname}}
</a>
<a
class=
"open-chat"
title=
"Name: {{fullname}}
JID: {{jid}}
{{desc_chat}}"
href=
"#"
><span
class=
"icon-{{chat_status}}"
title=
"{{desc_status}}"
></span>
{{fullname}}
</a>
<a
class=
"remove-xmpp-contact icon-remove"
title=
"{{desc_remove}}"
href=
"#"
></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